From dfd61e8cea6e048d3980aad82b258e223a3b77f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E5=90=89=E5=85=86?= <303176530@qq.com>
Date: Sun, 24 Jan 2021 17:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E6=97=B6=E9=A6=96=E9=A1=B5=E8=93=9D=E7=82=B9=E6=9C=AA=E7=82=B9?=
 =?UTF-8?q?=E4=BA=AE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/permission.js                               |  1 -
 web/src/store/module/user.js                        | 13 +++++++------
 .../view/layout/aside/historyComponent/history.vue  |  7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/web/src/permission.js b/web/src/permission.js
index dc7c3165..4b680d72 100644
--- a/web/src/permission.js
+++ b/web/src/permission.js
@@ -5,7 +5,6 @@ import getPageTitle from '@/utils/page'
 let asyncRouterFlag = 0
 
 const whiteList = ['login']
-
 router.beforeEach(async(to, from, next) => {
     const token = store.getters['user/token']
         // 在白名单中的判断情况
diff --git a/web/src/store/module/user.js b/web/src/store/module/user.js
index ff677c00..c4f423ca 100644
--- a/web/src/store/module/user.js
+++ b/web/src/store/module/user.js
@@ -24,8 +24,8 @@ export const user = {
         LoginOut(state) {
             state.userInfo = {}
             state.token = ""
-            router.push({ name: 'login', replace: true })
             sessionStorage.clear()
+            router.push({ name: 'login', replace: true })
             window.location.reload()
         },
         ResetUserInfo(state, userInfo = {}) {
@@ -43,12 +43,13 @@ export const user = {
                 await dispatch('router/SetAsyncRouter', {}, { root: true })
                 const asyncRouters = rootGetters['router/asyncRouters']
                 router.addRoutes(asyncRouters)
-                const redirect = router.history.current.query.redirect
-                if (redirect) {
-                    router.push({ path: redirect })
-                } else {
+                // const redirect = router.history.current.query.redirect
+                // console.log(redirect)
+                // if (redirect) {
+                //     router.push({ path: redirect })
+                // } else {
                     router.push({ name: getters["userInfo"].authority.defaultRouter })
-                }
+                // }
                 return true
             }
         },
diff --git a/web/src/view/layout/aside/historyComponent/history.vue b/web/src/view/layout/aside/historyComponent/history.vue
index f717301b..e412062c 100644
--- a/web/src/view/layout/aside/historyComponent/history.vue
+++ b/web/src/view/layout/aside/historyComponent/history.vue
@@ -43,7 +43,6 @@ export default {
       rightActive: ""
     };
   },
-
   computed: {
     ...mapGetters("user", ["userInfo"]),
     defaultRouter() {
@@ -69,7 +68,11 @@ export default {
     ];
     this.historys =
       JSON.parse(sessionStorage.getItem("historys")) || initHistorys;
-    this.activeValue = window.sessionStorage.getItem("activeValue");
+      if(!window.sessionStorage.getItem("activeValue")){
+        this.activeValue = this.$route.name + JSON.stringify(this.$route.query)+JSON.stringify(this.$route.params)
+      }else{
+        this.activeValue = window.sessionStorage.getItem("activeValue");
+      }
     this.setTab(this.$route);
   },