修复权限bug

dev_2022-05-11
yujialong 3 years ago
parent 897d16fcdb
commit 6aa514738b
  1. 10
      src/layouts/header/index.vue
  2. 22
      src/router/index.js
  3. 29
      src/router/routes.js

@ -10,7 +10,7 @@
<span class="m-l-10">{{ customer ? customerName : userName }}</span> <span class="m-l-10">{{ customer ? customerName : userName }}</span>
</div> </div>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-button type="text" class="ml20" @click="logout">退出</el-button> <el-button type="text" class="ml20" @click="loginout">退出</el-button>
</div> </div>
</div> </div>
</template> </template>
@ -35,8 +35,14 @@ export default {
}, },
methods: { methods: {
...mapActions("user", [ ...mapActions("user", [
"logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName" "setTitle", "setLogoUrl", "setAvatar", "setUserName"
]), ]),
loginout() {
this.$router.push('/login');
localStorage.clear();
sessionStorage.clear()
location.reload();
},
toPersonal() { toPersonal() {
if (!this.customer) { if (!this.customer) {
this.$router.push("/setting/person"); this.$router.push("/setting/person");

@ -16,7 +16,7 @@ const createRouter = () => new Router({
routes routes
}); });
console.log(routes);
export function resetRouter() { export function resetRouter() {
const newRouter = createRouter(); const newRouter = createRouter();
router.matcher = newRouter.matcher; router.matcher = newRouter.matcher;
@ -57,7 +57,7 @@ function getPermission() {
// 取得路由的值,使用addRouter添加进路由里 // 取得路由的值,使用addRouter添加进路由里
// 该项目的路由实际上做了两层处理,一层指向了默认的路由,对应模块,用于基础布局的nav,下面一层才是实际上的路由跳转, // 该项目的路由实际上做了两层处理,一层指向了默认的路由,对应模块,用于基础布局的nav,下面一层才是实际上的路由跳转,
// 所以需要默认进行赋值,实际操作时根据path去禁用掉对应的nav即可。 // 所以需要默认进行赋值,实际操作时根据path去禁用掉对应的nav即可。
const arr = ["achievement", "assessment", "course", "evaluation", "information", "match", "project", "setting", "student", "system"]; const arr = ["student", "evaluation", "assessment", "achievement", "course", "information", "match", "project", "system"];
let permissionRouters = []; // 最后处理好的路由数组 let permissionRouters = []; // 最后处理好的路由数组
let data = res.permissionMenu[0].children; let data = res.permissionMenu[0].children;
@ -66,6 +66,8 @@ function getPermission() {
// 第一级路由,需要根据匹配到的path,塞进对应的路由children里 // 第一级路由,需要根据匹配到的path,塞进对应的路由children里
let str = e.path.split("/")[1]; let str = e.path.split("/")[1];
let index = arr.indexOf(str); let index = arr.indexOf(str);
console.log(index);
if (index !== -1) {
let obj = { let obj = {
path: e.path, path: e.path,
name: arr[index] + "-list", name: arr[index] + "-list",
@ -79,7 +81,9 @@ function getPermission() {
if (e.children && e.children.length > 0) { if (e.children && e.children.length > 0) {
e.children.forEach(i => { e.children.forEach(i => {
// 避免重复生成路由 // 避免重复生成路由
if (i.path && !permissionRouters[index].children.some(e => i.path === e.path)) { console.log(i.path);
console.log(permissionRouters[index]);
if (i.path && permissionRouters[index] && !permissionRouters[index].children.some(e => i.path === e.path)) {
// console.log(i.path,'当前二级路由的路径') // console.log(i.path,'当前二级路由的路径')
let obj = { let obj = {
path: i.path, path: i.path,
@ -106,7 +110,7 @@ function getPermission() {
let nowIndex = permissionRouters.findIndex(e => { let nowIndex = permissionRouters.findIndex(e => {
return e.path === `/${str}`; return e.path === `/${str}`;
}); });
if (nowIndex != -1 && !permissionRouters[nowIndex].children.some(e => e.path === obj.path)) { if (nowIndex != -1 && permissionRouters[nowIndex] && !permissionRouters[nowIndex].children.some(e => e.path === obj.path)) {
permissionRouters[nowIndex].children.push(obj); permissionRouters[nowIndex].children.push(obj);
} }
} }
@ -118,7 +122,7 @@ function getPermission() {
if (i.children && i.children.length) { if (i.children && i.children.length) {
i.children.forEach(j => { i.children.forEach(j => {
if (j.path && !permissionRouters[index].children.some(e => j.path === e.path)) { if (j.path && permissionRouters[index] && !permissionRouters[index].children.some(e => j.path === e.path)) {
// console.log(j.path,'当前三级路由的路径') // console.log(j.path,'当前三级路由的路径')
let obj = { let obj = {
path: j.path, path: j.path,
@ -145,7 +149,7 @@ function getPermission() {
let nowIndex = permissionRouters.findIndex(e => { let nowIndex = permissionRouters.findIndex(e => {
return e.path === `/${str}`; return e.path === `/${str}`;
}); });
if (nowIndex != -1 && !permissionRouters[nowIndex].children.some(e => e.path === obj.path)) { if (nowIndex != -1 && permissionRouters[nowIndex] && !permissionRouters[nowIndex].children.some(e => e.path === obj.path)) {
permissionRouters[nowIndex].children.push(obj); permissionRouters[nowIndex].children.push(obj);
} }
} }
@ -185,12 +189,18 @@ function getPermission() {
permissionRouters[nowIndex].children.push(obj); permissionRouters[nowIndex].children.push(obj);
} }
} }
}
}); });
// console.log(permissionRouters, "处理好的"); // console.log(permissionRouters, "处理好的");
// 把处理完成的路由,add到router里 // 把处理完成的路由,add到router里
// 记录一下路由的名称,用于nav // 记录一下路由的名称,用于nav
let nav = data.map(e => e.path); let nav = data.map(e => e.path);
router.app.$options.store.commit("routers", nav); router.app.$options.store.commit("routers", nav);
let redirect = [{
path: "/index",
redirect: permissionRouters[0].path
}];
router.addRoutes(redirect);
router.addRoutes(permissionRouters); router.addRoutes(permissionRouters);
router.addRoutes(errorPage); router.addRoutes(errorPage);
} }

@ -7,10 +7,6 @@ const frameIn = [
path: "/", path: "/",
redirect: "/login" redirect: "/login"
}, },
{
path: "/index",
redirect: "/student"
},
{ {
path: "/", path: "/",
component: () => BasicLayout, component: () => BasicLayout,
@ -44,28 +40,6 @@ const frameOut = [
} }
]; ];
/**
* 错误页面
*/
const errorPage = [
{
path: "/403",
name: "403",
meta: {
title: "403"
},
component: () => import("@/pages/exception/error/403")
},
{
path: "*",
name: "404",
meta: {
title: "404"
},
component: () => import("@/pages/exception/error/404")
}
];
// 导出需要显示菜单的 // 导出需要显示菜单的
export const frameInRoutes = frameIn; export const frameInRoutes = frameIn;
@ -73,6 +47,5 @@ export const frameInRoutes = frameIn;
// 重新组织后导出 // 重新组织后导出
export default [ export default [
...frameIn, ...frameIn,
...frameOut, ...frameOut
// ...errorPage
]; ];
Loading…
Cancel
Save