diff --git a/.env.production b/.env.production index 5b72f6d9d..2aff07ccb 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api +VUE_APP_API_SERVER = http://172.22.68.29/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper diff --git a/src/js/dai/request.js b/src/js/dai/request.js index a2db96fa1..531acf7e0 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -42,7 +42,7 @@ const request = curry( if (res.data.code > 8000 && res.data.code < 10000) { // Message.error(res.data.msg); } - if (res.code == 10005 || res.code == 10006 || res.code == 10007) { + if (res.data.code == 10005 || res.data.code == 10006 || res.data.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 console.log("登录失效"); Message.error(res.data.msg); diff --git a/src/js/store/index.js b/src/js/store/index.js index eb25c128e..0af5d47f8 100644 --- a/src/js/store/index.js +++ b/src/js/store/index.js @@ -20,8 +20,8 @@ export default new Vuex.Store({ sidebarFold: false, // 侧边栏, 菜单 sidebarMenuList: [], - sidebarMenuActiveName: "", - LevelOneMenuActiveName: "", + sidebarMenuActiveName: "房屋管理", + LevelOneMenuActiveName: "人房信息", sidebarActiveSubMenuList: [], // 内容, 是否需要刷新 contentIsNeedRefresh: false, @@ -33,7 +33,7 @@ export default new Vuex.Store({ title: "首页", }, ], - contentTabsActiveName: "indexWork", + contentTabsActiveName: "base-community-community", mainShuju: { menuList: [], diff --git a/src/mixins/process-module.js b/src/mixins/process-module.js index 3a951a657..3e740abcb 100644 --- a/src/mixins/process-module.js +++ b/src/mixins/process-module.js @@ -34,7 +34,7 @@ export default { var tabName = this.$store.state.contentTabsActiveName this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName) if (this.$store.state.contentTabs.length <= 0) { - this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home' + this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'base-community-community' return false } if (tabName === this.$store.state.contentTabsActiveName) { diff --git a/src/views/main-content.vue b/src/views/main-content.vue index cdb28ec92..58db50489 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -172,7 +172,9 @@ export default { }, // tabs, 删除tab tabRemoveHandle(tabName) { - if (tabName === "home") { + if (tabName === "base-community-community") { + this.$store.state.sidebarMenuActiveName = + this.$store.state.contentTabsActiveName = "base-community-community"; return false; } this.$store.state.contentTabs = this.$store.state.contentTabs.filter( diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 4f3335917..1b06c1ae9 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -43,9 +43,9 @@ mode="horizontal" class="aui-navbar__menu mr-auto z-div" > - +
-
+
@@ -49,7 +49,9 @@ export default { }, components: {}, computed: {}, - created() {}, + created() { + this.handleClickItem(1) + }, mounted() {}, beforeRouteEnter(to, from, next) { diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index a99d75d14..909c3dce5 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -160,7 +160,7 @@ export default { if (href && href.indexOf("login") == -1) { localStorage.removeItem("thePageAtExit"); location.href = href; - } else { + } else { localStorage.removeItem("thePageAtExit"); this.$router.replace({ name: "index" }); }