Skip to content

Commit 8f49426

Browse files
gdc797gitee-org
gdc797
authored and
gitee-org
committed
Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: 凌太虚 <[email protected]>
2 parents d034e9b + 944b70c commit 8f49426

File tree

45 files changed

+2537
-1630
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2537
-1630
lines changed

‎src/api/bpm/userGroup/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,37 @@ export type UserGroupVO = {
1111
}
1212

1313
// 创建用户组
14-
export const createUserGroupApi = async (data: UserGroupVO) => {
14+
export const createUserGroup = async (data: UserGroupVO) => {
1515
return await request.post({
1616
url: '/bpm/user-group/create',
1717
data: data
1818
})
1919
}
2020

2121
// 更新用户组
22-
export const updateUserGroupApi = async (data: UserGroupVO) => {
22+
export const updateUserGroup = async (data: UserGroupVO) => {
2323
return await request.put({
2424
url: '/bpm/user-group/update',
2525
data: data
2626
})
2727
}
2828

2929
// 删除用户组
30-
export const deleteUserGroupApi = async (id: number) => {
30+
export const deleteUserGroup = async (id: number) => {
3131
return await request.delete({ url: '/bpm/user-group/delete?id=' + id })
3232
}
3333

3434
// 获得用户组
35-
export const getUserGroupApi = async (id: number) => {
35+
export const getUserGroup = async (id: number) => {
3636
return await request.get({ url: '/bpm/user-group/get?id=' + id })
3737
}
3838

3939
// 获得用户组分页
40-
export const getUserGroupPageApi = async (params) => {
40+
export const getUserGroupPage = async (params) => {
4141
return await request.get({ url: '/bpm/user-group/page', params })
4242
}
4343

4444
// 获取用户组精简信息列表
45-
export const listSimpleUserGroupsApi = async () => {
45+
export const listSimpleUserGroup = async () => {
4646
return await request.get({ url: '/bpm/user-group/list-all-simple' })
4747
}

‎src/api/infra/apiErrorLog/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export interface ApiErrorLogExportReqVO {
4646
}
4747

4848
// 查询列表API 访问日志
49-
export const getApiErrorLogPageApi = (params: ApiErrorLogPageReqVO) => {
49+
export const getApiErrorLogPageApi = (params: PageParam) => {
5050
return request.get({ url: '/infra/api-error-log/page', params })
5151
}
5252

@@ -58,7 +58,7 @@ export const updateApiErrorLogPageApi = (id: number, processStatus: number) => {
5858
}
5959

6060
// 导出API 访问日志
61-
export const exportApiErrorLogApi = (params: ApiErrorLogExportReqVO) => {
61+
export const exportApiErrorLogApi = (params) => {
6262
return request.download({
6363
url: '/infra/api-error-log/export-excel',
6464
params

‎src/api/system/dict/dict.data.ts

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,49 @@
11
import request from '@/config/axios'
2-
import type { DictDataVO, DictDataPageReqVO, DictDataExportReqVO } from './types'
2+
3+
export type DictDataVO = {
4+
id: number | undefined
5+
sort: number | undefined
6+
label: string
7+
value: string
8+
dictType: string
9+
status: number
10+
colorType: string
11+
cssClass: string
12+
remark: string
13+
createTime: Date
14+
}
315

416
// 查询字典数据（精简)列表
5-
export const listSimpleDictDataApi = () => {
17+
export const listSimpleDictData = () => {
618
return request.get({ url: '/system/dict-data/list-all-simple' })
719
}
820

921
// 查询字典数据列表
10-
export const getDictDataPageApi = (params: DictDataPageReqVO) => {
22+
export const getDictDataPage = (params: PageParam) => {
1123
return request.get({ url: '/system/dict-data/page', params })
1224
}
1325

1426
// 查询字典数据详情
15-
export const getDictDataApi = (id: number) => {
27+
export const getDictData = (id: number) => {
1628
return request.get({ url: '/system/dict-data/get?id=' + id })
1729
}
1830

1931
// 新增字典数据
20-
export const createDictDataApi = (data: DictDataVO) => {
32+
export const createDictData = (data: DictDataVO) => {
2133
return request.post({ url: '/system/dict-data/create', data })
2234
}
2335

2436
// 修改字典数据
25-
export const updateDictDataApi = (data: DictDataVO) => {
37+
export const updateDictData = (data: DictDataVO) => {
2638
return request.put({ url: '/system/dict-data/update', data })
2739
}
2840

2941
// 删除字典数据
30-
export const deleteDictDataApi = (id: number) => {
42+
export const deleteDictData = (id: number) => {
3143
return request.delete({ url: '/system/dict-data/delete?id=' + id })
3244
}
45+
3346
// 导出字典类型数据
34-
export const exportDictDataApi = (params: DictDataExportReqVO) => {
47+
export const exportDictDataApi = (params) => {
3548
return request.get({ url: '/system/dict-data/export', params })
3649
}

‎src/api/system/dict/dict.type.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
11
import request from '@/config/axios'
2-
import type { DictTypeVO, DictTypePageReqVO, DictTypeExportReqVO } from './types'
2+
3+
export type DictTypeVO = {
4+
id: number | undefined
5+
name: string
6+
type: string
7+
status: number
8+
remark: string
9+
createTime: Date
10+
}
311

412
// 查询字典（精简)列表
5-
export const listSimpleDictTypeApi = () => {
13+
export const listSimpleDictType = () => {
614
return request.get({ url: '/system/dict-type/list-all-simple' })
715
}
816

917
// 查询字典列表
10-
export const getDictTypePageApi = (params: DictTypePageReqVO) => {
18+
export const getDictTypePage = (params: PageParam) => {
1119
return request.get({ url: '/system/dict-type/page', params })
1220
}
1321

1422
// 查询字典详情
15-
export const getDictTypeApi = (id: number) => {
23+
export const getDictType = (id: number) => {
1624
return request.get({ url: '/system/dict-type/get?id=' + id })
1725
}
1826

1927
// 新增字典
20-
export const createDictTypeApi = (data: DictTypeVO) => {
28+
export const createDictType = (data: DictTypeVO) => {
2129
return request.post({ url: '/system/dict-type/create', data })
2230
}
2331

2432
// 修改字典
25-
export const updateDictTypeApi = (data: DictTypeVO) => {
33+
export const updateDictType = (data: DictTypeVO) => {
2634
return request.put({ url: '/system/dict-type/update', data })
2735
}
2836

2937
// 删除字典
30-
export const deleteDictTypeApi = (id: number) => {
38+
export const deleteDictType = (id: number) => {
3139
return request.delete({ url: '/system/dict-type/delete?id=' + id })
3240
}
3341
// 导出字典类型
34-
export const exportDictTypeApi = (params: DictTypeExportReqVO) => {
42+
export const exportDictType = (params) => {
3543
return request.get({ url: '/system/dict-type/export', params })
3644
}

‎src/api/system/dict/types.ts

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎src/api/system/errorCode/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import request from '@/config/axios'
22

33
export interface ErrorCodeVO {
4-
id: number
4+
id: number | undefined
55
type: number
66
applicationName: string
7-
code: number
7+
code: number | undefined
88
message: string
99
memo: string
1010
createTime: Date

‎src/api/system/oauth2/token.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,12 @@ export interface OAuth2TokenVO {
1111
expiresTime: Date
1212
}
1313

14-
export interface OAuth2TokenPageReqVO extends PageParam {
15-
userId?: number
16-
userType?: number
17-
clientId?: string
18-
}
19-
2014
// 查询 token列表
21-
export const getAccessTokenPageApi = (params: OAuth2TokenPageReqVO) => {
15+
export const getAccessTokenPage = (params: PageParam) => {
2216
return request.get({ url: '/system/oauth2-token/page', params })
2317
}
2418

2519
// 删除 token
26-
export const deleteAccessTokenApi = (accessToken: number) => {
20+
export const deleteAccessToken = (accessToken: number) => {
2721
return request.delete({ url: '/system/oauth2-token/delete?accessToken=' + accessToken })
2822
}

‎src/api/system/post/index.ts

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,37 @@ export interface PostVO {
1010
createTime?: Date
1111
}
1212

13-
export interface PostPageReqVO extends PageParam {
14-
code?: string
15-
name?: string
16-
status?: number
17-
}
18-
19-
export interface PostExportReqVO {
20-
code?: string
21-
name?: string
22-
status?: number
23-
}
24-
2513
// 查询岗位列表
26-
export const getPostPageApi = async (params: PostPageReqVO) => {
14+
export const getPostPage = async (params: PageParam) => {
2715
return await request.get({ url: '/system/post/page', params })
2816
}
2917

3018
// 获取岗位精简信息列表
31-
export const listSimplePostsApi = async () => {
19+
export const getSimplePostList = async () => {
3220
return await request.get({ url: '/system/post/list-all-simple' })
3321
}
3422

3523
// 查询岗位详情
36-
export const getPostApi = async (id: number) => {
24+
export const getPost = async (id: number) => {
3725
return await request.get({ url: '/system/post/get?id=' + id })
3826
}
3927

4028
// 新增岗位
41-
export const createPostApi = async (data: PostVO) => {
29+
export const createPost = async (data: PostVO) => {
4230
return await request.post({ url: '/system/post/create', data })
4331
}
4432

4533
// 修改岗位
46-
export const updatePostApi = async (data: PostVO) => {
34+
export const updatePost = async (data: PostVO) => {
4735
return await request.put({ url: '/system/post/update', data })
4836
}
4937

5038
// 删除岗位
51-
export const deletePostApi = async (id: number) => {
39+
export const deletePost = async (id: number) => {
5240
return await request.delete({ url: '/system/post/delete?id=' + id })
5341
}
5442

5543
// 导出岗位
56-
export const exportPostApi = async (params: PostExportReqVO) => {
44+
export const exportPost = async (params) => {
5745
return await request.download({ url: '/system/post/export', params })
5846
}

‎src/api/system/user/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@ export const updateUserStatusApi = (id: number, status: number) => {
8686
}
8787

8888
// 获取用户精简信息列表
89-
export const getListSimpleUsersApi = () => {
89+
export const getSimpleUserList = () => {
9090
return request.get({ url: '/system/user/list-all-simple' })
9191
}

‎src/router/modules/remaining.ts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,31 @@ const remainingRouter: AppRouteRecordRaw[] = [
104104
}
105105
]
106106
},
107+
108+
{
109+
path: '/dict',
110+
component: Layout,
111+
name: 'dict',
112+
meta: {
113+
hidden: true
114+
},
115+
children: [
116+
{
117+
path: 'type/data/:dictType',
118+
component: () => import('@/views/system/dict/data.vue'),
119+
name: 'data',
120+
meta: {
121+
title: '字典数据',
122+
noCache: true,
123+
hidden: true,
124+
canTo: true,
125+
icon: '',
126+
activeMenu: 'system/dict/data'
127+
}
128+
}
129+
]
130+
},
131+
107132
{
108133
path: '/codegen',
109134
component: Layout,

0 commit comments

Comments
 (0)