diff --git a/src/api/axios.js b/src/api/axios.js index 915064c..e1ed38c 100644 --- a/src/api/axios.js +++ b/src/api/axios.js @@ -42,7 +42,7 @@ service.interceptors.response.use( // Cookies.set("access_token", response.data.info, { expires: 1 / 12 }) // console.log(response.status) if (res.status == 999) { - if (!location.href.includes("localhost")) { + // if (!location.href.includes("localhost")) { if (res.data) { window.location.href = res.data; } else { @@ -55,7 +55,7 @@ service.interceptors.response.use( }); } } - } + // } } else { // Cookies.set("access_token", response.data.info, { expires: 1 / 12 }) } diff --git a/src/router/index.js b/src/router/index.js index 913a0fe..b7aa358 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -282,9 +282,9 @@ let addrouters = [ //测试用,后续后端获取 iconCls: "fa fa-dashboard", // 图标样式class name: "", component: Device, - meta: { - keepAlive: true, - }, + // meta: { + // keepAlive: true, + // }, children: [] }, { diff --git a/src/store/index.js b/src/store/index.js index d7ab593..87ce4fe 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -15,14 +15,14 @@ const store = new Vuex.Store({ state: { token: "", csCode: localStorage.getItem("csCode") || "", - info: sessionStorage.getItem("info") - ? JSON.parse(sessionStorage.getItem("info")) + info: localStorage.getItem("info") + ? JSON.parse(localStorage.getItem("info")) : "", // 每次刷新都要通过token请求个人信息来筛选动态路由 routers: [], //左侧菜单 addRouters: - sessionStorage.getItem("addRouters") && - sessionStorage.getItem("addRouters") != "undefined" - ? JSON.parse(sessionStorage.getItem("addRouters")) + localStorage.getItem("addRouters") && + localStorage.getItem("addRouters") != "undefined" + ? JSON.parse(localStorage.getItem("addRouters")) : [], //动态路由 tokenSources: new Map(), //正在请求接口(切换取消请求) }, @@ -36,7 +36,7 @@ const store = new Vuex.Store({ }, setInfo(state, data) { state.info = { ...data }; - sessionStorage.setItem("info", JSON.stringify(data)); + localStorage.setItem("info", JSON.stringify(data)); }, setRouters: (state, routers) => { let aRouters = addrouters.filter((item) => { @@ -46,7 +46,7 @@ const store = new Vuex.Store({ state.addRouters = aRouters; // 保存动态路由用来addRouter state.routers = defaultRouter.concat(aRouters); // 所有有权限的路由表,用来生成菜单列表 - sessionStorage.setItem("addRouters", JSON.stringify(routers)); + localStorage.setItem("addRouters", JSON.stringify(routers)); }, setTokenSources(state, data) { if (data instanceof Array) { diff --git a/src/store/modules/layout/index.js b/src/store/modules/layout/index.js index f109430..db2d5af 100644 --- a/src/store/modules/layout/index.js +++ b/src/store/modules/layout/index.js @@ -11,6 +11,12 @@ export default { }] }, mutations: { + resetTabnavBox(state){ + state.tabnavBox = [{ + title: "home", + path: "/index" + }] + }, addTab(state, arg) { state.isActive = arg.path if (state.tabnavBox[0] && state.tabnavBox[0].title !== "home") { diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue index 32b401a..00a9e43 100644 --- a/src/views/ask/index.vue +++ b/src/views/ask/index.vue @@ -375,7 +375,7 @@ align="center" > - +
- {{ subQuestions.score }} +

--

diff --git a/src/views/layout/aside/aside.vue b/src/views/layout/aside/aside.vue index 831bafb..0367faa 100644 --- a/src/views/layout/aside/aside.vue +++ b/src/views/layout/aside/aside.vue @@ -41,6 +41,7 @@ v-else :key="item.path" :class="path.includes(item.path) ? 'is-active' : ''" + @click="isKeep(item.path)" > {{ item.name }} diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue index 53ec8b4..f158104 100644 --- a/src/views/layout/header/header.vue +++ b/src/views/layout/header/header.vue @@ -60,7 +60,6 @@