|
|
|
@ -6,9 +6,11 @@ import 'nprogress/nprogress.css' |
|
|
|
|
import { getToken } from '@/utils/auth' |
|
|
|
|
import { isRelogin } from '@/utils/request' |
|
|
|
|
|
|
|
|
|
import Cookies from "js-cookie"; |
|
|
|
|
|
|
|
|
|
NProgress.configure({ showSpinner: false }) |
|
|
|
|
|
|
|
|
|
const whiteList = ['/login', '/register'] |
|
|
|
|
const whiteList = ['/login', '/register','/analyze'] |
|
|
|
|
|
|
|
|
|
router.beforeEach((to, from, next) => { |
|
|
|
|
NProgress.start() |
|
|
|
@ -22,12 +24,22 @@ router.beforeEach((to, from, next) => { |
|
|
|
|
if (store.getters.roles.length === 0) { |
|
|
|
|
isRelogin.show = true |
|
|
|
|
// 判断当前用户是否已拉取完user_info信息
|
|
|
|
|
store.dispatch('GetInfo').then(() => { |
|
|
|
|
store.dispatch('GetInfo').then((res) => { |
|
|
|
|
console.log(res,'用户信息'); |
|
|
|
|
isRelogin.show = false |
|
|
|
|
store.dispatch('GenerateRoutes').then(accessRoutes => { |
|
|
|
|
// 根据roles权限生成可访问的路由表
|
|
|
|
|
router.addRoutes(accessRoutes) // 动态添加可访问路由表
|
|
|
|
|
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
|
|
|
|
|
let path = '/' |
|
|
|
|
if (res.user.roles[0].roleId == 128){ |
|
|
|
|
Cookies.set('roleId',res.user.roles[0].roleId) |
|
|
|
|
path = '/analyze' |
|
|
|
|
} |
|
|
|
|
if (to.path === '/home'){ |
|
|
|
|
next({path,replace:true}) |
|
|
|
|
}else{ |
|
|
|
|
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
|
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}).catch(err => { |
|
|
|
|
store.dispatch('LogOut').then(() => { |
|
|
|
|