diff --git a/.env.production b/.env.production
index cf94baf..4efdea3 100644
--- a/.env.production
+++ b/.env.production
@@ -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=大唐
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..2fe4f81
Binary files /dev/null and b/dist.zip differ
diff --git a/src/components/ListPage/ListPage.vue b/src/components/ListPage/ListPage.vue
index 4f1a528..b616ace 100644
--- a/src/components/ListPage/ListPage.vue
+++ b/src/components/ListPage/ListPage.vue
@@ -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) {
diff --git a/src/components/Location/Location.vue b/src/components/Location/Location.vue
index bca3840..d373c88 100644
--- a/src/components/Location/Location.vue
+++ b/src/components/Location/Location.vue
@@ -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 },
diff --git a/src/views/OtherPages/Department.vue b/src/views/OtherPages/Department.vue
index 73a2052..788a096 100644
--- a/src/views/OtherPages/Department.vue
+++ b/src/views/OtherPages/Department.vue
@@ -7,7 +7,12 @@
-
+
@@ -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);
@@ -681,8 +695,8 @@ export default {
const firstChild = this.list.children[i];
if (val === firstChild.code) {
this.defaultTitle = firstChild.title;
- }else{
- if(firstChild.children && firstChild.children.length){
+ } else {
+ if (firstChild.children && firstChild.children.length) {
for (let j = 0; j < firstChild.children.length; j++) {
const secondChild = firstChild.children[j];
if (val === secondChild.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() {
diff --git a/src/views/OtherPages/Information.vue b/src/views/OtherPages/Information.vue
index 2172304..840f143 100644
--- a/src/views/OtherPages/Information.vue
+++ b/src/views/OtherPages/Information.vue
@@ -7,10 +7,10 @@
@@ -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);
@@ -136,8 +136,8 @@ export default {
const firstChild = this.list.children[i];
if (val === firstChild.code) {
this.defaultTitle = firstChild.title;
- }else{
- if(firstChild.children && firstChild.children.length){
+ } else {
+ if (firstChild.children && firstChild.children.length) {
for (let j = 0; j < firstChild.children.length; j++) {
const secondChild = firstChild.children[j];
if (val === secondChild.code) {
@@ -169,6 +169,7 @@ export default {
};
const data = await this.getContent(params);
console.log('data: ', data);
+ this.content = data || {};
} catch (error) {}
},
resetData() {