diff --git a/src/store/getters.js b/src/store/getters.js index a7ca8c63b..089b8517b 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -6,7 +6,6 @@ const getters = { user: state => state.user.user, avatar: state => state.user.avatar, nickname: state => state.user.name, - roles: state => state.user.roles, addRouters: state => state.permission.addRouters, apiUrl: state => { if (state.app.apiUrl) { diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index c192ae300..aa58b6af1 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -21,22 +21,6 @@ function hasPermission(permission, route) { return true } -/** - * 单账户多角色时,使用该方法可过滤角色不存在的菜单 - * - * @param roles - * @param route - * @returns {*} - */ -// eslint-disable-next-line -function hasRole(roles, route) { - if (route.meta && route.meta.roles) { - return route.meta.roles.includes(roles.id) - } else { - return true - } -} - function filterAsyncRouter(routerMap, roles) { const accessedRouters = routerMap.filter(route => { if (hasPermission(roles.permissionList, route)) { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 0c46e3117..acdd27fff 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -8,7 +8,6 @@ const user = { token: null, name: '', avatar: '', - roles: [], info: {}, user: {} }, @@ -23,9 +22,6 @@ const user = { SET_AVATAR: (state, avatar) => { state.avatar = avatar }, - SET_ROLES: (state, roles) => { - state.roles = roles - }, SET_INFO: (state, info) => { state.info = info },