调整用户切换角色路由跳转逻辑

piexlmax · piexlmax · commit 490c38adc0ce · 2022-08-06T19:47:55.000+08:00
diff --git a/web/src/view/layout/aside/historyComponent/history.vue b/web/src/view/layout/aside/historyComponent/history.vue
@@ -311,6 +311,10 @@ const initPage = () => {
     activeValue.value = window.sessionStorage.getItem('activeValue')
   }
   setTab(route)
+  if (window.sessionStorage.getItem('needCloseAll') === 'true') {
+    closeAll()
+    window.sessionStorage.removeItem('needCloseAll')
+  }
 }
 initPage()
 
diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue
@@ -118,9 +118,9 @@ import { setUserAuthority } from '@/api/user'
 import { emitter } from '@/utils/bus.js'
 import { computed, ref, onMounted, nextTick } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
-import { useUserStore } from '@/pinia/modules/user'
 import { useRouterStore } from '@/pinia/modules/router'
 import { fmtTitle } from '@/utils/fmtRouterTitle'
+import { useUserStore } from '@/pinia/modules/user'
 
 const router = useRouter()
 const route = useRoute()
@@ -202,10 +202,8 @@ const changeUserAuth = async(id) => {
     authorityId: id
   })
   if (res.code === 0) {
-    emitter.emit('closeAllPage')
-    setTimeout(() => {
-      window.location.reload()
-    }, 50)
+    window.sessionStorage.setItem('needCloseAll', 'true')
+    window.location.reload()
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,10 @@ const initPage = () => {`
`311`	`311`	`activeValue.value = window.sessionStorage.getItem('activeValue')`
`312`	`312`	`}`
`313`	`313`	`setTab(route)`
	`314`	`+ if (window.sessionStorage.getItem('needCloseAll') === 'true') {`
	`315`	`+ closeAll()`
	`316`	`+ window.sessionStorage.removeItem('needCloseAll')`
	`317`	`+ }`
`314`	`318`	`}`
`315`	`319`	`initPage()`
`316`	`320`