diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 587fa28..d424962 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -120,17 +120,23 @@ }) }, // 获取用户权限 - GetMenus({ commit, state }) { - console.log('in store.permission.js:GetMenus:') + GetMenus({ commit, state }, currentSystem) { + // console.log('in store.permission.js:GetMenus:') + console.log('获取' + currentSystem.name + '的菜单') + const params = { + parentCode: currentSystem.code // 传入该子系统的code,获取子系统的权限 + } return new Promise((resolve, reject) => { - getMenus(state.token).then(response => { // 处理返回值 + // 此处获取用户所有权限 + getMenus(params).then(response => { // 处理返回值 const data = response.data const menus = [] // 仅菜单 const btns = [] // 非菜单 if (data.menus && data.menus.length > 0) { - commit('SET_MENUS', data.menus) - for (const menu of data.menus) { // 遍历菜单,获取所有的权限项 - if (menu.ismenu === '1') { // 将是菜单的放入menus + const allmenus = [...data.menus] + commit('SET_MENUS', allmenus) + for (const menu of allmenus) { // 遍历菜单,获取所有的权限项 + if (menu.resourceType === '02' || menu.resourceType === '03') { // 将是菜单的放入menus const menu_tmp = {} menu_tmp.url = menu.url menu_tmp.icon = menu.icon @@ -142,11 +148,11 @@ btn_tmp.name = menu.name btn_tmp.icon = menu.icon btns.push(btn_tmp) - // console.log(menu.url) } } // 过滤路由表 - const accessedRouters = filterAsyncRouter(asyncRouterMap, menus) + let accessedRouters = filterAsyncRouter(asyncRouterMap, menus) + // accessedRouters = filterRedirect(accessedRouters) commit('SET_BTNS', btns) commit('SET_ROUTERS', accessedRouters) resolve(response)