diff --git a/src/permission.js b/src/permission.js index 17e6260..e1cbe4b 100644 --- a/src/permission.js +++ b/src/permission.js @@ -11,62 +11,50 @@ function kickOut() { location.href = location.origin + "/login"; } } -const whiteList = [ - "/404", - "/401", +// const whiteList = [ + // "/404", + // "/401", // '/drugArchives', // "/cosmeticsArchives", - "/cosmeticsDetail", - "/health", - "/zyzj", -]; + // "/cosmeticsDetail", + // "/health", + // "/zyzj", +// ]; NProgress.configure({ showSpinner: false }); router.beforeEach((to, from, next) => { NProgress.start(); + let token = localStorage.getItem('MSSM-LIAONING__TOKEN') console.log(to.path); - if (whiteList.indexOf(to.path) == -1) { - if (token) { - console.log(store.state.myselfPermission.routerList,'store.state.myselfPermission.routerList') - if (store.state.myselfPermission.routerList.length > 0) { - let current = store.state.myselfPermission.routerList.filter( - (item) => item.path == to.path || from.path == "/" - ); - console.log(current,'current') - if (current.length > 0) { + if (token) { + if (store.state.myselfPermission.routerList.length == 0) { + + store.dispatch("GetPermission").then((res) => { + next({path:to.path}); + }).catch((error) => { + kickOut(); + }); + + } else { + let current = store.state.myselfPermission.routerList.filter( + (item) => item.path == to.path || from.path == "/" + ); + if (current.length > 0) { + next(); + } else { + //根据参数判断是否可以跳 + if (to.query.type && to.path == '/cosmeticsDetail') { next(); } else { - //根据参数判断是否可以跳 - if (to.query.type && to.path == '/cosmeticsDetail') { - next(); - } else { - next() - Message.error("无权限访问!"); - } + Message.error("无权限访问!"); } - } else { - store - .dispatch("GetPermission") - .then((res) => { - console.log(res,'res') - if (res.length > 0) { - next({ path: res }); - } else { - kickOut(); - } - }) - .catch((error) => { - kickOut(); - }); } - } else { - // 没有token - Message.error("获取令牌失败!"); - kickOut(); } } else { + // 没有token + Message.error("获取令牌失败!"); kickOut(); - } +} }); router.afterEach(() => { diff --git a/src/store/modules/myselfPermission.js b/src/store/modules/myselfPermission.js index 05b6145..710b2b5 100644 --- a/src/store/modules/myselfPermission.js +++ b/src/store/modules/myselfPermission.js @@ -62,9 +62,19 @@ const selfPermission = { (item) => item.appCode == "CPGL" ); let fileTreeOut = filterTree(menuTree[0].childMenuList, []); - fileTreeOut[0].meta.affix = true + // let fileTreeOut = []; + + // menuTree[0].childMenuList.forEach((item) => { + // staticRouter.forEach((router, index) => { + // if (item.menuUrl == router.path) { + // fileTreeOut.push(router); + // } + // }); + // }); + + fileTreeOut[4].meta.affix = true commit("SET_ROUTER", fileTreeOut); - resolve(fileTreeOut.length > 0 ? fileTreeOut[0].path : []); + resolve(fileTreeOut.length > 0 ? fileTreeOut[4].path : []); }) .catch((error) => { reject(error); diff --git a/src/views/index.vue b/src/views/index.vue index 0a1e430..ed8967c 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,7 +1,10 @@