diff --git a/src/api/index.js b/src/api/index.js index 5ef267d..99014f9 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -50,7 +50,7 @@ export default { // 权限菜单管理 doAssign:`/data/data/permission/doAssign`, - queryPermissionMenu:`/users/user-role/grantAllPermissions`, + queryAllMenus:`/users/users/permission/queryAllMenus`, savePer:`/users/user-role/rolePermissionService`, toAssign:`/data/data/permission/toAssign`, diff --git a/src/pages/role/list/index.vue b/src/pages/role/list/index.vue index 5f4f524..3d926e0 100644 --- a/src/pages/role/list/index.vue +++ b/src/pages/role/list/index.vue @@ -116,7 +116,7 @@ export default { }, methods: { getData() { - this.$get(`${this.api.listRole}?page=${this.page}&size=${this.pageSize}&name=${this.keyword}`).then(res => { + this.$get(`${this.api.listRole}?page=${this.page}&size=${this.pageSize}&name=${this.keyword}&platformId=${Setting.platformId}`).then(res => { this.listData = res.rolePage.records this.total = res.rolePage.total if(!this.listData.length && this.total){ @@ -147,8 +147,8 @@ export default { // 获取权限树 getPer(){ if(!this.permissions.length){ - this.$get(`${this.api.getPermissions}?platformId=${Setting.platformId}`).then(res => { - this.permissions = res.permissionMenu[0].children + this.$get(`${this.api.queryAllMenus}?platformId=${Setting.platformId}`).then(res => { + this.permissions = res.children[0].children }).catch(res => {}) } },