diff --git a/web/client/src/sections/organization/nav-item.js b/web/client/src/sections/organization/nav-item.js index 6b25267..fdb9d75 100644 --- a/web/client/src/sections/organization/nav-item.js +++ b/web/client/src/sections/organization/nav-item.js @@ -2,7 +2,7 @@ import React from 'react'; import { Link } from 'react-router-dom'; import { Menu } from 'antd'; import { SettingOutlined } from '@ant-design/icons'; - +import { Func } from '$utils'; const SubMenu = Menu.SubMenu; export function getNavItem(user, dispatch) { @@ -10,13 +10,13 @@ export function getNavItem(user, dispatch) { // return null // } return ( - } title={'组织管理'}> - + Func.isAuthorized('ORG_MANAGE') && } title={'组织管理'}> + {Func.isAuthorized('USER_CONFIG') && 部门成员 - - + } + {Func.isAuthorized('AUTH_CONFIG') && 权限配置 - + } ); } \ No newline at end of file diff --git a/web/client/src/sections/patrolManage/nav-item.js b/web/client/src/sections/patrolManage/nav-item.js index 62639a8..7b75be9 100644 --- a/web/client/src/sections/patrolManage/nav-item.js +++ b/web/client/src/sections/patrolManage/nav-item.js @@ -2,7 +2,7 @@ import React from 'react'; import { Link } from 'react-router-dom'; import { Menu } from 'antd'; import { SettingOutlined } from '@ant-design/icons'; - +import { Func } from '$utils'; const SubMenu = Menu.SubMenu; export function getNavItem (user, dispatch) { @@ -10,19 +10,19 @@ export function getNavItem (user, dispatch) { // return null // } return ( - } title={'巡检管理'}> - + Func.isAuthorized('PATROL_MANAGE') && } title={'巡检管理'}> + {Func.isAuthorized('PATROL_PLAN_CONFIG') && 巡检计划制定 - - + } + {Func.isAuthorized('PATROL_RECORD_VIEW') && 巡检记录 - - + } + {Func.isAuthorized('CHECKITEMSET') && 检查项设定 - - + } + {Func.isAuthorized('CHECKMOULD') && 巡检模板 - + } ); } \ No newline at end of file diff --git a/web/client/src/sections/projectRegime/nav-item.js b/web/client/src/sections/projectRegime/nav-item.js index 72ac1b4..cd3973c 100644 --- a/web/client/src/sections/projectRegime/nav-item.js +++ b/web/client/src/sections/projectRegime/nav-item.js @@ -2,17 +2,17 @@ import React from 'react'; import { Link } from 'react-router-dom'; import { Menu } from 'antd'; import { SettingOutlined } from '@ant-design/icons'; - +import { Func } from '$utils'; const SubMenu = Menu.SubMenu; export function getNavItem (user, dispatch) { - return } title={'结构物管理'}> - + return Func.isAuthorized('STRUCTURE_MANAGE') && } title={'结构物管理'}> + {Func.isAuthorized('STRU_INFO_CONFIG') && 结构物基础信息管理 - - + } + {Func.isAuthorized('QR_CODE_CONFIG') && 二维码管理 - + } } \ No newline at end of file diff --git a/web/client/src/utils/func.js b/web/client/src/utils/func.js index e473145..bbfb815 100644 --- a/web/client/src/utils/func.js +++ b/web/client/src/utils/func.js @@ -3,8 +3,8 @@ export default class Func { static isAuthorized(authcode) { if (JSON.parse(sessionStorage.getItem('user'))) { - const { resources } = JSON.parse(sessionStorage.getItem('user')); - return resources.includes(authcode); + const { userResources } = JSON.parse(sessionStorage.getItem('user')); + return userResources.includes(authcode); }else{ return false; }