From e0bf4eef82e997350ed7fb477109f8096a3b47cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Fri, 17 Jun 2022 08:37:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=A4=9A=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.js | 2 +- src/router/index.js | 16 ++++++++-------- src/views/hrm/employee.vue | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/config/index.js b/src/config/index.js index 8316c4eb..ea37f441 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -40,7 +40,7 @@ const DEFAULT_CONFIG = { MENU_UNIQUE_OPENED: false, //是否开启多标签 - LAYOUT_TAGS: true, + LAYOUT_TAGS: false, //语言 LANG: 'zh-cn', diff --git a/src/router/index.js b/src/router/index.js index f2a6ed3f..a7be01ee 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -66,13 +66,13 @@ router.beforeEach(async (to, from, next) => { } //加载动态/静态路由 if(!isGetRouter){ - let apiMenu = tool.data.get("MENU") || [] + // let apiMenu = tool.data.get("MENU") || [] let userInfo = tool.data.get("USER_INFO") let userMenu = treeFilter(userRoutes, node => { - return node.meta.role ? node.meta.role.filter(item=>userInfo.role.indexOf(item)>-1).length > 0 : true + return node.meta.perms ? node.meta.perms.filter(item=>userInfo.perms.indexOf(item)>-1).length > 0 : true }) - let menu = [...userMenu, ...apiMenu] - var menuRouter = filterAsyncRouter(menu) + // let menu = [...userMenu, ...apiMenu] + var menuRouter = filterAsyncRouter(userMenu) menuRouter = flatAsyncRoutes(menuRouter) menuRouter.forEach(item => { router.addRoute("layout", item) @@ -102,13 +102,13 @@ router.onError((error) => { //入侵追加自定义方法、对象 router.sc_getMenu = () => { - var apiMenu = tool.data.get("MENU") || [] + // var apiMenu = tool.data.get("MENU") || [] let userInfo = tool.data.get("USER_INFO") let userMenu = treeFilter(userRoutes, node => { - return node.meta.role ? node.meta.role.filter(item=>userInfo.role.indexOf(item)>-1).length > 0 : true + return node.meta.perms ? node.meta.perms.filter(item=>userInfo.perms.indexOf(item)>-1).length > 0 : true }) - var menu = [...userMenu, ...apiMenu] - return menu + // var menu = [...userMenu, ...apiMenu] + return userMenu } //转换 diff --git a/src/views/hrm/employee.vue b/src/views/hrm/employee.vue index 8c845019..2799d711 100644 --- a/src/views/hrm/employee.vue +++ b/src/views/hrm/employee.vue @@ -2,19 +2,19 @@
- +
- +
- + @@ -25,7 +25,7 @@ {{scope.row.belong_dept_.name}} - +