From 43d76e599091dc6b79b51f89c79514b50e33ea35 Mon Sep 17 00:00:00 2001
From: fuzui <73400@163.com>
Date: 星期四, 16 十二月 2021 02:18:48 +0800
Subject: [PATCH] fix: cron组件中周回显bug
---
ruoyi-ui/src/permission.js | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index 17e5b3d..bde5293 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -12,6 +12,7 @@
router.beforeEach((to, from, next) => {
NProgress.start()
if (getToken()) {
+ to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
/* has token*/
if (to.path === '/login') {
next({ path: '/' })
@@ -19,32 +20,20 @@
} else {
if (store.getters.roles.length === 0) {
// 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
- store.dispatch('GetInfo').then(res => {
- // 鎷夊彇user_info
- const roles = res.roles
- store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
- // 娴嬭瘯 榛樿闈欐�侀〉闈�
- // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
+ store.dispatch('GetInfo').then(() => {
+ store.dispatch('GenerateRoutes').then(accessRoutes => {
// 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
router.addRoutes(accessRoutes) // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
next({ ...to, replace: true }) // hack鏂规硶 纭繚addRoutes宸插畬鎴�
})
- })
- .catch(err => {
- store.dispatch('FedLogOut').then(() => {
+ }).catch(err => {
+ store.dispatch('LogOut').then(() => {
Message.error(err)
next({ path: '/' })
})
})
} else {
next()
- // 娌℃湁鍔ㄦ�佹敼鍙樻潈闄愮殑闇�姹傚彲鐩存帴next() 鍒犻櫎涓嬫柟鏉冮檺鍒ゆ柇 鈫�
- // if (hasPermission(store.getters.roles, to.meta.roles)) {
- // next()
- // } else {
- // next({ path: '/401', replace: true, query: { noGoBack: true }})
- // }
- // 鍙垹 鈫�
}
}
} else {
--
Gitblit v1.9.3