From 12e777866982ed73e1f3cbab0a24f2eea1462066 Mon Sep 17 00:00:00 2001 From: zhanglp Date: Sun, 24 Jul 2022 12:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E5=92=8C?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/menu.ts | 33 --- src/api/role.ts | 31 +++ src/api/user.ts | 9 +- src/components/QuickCrud/index.vue | 217 ++++++++++--------- src/layout/components/AiniMenu/index.vue | 43 ++-- src/layout/components/AiniMenuItem/index.vue | 35 +-- src/layout/components/AiniSidebar/index.vue | 15 +- src/layout/index.vue | 73 +++---- src/pages/login/index.vue | 14 +- src/store/modules/menu.ts | 25 +-- src/store/modules/tab.ts | 1 - src/store/modules/user.ts | 32 ++- src/types/menu.ts | 4 +- src/types/tab.ts | 6 +- src/types/table.ts | 14 +- src/views/role/index.vue | 2 +- src/views/rolePermission/index.vue | 165 ++++++++------ src/views/user/index.vue | 6 +- 18 files changed, 368 insertions(+), 357 deletions(-) diff --git a/src/api/menu.ts b/src/api/menu.ts index 2feffcd..c612318 100644 --- a/src/api/menu.ts +++ b/src/api/menu.ts @@ -2,35 +2,10 @@ import { Menu } from '../types/menu' import request, { QuickResponseData } from '../utils/request' const Api = { - roleMenuLsit: '/api/menu/getRoleMenuLsit', - permissionMenuList: '/api/menu/getPermission', list: '/api/menu/getList', add: '/api/menu/add', update: '/api/menu/update', delete: '/api/menu/delete', - assign: '/api/menu/assignPermission', -} -export const getRoleMenuLsit = ( - roleId: string -): Promise>> => { - return request>>({ - url: Api.roleMenuLsit, - method: 'GET', - params: { - id: roleId, - }, - }) -} -export const getPermissionMenuList = ( - userId: string -): Promise>> => { - return request>>({ - url: Api.permissionMenuList, - method: 'GET', - params: { - id: userId, - }, - }) } export const getMenuList = (): Promise>> => { return request>>({ @@ -61,11 +36,3 @@ export const deleteMenu = (id: string) => { }, }) } - -export const assignPermission = (data: any) => { - return request({ - url: Api.assign, - method: 'POST', - data, - }) -} diff --git a/src/api/role.ts b/src/api/role.ts index 64b7e7a..0c70ab8 100644 --- a/src/api/role.ts +++ b/src/api/role.ts @@ -1,12 +1,29 @@ +import { Menu } from '@/types/menu' import { Role } from '../types/role' import request, { QuickResponseData } from '../utils/request' const Api = { + menuList: '/api/role/getMenuPermission', + userList: '/api/role/getUserPermission', list: '/api/role/getList', add: '/api/role/add', update: '/api/role/update', delete: '/api/role/delete', + assignPermission: '/api/role/assignPermission', + assignUser: '/api/role/assignUser', } +export const getMenuPermission = ( + roleId: string +): Promise>> => { + return request>>({ + url: Api.menuList, + method: 'GET', + params: { + id: roleId, + }, + }) +} + export const getRoleList = (): Promise>> => { return request>>({ url: Api.list, @@ -37,3 +54,17 @@ export const deleteRole = (id: string) => { }, }) } +export const assignPermission = (data: any) => { + return request({ + url: Api.assignPermission, + method: 'POST', + data, + }) +} +export const assignUser = (data: any) => { + return request({ + url: Api.assignUser, + method: 'POST', + data, + }) +} diff --git a/src/api/user.ts b/src/api/user.ts index 96692d9..9b6fab3 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,3 +1,4 @@ +import { Menu } from '@/types/menu' import { ChangePassword, User } from '../types/user' import request, { QuickResponseData } from '../utils/request' @@ -15,12 +16,14 @@ const Api = { enabled: '/api/user/enabled', disable: '/api/user/disable', } -export const getPermission = (userId: string) => { +export const getPermission = ( + userId: string +): Promise>> => { return request({ url: Api.permission, method: 'GET', - data: { - userId, + params: { + id: userId, }, }) } diff --git a/src/components/QuickCrud/index.vue b/src/components/QuickCrud/index.vue index 6dc6f2a..92cd07a 100644 --- a/src/components/QuickCrud/index.vue +++ b/src/components/QuickCrud/index.vue @@ -411,107 +411,120 @@ onActivated(() => { }) + diff --git a/src/layout/components/AiniMenu/index.vue b/src/layout/components/AiniMenu/index.vue index e6fb2c4..4dafee5 100644 --- a/src/layout/components/AiniMenu/index.vue +++ b/src/layout/components/AiniMenu/index.vue @@ -1,56 +1,57 @@ diff --git a/src/layout/components/AiniMenuItem/index.vue b/src/layout/components/AiniMenuItem/index.vue index 61e3845..97673da 100644 --- a/src/layout/components/AiniMenuItem/index.vue +++ b/src/layout/components/AiniMenuItem/index.vue @@ -1,19 +1,13 @@