|
@@ -4,44 +4,48 @@ import store from './store'
|
|
|
import NProgress from 'nprogress' // progress bar
|
|
|
import 'nprogress/nprogress.css' // progress bar style
|
|
|
import notification from 'ant-design-vue/es/notification'
|
|
|
-import {ACCESS_TOKEN} from '@/store/mutation-types'
|
|
|
-import {generateIndexRouter} from "@/utils/util"
|
|
|
+import { ACCESS_TOKEN } from '@/store/mutation-types'
|
|
|
+import { generateIndexRouter } from "@/utils/util"
|
|
|
|
|
|
-NProgress.configure({showSpinner: false}) // NProgress Configuration
|
|
|
+NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
|
|
|
|
|
|
|
|
-const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration','/user/transfer-local','/errorPage','/user/new-batch','http://192.168.0.111:8088/jeecg-boot/sys/feishu/url','/user/FStransfer'] // no redirect whitelist
|
|
|
+const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration', '/user/transfer-local', '/errorPage', '/user/new-batch', 'http://192.168.0.111:8088/jeecg-boot/sys/feishu/url', '/user/FStransfer'] // no redirect whitelist
|
|
|
|
|
|
router.beforeEach((to, from, next) => {
|
|
|
NProgress.start() // start progress bar
|
|
|
-
|
|
|
+ if (whiteList.indexOf(to.path) !== -1) {
|
|
|
+ // 在免登录白名单,直接进入
|
|
|
+ next()
|
|
|
+ }
|
|
|
if (Vue.ls.get(ACCESS_TOKEN)) {
|
|
|
/* has token */
|
|
|
+
|
|
|
if (to.path === '/user/login') {
|
|
|
- next({path: '/dashboard/workplace'})
|
|
|
+ next({ path: '/dashboard/workplace' })
|
|
|
NProgress.done()
|
|
|
} else {
|
|
|
if (store.getters.permissionList.length === 0) {
|
|
|
store.dispatch('GetPermissionList').then(res => {
|
|
|
const menuData = res.result.menu;
|
|
|
- localStorage.setItem("roleCode",res.result.roleCode)
|
|
|
+ localStorage.setItem("roleCode", res.result.roleCode)
|
|
|
if (menuData === null || menuData === "" || menuData === undefined) {
|
|
|
return;
|
|
|
}
|
|
|
let constRoutes = [];
|
|
|
constRoutes = generateIndexRouter(menuData);
|
|
|
// 添加主界面路由
|
|
|
- store.dispatch('UpdateAppRouter', {constRoutes}).then(() => {
|
|
|
+ store.dispatch('UpdateAppRouter', { constRoutes }).then(() => {
|
|
|
// 根据roles权限生成可访问的路由表
|
|
|
// 动态添加可访问路由表
|
|
|
router.addRoutes(store.getters.addRouters)
|
|
|
const redirect = decodeURIComponent(from.query.redirect || to.path)
|
|
|
if (to.path === redirect) {
|
|
|
// hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
|
|
|
- next({...to, replace: true})
|
|
|
+ next({ ...to, replace: true })
|
|
|
} else {
|
|
|
// 跳转到目的路由
|
|
|
- next({path: redirect})
|
|
|
+ next({ path: redirect })
|
|
|
}
|
|
|
})
|
|
|
})
|
|
@@ -51,7 +55,7 @@ router.beforeEach((to, from, next) => {
|
|
|
description: '请求用户信息失败,请重试!'
|
|
|
})*/
|
|
|
store.dispatch('Logout').then(() => {
|
|
|
- next({path: '/user/login', query: {redirect: to.fullPath}})
|
|
|
+ next({ path: '/user/login', query: { redirect: to.fullPath } })
|
|
|
})
|
|
|
})
|
|
|
} else {
|
|
@@ -63,7 +67,7 @@ router.beforeEach((to, from, next) => {
|
|
|
// 在免登录白名单,直接进入
|
|
|
next()
|
|
|
} else {
|
|
|
- next({path: '/user/login', query: {redirect: to.fullPath}})
|
|
|
+ next({ path: '/user/login', query: { redirect: to.fullPath } })
|
|
|
NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
|
|
|
}
|
|
|
}
|