From 581b301eed5382d6508369d7e80e41ca5c5c817d Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 27 Mar 2023 12:02:43 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E5=88=97=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B5=E9=9D=A2=E6=89=93=E4=B8=8D=E5=BC=80?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88=E7=AD=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/role/index.ts | 19 +++++++++++++------ src/types/auto-components.d.ts | 2 -- src/views/system/role/MenuPermissionForm.vue | 8 ++++---- src/views/system/role/RoleForm.vue | 4 ++-- src/views/system/role/index.vue | 2 +- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/api/system/role/index.ts b/src/api/system/role/index.ts index 9692548a..7cb85951 100644 --- a/src/api/system/role/index.ts +++ b/src/api/system/role/index.ts @@ -23,7 +23,7 @@ export interface UpdateStatusReqVO { } // 查询角色列表 -export const getRolePageApi = async (params: RolePageReqVO) => { +export const getRolePage = async (params: RolePageReqVO) => { return await request.get({ url: '/system/role/page', params }) } @@ -33,26 +33,33 @@ export const getSimpleRoleList = async (): Promise => { } // 查询角色详情 -export const getRoleApi = async (id: number) => { +export const getRole = async (id: number) => { return await request.get({ url: '/system/role/get?id=' + id }) } // 新增角色 -export const createRoleApi = async (data: RoleVO) => { +export const createRole = async (data: RoleVO) => { return await request.post({ url: '/system/role/create', data }) } // 修改角色 -export const updateRoleApi = async (data: RoleVO) => { +export const updateRole = async (data: RoleVO) => { return await request.put({ url: '/system/role/update', data }) } // 修改角色状态 -export const updateRoleStatusApi = async (data: UpdateStatusReqVO) => { +export const updateRoleStatus = async (data: UpdateStatusReqVO) => { return await request.put({ url: '/system/role/update-status', data }) } // 删除角色 -export const deleteRoleApi = async (id: number) => { +export const deleteRole = async (id: number) => { return await request.delete({ url: '/system/role/delete?id=' + id }) } +// 导出角色 +export const exportRole = (params) => { + return request.download({ + url: '/system/role/export-excel', + params + }) +} diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts index 04eb4d9e..f6f6a5f9 100644 --- a/src/types/auto-components.d.ts +++ b/src/types/auto-components.d.ts @@ -52,7 +52,6 @@ declare module '@vue/runtime-core' { ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] @@ -100,7 +99,6 @@ declare module '@vue/runtime-core' { ScriptTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue')['default'] Search: typeof import('./../components/Search/src/Search.vue')['default'] SignalAndMessage: typeof import('./../components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue')['default'] - Src: typeof import('./../components/RightToolbar/src/index.vue')['default'] Sticky: typeof import('./../components/Sticky/src/Sticky.vue')['default'] Table: typeof import('./../components/Table/src/Table.vue')['default'] Tooltip: typeof import('./../components/Tooltip/src/Tooltip.vue')['default'] diff --git a/src/views/system/role/MenuPermissionForm.vue b/src/views/system/role/MenuPermissionForm.vue index 4628ef24..650fb659 100644 --- a/src/views/system/role/MenuPermissionForm.vue +++ b/src/views/system/role/MenuPermissionForm.vue @@ -96,8 +96,8 @@ import type { FormExpose } from '@/components/Form' import { handleTree, defaultProps } from '@/utils/tree' import { SystemDataScopeEnum } from '@/utils/constants' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' -import { listSimpleMenusApi } from '@/api/system/menu' -import { listSimpleDeptApi } from '@/api/system/dept' +import * as MenuApi from '@/api/system/menu' +import * as DeptApi from '@/api/system/dept' import * as PermissionApi from '@/api/system/permission' // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 @@ -131,7 +131,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => { actionScopeType.value = type dialogScopeVisible.value = true if (type === 'menu') { - const menuRes = await listSimpleMenusApi() + const menuRes = await MenuApi.getSimpleMenusList() treeOptions.value = handleTree(menuRes) const role = await PermissionApi.listRoleMenusApi(row.id) if (role) { @@ -140,7 +140,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => { }) } } else if (type === 'data') { - const deptRes = await listSimpleDeptApi() + const deptRes = await DeptApi.getSimpleDeptList() treeOptions.value = handleTree(deptRes) const role = await RoleApi.getRole(row.id) dataScopeForm.dataScope = role.dataScope diff --git a/src/views/system/role/RoleForm.vue b/src/views/system/role/RoleForm.vue index 0fdb130b..a72eba19 100644 --- a/src/views/system/role/RoleForm.vue +++ b/src/views/system/role/RoleForm.vue @@ -44,12 +44,11 @@