diff --git a/src/store/modules/core/auth.js b/src/store/modules/core/auth.js index 3330b67..bd98323 100644 --- a/src/store/modules/core/auth.js +++ b/src/store/modules/core/auth.js @@ -19,20 +19,6 @@ const _verifyPermission = (data, permissionData) => { }); }; -/** - * 临时展开数据 高玉需要把资源接口改成一维数组 - */ -const _getData = (data) => { - let newData = []; - data.forEach((i) => { - if (i.menuChild) { - newData = newData.concat(_getData(i.menuChild)); - } - newData.push(i); - }); - - return newData; -}; const state = () => ({ userInfo: null, permission: [], @@ -140,7 +126,7 @@ const actions = { }, getPermission: async ({ commit }) => { let res = await getPermission({ systemId: 1 }); - const permissionData = _verifyPermission(routerData, _getData(res)); + const permissionData = _verifyPermission(routerData, res); console.log(permissionData, 'permissionData'); if (permissionData) { commit('setPermission', permissionData); diff --git a/src/views/permission/dept/index.vue b/src/views/permission/dept/index.vue index 709d0fe..f36c10d 100644 --- a/src/views/permission/dept/index.vue +++ b/src/views/permission/dept/index.vue @@ -95,6 +95,7 @@ :config="employeeConfig" :data="employeeList" :operation="['search']" + :reset="handleResetEmployee" @search="handleSearchEmployee" >