diff --git a/src/api/system/permission/index.ts b/src/api/system/permission/index.ts index 958b4718..baf2805b 100644 --- a/src/api/system/permission/index.ts +++ b/src/api/system/permission/index.ts @@ -22,12 +22,12 @@ export const getRoleMenuList = async (roleId: number) => { } // 赋予角色菜单权限 -export const assignRoleMenuApi = async (data: PermissionAssignRoleMenuReqVO) => { +export const assignRoleMenu = async (data: PermissionAssignRoleMenuReqVO) => { return await request.post({ url: '/system/permission/assign-role-menu', data }) } // 赋予角色数据权限 -export const assignRoleDataScopeApi = async (data: PermissionAssignRoleDataScopeReqVO) => { +export const assignRoleDataScope = async (data: PermissionAssignRoleDataScopeReqVO) => { return await request.post({ url: '/system/permission/assign-role-data-scope', data }) } diff --git a/src/api/system/role/index.ts b/src/api/system/role/index.ts index 902d5ca6..93636ff0 100644 --- a/src/api/system/role/index.ts +++ b/src/api/system/role/index.ts @@ -7,6 +7,8 @@ export interface RoleVO { sort: number status: number type: number + dataScope: number + dataScopeDeptIds: number[] createTime: Date } @@ -49,6 +51,7 @@ export const updateRoleStatus = async (data: UpdateStatusReqVO) => { export const deleteRole = async (id: number) => { return await request.delete({ url: '/system/role/delete?id=' + id }) } + // 导出角色 export const exportRole = (params) => { return request.download({ diff --git a/src/views/system/role/DataPermissionForm.vue b/src/views/system/role/DataPermissionForm.vue deleted file mode 100644 index bccc5f46..00000000 --- a/src/views/system/role/DataPermissionForm.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - diff --git a/src/views/system/role/RoleAssignMenuForm.vue b/src/views/system/role/RoleAssignMenuForm.vue index c016a51f..db33811e 100644 --- a/src/views/system/role/RoleAssignMenuForm.vue +++ b/src/views/system/role/RoleAssignMenuForm.vue @@ -1,12 +1,6 @@