ZhangBin
/
datang-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of ssh://101.201.226.163:50022/binbin0314/datang-ui

master
song 3 years ago
parent
73dd8071e8 24cdd90bbc
commit
fdaf367078
6 changed files with 49 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      .env.production
  2. BIN
      dist.zip
  3. 1
      src/components/ListPage/ListPage.vue
  4. 14
      src/components/Location/Location.vue
  5. 22
      src/views/OtherPages/Department.vue
  6. 11
      src/views/OtherPages/Information.vue

12
.env.production
View File

@ -1,10 +1,10 @@
VUE_APP_MODE=production
VUE_APP_NODE_ENV=production
VUE_APP_SCENE=/datang/
VUE_APP_BASE_URL=http://test.tall.wiki
VUE_APP_API_URL=http://test.tall.wiki/datang/v1.0
VUE_APP_PROXY_URL=/datang/v1.0
VUE_APP_PUBLIC_PATH=/datang
VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
VUE_APP_SCENE=/v1.0/datang/
VUE_APP_BASE_URL=http://10.119.190.12:8000
VUE_APP_API_URL=http://10.119.190.12:8000/v1.0
VUE_APP_PROXY_URL=/v1.0
VUE_APP_PUBLIC_PATH=/v1.0/datang
VUE_APP_MSG_URL=wss://10.119.190.12:8000/websocket/message/v4.0/ws
VUE_APP_TITLE=大唐
VUE_APP_DESCRIPTION=大唐

BIN
dist.zip
View File

Binary file not shown.

1
src/components/ListPage/ListPage.vue
View File

@ -98,6 +98,7 @@ export default {
async getYear() {
try {
const params = { showPage: this.code };
console.log('params: ', params);
const res = await getCondition(params);
const { code, msg, data } = res.data;
if (code === 200) {

14
src/components/Location/Location.vue
View File

@ -995,7 +995,21 @@ export default {
if (item.children && item.children.length) {
for (let k = 0; k < item.children.length; k++) {
const itemC = item.children[k];
console.log('itemC: ', itemC.children);
if (itemC.children && itemC.children.length) {
for (let m = 0; m < itemC.children.length; m++) {
const itemD = itemC.children[m];
if (this.title === itemD.title && m !== 0) {
const path = window.location.href.split('?');
window.location.href = path[0] + `?code=${itemC.children[0].code}`;
return;
}
}
}
if (this.title === itemC.title && k !== 0) {
console.log('itemC: ', itemC[k]);
this.$router.push({
path: this.tabList[i].url,
query: { code: item.children[0].code },

22
src/views/OtherPages/Department.vue
View File

@ -7,7 +7,12 @@
<div class="flex-1 flex-column">
<Location :title="defaultTitle" />
<div class="content-detail p-4" :style="{ 'min-height': list.children.length * 56 + 'px' }">
<template v-if="code.length === 6 && (code.split('')[5] === '4' || code.split('')[5] === '6' || code.split('')[5] === '7' || code.split('')[5] === '8')">
<template
v-if="
code.length === 6 &&
(code.split('')[5] === '4' || code.split('')[5] === '6' || code.split('')[5] === '7' || code.split('')[5] === '8')
"
>
<ListPage :code="code" @changeYear="changeYear" :content="content" @getData="getNumData" />
</template>
<RichText v-else :rich-obj="content" />
@ -656,7 +661,13 @@ export default {
if (this.$route.path === this.list.url) {
this.code = val;
this.getDetault(val);
if (this.code.length === 6 && (this.code.split('')[5] === '4' || this.code.split('')[5] === '6' || this.code.split('')[5] === '7' || this.code.split('')[5] === '8')) {
if (
this.code.length === 6 &&
(this.code.split('')[5] === '4' ||
this.code.split('')[5] === '6' ||
this.code.split('')[5] === '7' ||
this.code.split('')[5] === '8')
) {
this.getContentData(this.code);
} else {
this.getData(this.code);
@ -667,7 +678,10 @@ export default {
created() {
this.code = this.$route.query.code;
this.getDetault(this.code);
if (this.code.length === 6 && (this.code.split('')[5] === '4' || this.code.split('')[5] === '6' || this.code.split('')[5] === '7' || this.code.split('')[5] === '8')) {
if (
this.code.length === 6 &&
(this.code.split('')[5] === '4' || this.code.split('')[5] === '6' || this.code.split('')[5] === '7' || this.code.split('')[5] === '8')
) {
this.getContentData(this.code);
} else {
this.getData(this.code);
@ -713,7 +727,7 @@ export default {
pageSize: 10,
};
const data = await this.getContent(params);
console.log('data: ', data);
this.content = data || {};
} catch (error) {}
},
resetData() {

11
src/views/OtherPages/Information.vue
View File

@ -7,10 +7,10 @@
<div class="flex-1 flex-column">
<Location :title="defaultTitle" />
<div class="content-detail p-4" :style="{ 'min-height': list.children.length * 56 + 'px' }">
<template v-if="code.length === 6 && (code.split('')[5] === '4' || code.split('')[5] === '6' || code.split('')[5] === '7' || code.split('')[5] === '8')">
<ListPage :code="code" @changeYear="changeYear" :content="content" @getData="getNumData" />
<template v-if="code.length === 6 && (code === '060101' || code === '060503')">
<RichText :rich-obj="content" />
</template>
<RichText v-else :rich-obj="content" />
<ListPage v-else :code="code" @changeYear="changeYear" :content="content" @getData="getNumData" />
</div>
</div>
</div>
@ -111,7 +111,7 @@ export default {
if (this.$route.path === this.list.url) {
this.code = val;
this.getDetault(val);
if (this.code.length === 6 && ((this.code === '060101' || this.code === '060503'))) {
if (this.code.length === 6 && (this.code === '060101' || this.code === '060503')) {
this.getData(this.code);
} else {
this.getContentData(this.code);
@ -122,7 +122,7 @@ export default {
created() {
this.code = this.$route.query.code;
this.getDetault(this.code);
if (this.code.length === 6 && ((this.code === '060101' || this.code === '060503'))) {
if (this.code.length === 6 && (this.code === '060101' || this.code === '060503')) {
this.getContentData(this.code);
} else {
this.getData(this.code);
@ -169,6 +169,7 @@ export default {
};
const data = await this.getContent(params);
console.log('data: ', data);
this.content = data || {};
} catch (error) {}
},
resetData() {

Write Preview
Loading…
Cancel
Save