diff --git a/continew-admin-ui/src/api/common/index.ts b/continew-admin-ui/src/api/common/index.ts index bdadc8b5..015634ae 100644 --- a/continew-admin-ui/src/api/common/index.ts +++ b/continew-admin-ui/src/api/common/index.ts @@ -1,8 +1,8 @@ import axios from 'axios'; import qs from 'query-string'; -import { DeptParam } from '@/api/system/dept'; -import { MenuParam } from '@/api/system/menu'; -import { RoleParam } from '@/api/system/role'; +import { ListParam as DeptParam } from '@/api/system/dept'; +import { ListParam as MenuParam } from '@/api/system/menu'; +import { ListParam as RoleParam } from '@/api/system/role'; import { TreeNodeData } from '@arco-design/web-vue'; import { LabelValueState } from '@/store/modules/dict/types'; diff --git a/continew-admin-ui/src/api/monitor/online.ts b/continew-admin-ui/src/api/monitor/online.ts index 9c56baa4..91699b68 100644 --- a/continew-admin-ui/src/api/monitor/online.ts +++ b/continew-admin-ui/src/api/monitor/online.ts @@ -3,7 +3,7 @@ import qs from 'query-string'; const BASE_URL = '/monitor/online/user'; -export interface OnlineUserRecord { +export interface DataRecord { token: string; username: string; nickname: string; @@ -13,19 +13,19 @@ export interface OnlineUserRecord { loginTime: string; } -export interface OnlineUserParam extends Partial { +export interface ListParam extends Partial { page: number; size: number; sort: Array; } -export interface OnlineUserListRes { - list: OnlineUserRecord[]; +export interface ListRes { + list: DataRecord[]; total: number; } -export function listOnlineUser(params: OnlineUserParam) { - return axios.get(BASE_URL, { +export function list(params: ListParam) { + return axios.get(BASE_URL, { params, paramsSerializer: (obj) => { return qs.stringify(obj); diff --git a/continew-admin-ui/src/api/system/dept.ts b/continew-admin-ui/src/api/system/dept.ts index 627b24f6..c541b31d 100644 --- a/continew-admin-ui/src/api/system/dept.ts +++ b/continew-admin-ui/src/api/system/dept.ts @@ -3,7 +3,7 @@ import qs from 'query-string'; const BASE_URL = '/system/dept'; -export interface DeptRecord { +export interface DataRecord { id?: string; name: string; parentId?: string; @@ -15,18 +15,18 @@ export interface DeptRecord { createTime?: string; updateUserString?: string; updateTime?: string; - children?: Array; + children?: Array; parentName?: string; disabled?: boolean; } -export interface DeptParam { +export interface ListParam { name?: string; status?: number; } -export function listDept(params: DeptParam) { - return axios.get(`${BASE_URL}/tree`, { +export function list(params: ListParam) { + return axios.get(`${BASE_URL}/tree`, { params, paramsSerializer: (obj) => { return qs.stringify(obj); @@ -34,18 +34,18 @@ export function listDept(params: DeptParam) { }); } -export function getDept(id: string) { - return axios.get(`${BASE_URL}/${id}`); +export function get(id: string) { + return axios.get(`${BASE_URL}/${id}`); } -export function addDept(req: DeptRecord) { +export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function updateDept(req: DeptRecord, id: string) { +export function update(req: DataRecord, id: string) { return axios.put(`${BASE_URL}/${id}`, req); } -export function deleteDept(ids: string | Array) { +export function del(ids: string | Array) { return axios.delete(`${BASE_URL}/${ids}`); } diff --git a/continew-admin-ui/src/api/system/menu.ts b/continew-admin-ui/src/api/system/menu.ts index 67d5cdab..9a2a3d47 100644 --- a/continew-admin-ui/src/api/system/menu.ts +++ b/continew-admin-ui/src/api/system/menu.ts @@ -3,7 +3,7 @@ import qs from 'query-string'; const BASE_URL = '/system/menu'; -export interface MenuRecord { +export interface DataRecord { id?: string; title: string; parentId?: string; @@ -22,17 +22,17 @@ export interface MenuRecord { createTime?: string; updateUserString?: string; updateTime?: string; - children?: Array; + children?: Array; parentName?: string; } -export interface MenuParam { +export interface ListParam { name?: string; status?: number; } -export function listMenu(params: MenuParam) { - return axios.get(`${BASE_URL}/tree`, { +export function list(params: ListParam) { + return axios.get(`${BASE_URL}/tree`, { params, paramsSerializer: (obj) => { return qs.stringify(obj); @@ -40,18 +40,18 @@ export function listMenu(params: MenuParam) { }); } -export function getMenu(id: string) { - return axios.get(`${BASE_URL}/${id}`); +export function get(id: string) { + return axios.get(`${BASE_URL}/${id}`); } -export function addMenu(req: MenuRecord) { +export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function updateMenu(req: MenuRecord, id: string) { +export function update(req: DataRecord, id: string) { return axios.put(`${BASE_URL}/${id}`, req); } -export function deleteMenu(ids: string | Array) { +export function del(ids: string | Array) { return axios.delete(`${BASE_URL}/${ids}`); } diff --git a/continew-admin-ui/src/api/system/role.ts b/continew-admin-ui/src/api/system/role.ts index 4d75918e..55f0adf5 100644 --- a/continew-admin-ui/src/api/system/role.ts +++ b/continew-admin-ui/src/api/system/role.ts @@ -3,7 +3,7 @@ import qs from 'query-string'; const BASE_URL = '/system/role'; -export interface RoleRecord { +export interface DataRecord { id?: string; name: string; code?: string; @@ -21,7 +21,7 @@ export interface RoleRecord { disabled?: boolean; } -export interface RoleParam { +export interface ListParam { name?: string; status?: number; page?: number; @@ -29,13 +29,13 @@ export interface RoleParam { sort?: Array; } -export interface RoleListRes { - list: RoleRecord[]; +export interface ListRes { + list: DataRecord[]; total: number; } -export function listRole(params: RoleParam) { - return axios.get(`${BASE_URL}`, { +export function list(params: ListParam) { + return axios.get(`${BASE_URL}`, { params, paramsSerializer: (obj) => { return qs.stringify(obj); @@ -43,18 +43,18 @@ export function listRole(params: RoleParam) { }); } -export function getRole(id: string) { - return axios.get(`${BASE_URL}/${id}`); +export function get(id: string) { + return axios.get(`${BASE_URL}/${id}`); } -export function addRole(req: RoleRecord) { +export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function updateRole(req: RoleRecord, id: string) { +export function update(req: DataRecord, id: string) { return axios.put(`${BASE_URL}/${id}`, req); } -export function deleteRole(ids: string | Array) { +export function del(ids: string | Array) { return axios.delete(`${BASE_URL}/${ids}`); } diff --git a/continew-admin-ui/src/api/system/user.ts b/continew-admin-ui/src/api/system/user.ts index fe8239d4..aee53473 100644 --- a/continew-admin-ui/src/api/system/user.ts +++ b/continew-admin-ui/src/api/system/user.ts @@ -3,7 +3,7 @@ import qs from 'query-string'; const BASE_URL = '/system/user'; -export interface UserRecord { +export interface DataRecord { id?: string; username: string; nickname: string; @@ -25,7 +25,7 @@ export interface UserRecord { disabled?: boolean; } -export interface UserParam { +export interface ListParam { username?: string; status?: number; createTime?: Array; @@ -34,13 +34,13 @@ export interface UserParam { sort?: Array; } -export interface UserListRes { - list: UserRecord[]; +export interface ListRes { + list: DataRecord[]; total: number; } -export function listUser(params: UserParam) { - return axios.get(`${BASE_URL}`, { +export function list(params: ListParam) { + return axios.get(`${BASE_URL}`, { params, paramsSerializer: (obj) => { return qs.stringify(obj); @@ -48,19 +48,19 @@ export function listUser(params: UserParam) { }); } -export function getUser(id: string) { - return axios.get(`${BASE_URL}/${id}`); +export function get(id: string) { + return axios.get(`${BASE_URL}/${id}`); } -export function addUser(req: UserRecord) { +export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function updateUser(req: UserRecord, id: string) { +export function update(req: DataRecord, id: string) { return axios.put(`${BASE_URL}/${id}`, req); } -export function deleteUser(ids: string | Array) { +export function del(ids: string | Array) { return axios.delete(`${BASE_URL}/${ids}`); } diff --git a/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue b/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue index 55fdf735..a97a407d 100644 --- a/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue +++ b/continew-admin-ui/src/views/dashboard/workplace/components/announcement.vue @@ -11,8 +11,8 @@ }}
- 暂无公告 -
+ 暂无公告 +
活动 消息 通知 @@ -42,7 +42,7 @@ - {{ detail.title }} + {{ dataDetail.title }}
@@ -50,16 +50,16 @@ 发布人： - {{ detail.createUserString }} + {{ dataDetail.createUserString }} 发布时间： {{ - detail.effectiveTime - ? detail.effectiveTime - : detail.createTime + dataDetail.effectiveTime + ? dataDetail.effectiveTime + : dataDetail.createTime }} @@ -67,13 +67,13 @@ - + -
+
最后更新于： - {{ detail.updateTime }} + {{ dataDetail.updateTime }}
@@ -89,8 +89,8 @@ } from '@/api/dashboard'; import { DataRecord, get } from '@/api/system/announcement'; - const list = ref([]); - const detail = ref({}); + const dataList = ref([]); + const dataDetail = ref({}); const detailLoading = ref(false); const detailVisible = ref(false); @@ -99,7 +99,7 @@ */ const getList = () => { listAnnouncement().then((res) => { - list.value = res.data; + dataList.value = res.data; }); }; getList(); @@ -115,7 +115,7 @@ detailVisible.value = true; get(id) .then((res) => { - detail.value = res.data; + dataDetail.value = res.data; }) .finally(() => { detailLoading.value = false; @@ -127,7 +127,7 @@ */ const handleDetailCancel = () => { detailVisible.value = false; - detail.value = {}; + dataDetail.value = {}; }; diff --git a/continew-admin-ui/src/views/monitor/online/index.vue b/continew-admin-ui/src/views/monitor/online/index.vue index 26e08cc0..42e1cc9e 100644 --- a/continew-admin-ui/src/views/monitor/online/index.vue +++ b/continew-admin-ui/src/views/monitor/online/index.vue @@ -37,7 +37,7 @@ import { getCurrentInstance, ref, toRefs, reactive } from 'vue'; import { - OnlineUserParam, - OnlineUserRecord, - listOnlineUser, + DataRecord, + ListParam, + list, kickout, } from '@/api/monitor/online'; import { getToken } from '@/utils/auth'; @@ -113,7 +113,7 @@ const { proxy } = getCurrentInstance() as any; - const onlineUserList = ref([]); + const dataList = ref([]); const total = ref(0); const loading = ref(false); const currentToken = getToken(); @@ -135,11 +135,11 @@ * * @param params 查询参数 */ - const getList = (params: OnlineUserParam = { ...queryParams.value }) => { + const getList = (params: ListParam = { ...queryParams.value }) => { loading.value = true; - listOnlineUser(params) + list(params) .then((res) => { - onlineUserList.value = res.data.list; + dataList.value = res.data.list; total.value = res.data.total; }) .finally(() => { diff --git a/continew-admin-ui/src/views/system/announcement/index.vue b/continew-admin-ui/src/views/system/announcement/index.vue index bcf4df9f..08be034a 100644 --- a/continew-admin-ui/src/views/system/announcement/index.vue +++ b/continew-admin-ui/src/views/system/announcement/index.vue @@ -303,7 +303,7 @@ - {{ detail.title }} + {{ dataDetail.title }}
@@ -311,26 +311,26 @@ 发布人： - {{ detail.createUserString }} + {{ dataDetail.createUserString }} 发布时间： - {{ detail.effectiveTime ? detail.effectiveTime : detail.createTime }} + {{ dataDetail.effectiveTime ? dataDetail.effectiveTime : dataDetail.createTime }}
- + -
+
最后更新于： - {{ detail.updateTime }} + {{ dataDetail.updateTime }}
@@ -356,7 +356,7 @@ const { AnnouncementTypeEnum } = proxy.useDict('AnnouncementTypeEnum'); const dataList = ref([]); - const detail = ref({ + const dataDetail = ref({ // TODO 待补充详情字段默认值 }); const total = ref(0); @@ -485,7 +485,7 @@ detailVisible.value = true; get(id) .then((res) => { - detail.value = res.data; + dataDetail.value = res.data; }) .finally(() => { detailLoading.value = false; @@ -497,7 +497,7 @@ */ const handleDetailCancel = () => { detailVisible.value = false; - detail.value = {}; + dataDetail.value = {}; }; /** diff --git a/continew-admin-ui/src/views/system/dept/index.vue b/continew-admin-ui/src/views/system/dept/index.vue index 818e219f..c5ccc132 100644 --- a/continew-admin-ui/src/views/system/dept/index.vue +++ b/continew-admin-ui/src/views/system/dept/index.vue @@ -94,7 +94,7 @@ - {{ dept.name }} + {{ dataDetail.name }} - {{ dept.parentName || '无' }} + {{ dataDetail.parentName || '无' }} - 启用 + 启用 禁用 @@ -262,37 +262,37 @@ - {{ dept.sort }} + {{ dataDetail.sort }} - {{ dept.createUserString }} + {{ dataDetail.createUserString }} - {{ dept.createTime }} + {{ dataDetail.createTime }} - {{ dept.updateUserString }} + {{ dataDetail.updateUserString }} - {{ dept.updateTime }} + {{ dataDetail.updateTime }} - {{ dept.description }} + {{ dataDetail.description }} @@ -304,13 +304,13 @@ import { getCurrentInstance, ref, toRefs, reactive } from 'vue'; import { TreeNodeData, TableData } from '@arco-design/web-vue'; import { - DeptRecord, - DeptParam, - listDept, - getDept, - addDept, - updateDept, - deleteDept, + DataRecord, + ListParam, + list, + get, + add, + update, + del, } from '@/api/system/dept'; import { listDeptTree } from '@/api/common'; import checkPermission from '@/utils/permission'; @@ -318,8 +318,8 @@ const { proxy } = getCurrentInstance() as any; const { DisEnableStatusEnum } = proxy.useDict('DisEnableStatusEnum'); - const deptList = ref([]); - const dept = ref({ + const dataList = ref([]); + const dataDetail = ref({ name: '', sort: 0, description: '', @@ -350,7 +350,7 @@ sort: ['parentId,asc', 'sort,asc', 'createTime,desc'], }, // 表单数据 - form: {} as DeptRecord, + form: {} as DataRecord, // 表单验证规则 rules: { parentId: [{ required: true, message: '请选择上级部门' }], @@ -365,11 +365,11 @@ * * @param params 查询参数 */ - const getList = (params: DeptParam = { ...queryParams.value }) => { + const getList = (params: ListParam = { ...queryParams.value }) => { loading.value = true; - listDept(params) + list(params) .then((res) => { - deptList.value = res.data; + dataList.value = res.data; setTimeout(() => { proxy.$refs.tableRef.expandAll(); }, 0); @@ -403,7 +403,7 @@ treeData.value = res.data; }); - getDept(id).then((res) => { + get(id).then((res) => { form.value = res.data; title.value = '修改部门'; visible.value = true; @@ -441,13 +441,13 @@ proxy.$refs.formRef.validate((valid: any) => { if (!valid) { if (form.value.id !== undefined) { - updateDept(form.value, form.value.id).then((res) => { + update(form.value, form.value.id).then((res) => { handleCancel(); getList(); proxy.$message.success(res.msg); }); } else { - addDept(form.value).then((res) => { + add(form.value).then((res) => { handleCancel(); getList(); proxy.$message.success(res.msg); @@ -466,9 +466,9 @@ if (detailLoading.value) return; detailLoading.value = true; detailVisible.value = true; - getDept(id) + get(id) .then((res) => { - dept.value = res.data; + dataDetail.value = res.data; }) .finally(() => { detailLoading.value = false; @@ -507,7 +507,7 @@ * @param ids ID 列表 */ const handleDelete = (ids: Array) => { - deleteDept(ids).then((res) => { + del(ids).then((res) => { proxy.$message.success(res.msg); getList(); }); @@ -570,10 +570,10 @@ * * @param record 记录信息 */ - const handleChangeStatus = (record: DeptRecord) => { + const handleChangeStatus = (record: DataRecord) => { if (record.id) { const tip = record.status === 1 ? '启用' : '禁用'; - updateDept(record, record.id) + update(record, record.id) .then(() => { proxy.$message.success(`${tip}成功`); }) diff --git a/continew-admin-ui/src/views/system/menu/index.vue b/continew-admin-ui/src/views/system/menu/index.vue index 37f48adb..35eeadf6 100644 --- a/continew-admin-ui/src/views/system/menu/index.vue +++ b/continew-admin-ui/src/views/system/menu/index.vue @@ -97,7 +97,7 @@ - {{ role.name }} + {{ dataDetail.name }} - {{ role.code }} + {{ dataDetail.code }} - 启用 + 启用 禁用 @@ -359,12 +359,12 @@ - 全部数据权限 - 全部数据权限 + 本部门及以下数据权限 - 本部门数据权限 - 仅本人数据权限 + 本部门数据权限 + 仅本人数据权限 自定义数据权限 @@ -372,52 +372,52 @@ - {{ role.createUserString }} + {{ dataDetail.createUserString }} - {{ role.createTime }} + {{ dataDetail.createTime }} - {{ role.updateUserString }} + {{ dataDetail.updateUserString }} - {{ role.updateTime }} + {{ dataDetail.updateTime }} - {{ role.description }} + {{ dataDetail.description }} ([]); - const role = ref({ + const dataList = ref([]); + const dataDetail = ref({ name: '', code: '', status: 1, @@ -495,7 +495,7 @@ sort: ['createTime,desc'], }, // 表单数据 - form: {} as RoleRecord, + form: {} as DataRecord, // 表单验证规则 rules: { name: [ @@ -524,11 +524,11 @@ * * @param params 查询参数 */ - const getList = (params: RoleParam = { ...queryParams.value }) => { + const getList = (params: ListParam = { ...queryParams.value }) => { loading.value = true; - listRole(params) + list(params) .then((res) => { - roleList.value = res.data.list; + dataList.value = res.data.list; total.value = res.data.total; }) .finally(() => { @@ -559,7 +559,7 @@ deptCheckStrictly.value = false; getMenuTree(); getDeptTree(); - getRole(id).then((res) => { + get(id).then((res) => { form.value = res.data; title.value = '修改角色'; visible.value = true; @@ -681,7 +681,7 @@ if (form.value.id !== undefined) { form.value.menuIds = getMenuAllCheckedKeys(); form.value.deptIds = getDeptAllCheckedKeys(); - updateRole(form.value, form.value.id).then((res) => { + update(form.value, form.value.id).then((res) => { handleCancel(); getList(); proxy.$message.success(res.msg); @@ -689,7 +689,7 @@ } else { form.value.menuIds = getMenuAllCheckedKeys(); form.value.deptIds = getDeptAllCheckedKeys(); - addRole(form.value).then((res) => { + add(form.value).then((res) => { handleCancel(); getList(); proxy.$message.success(res.msg); @@ -710,9 +710,9 @@ getDeptTree(); detailLoading.value = true; detailVisible.value = true; - getRole(id) + get(id) .then((res) => { - role.value = res.data; + dataDetail.value = res.data; }) .finally(() => { detailLoading.value = false; @@ -751,7 +751,7 @@ * @param ids ID 列表 */ const handleDelete = (ids: Array) => { - deleteRole(ids).then((res) => { + del(ids).then((res) => { proxy.$message.success(res.msg); getList(); }); @@ -786,10 +786,10 @@ * * @param record 记录信息 */ - const handleChangeStatus = (record: RoleRecord) => { + const handleChangeStatus = (record: DataRecord) => { if (record.id) { const tip = record.status === 1 ? '启用' : '禁用'; - updateRole(record, record.id) + update(record, record.id) .then(() => { proxy.$message.success(`${tip}成功`); }) diff --git a/continew-admin-ui/src/views/system/user/center/components/operation-log.vue b/continew-admin-ui/src/views/system/user/center/components/operation-log.vue index 31364348..073ce992 100644 --- a/continew-admin-ui/src/views/system/user/center/components/operation-log.vue +++ b/continew-admin-ui/src/views/system/user/center/components/operation-log.vue @@ -4,7 +4,7 @@ - {{ user.username }} + {{ dataDetail.username }} - {{ user.nickname }} + {{ dataDetail.nickname }} - 男 + 男 女 @@ -439,7 +439,7 @@ - 启用 + 启用 禁用 @@ -447,55 +447,55 @@ - {{ user.email || '无' }} + {{ dataDetail.email || '无' }} - {{ user.phone || '无' }} + {{ dataDetail.phone || '无' }} - {{ user.deptName }} + {{ dataDetail.deptName }} - {{ user.roleNames }} + {{ dataDetail.roleNames }} - {{ user.createUserString }} + {{ dataDetail.createUserString }} - {{ user.createTime }} + {{ dataDetail.createTime }} - {{ user.updateUserString }} + {{ dataDetail.updateUserString }} - {{ user.updateTime }} + {{ dataDetail.updateTime }} - {{ user.description }} + {{ dataDetail.description }} @@ -507,13 +507,13 @@ import { getCurrentInstance, ref, toRefs, reactive, watch } from 'vue'; import { TreeNodeData } from '@arco-design/web-vue'; import { - UserRecord, - UserParam, - listUser, - getUser, - addUser, - updateUser, - deleteUser, + DataRecord, + ListParam, + list, + get, + add, + update, + del, resetPassword, updateUserRole, } from '@/api/system/user'; @@ -525,8 +525,8 @@ const { proxy } = getCurrentInstance() as any; const { DisEnableStatusEnum } = proxy.useDict('DisEnableStatusEnum'); - const userList = ref([]); - const user = ref({ + const dataList = ref([]); + const dataDetail = ref({ username: '', nickname: '', gender: 1, @@ -573,7 +573,7 @@ sort: ['createTime,desc'], }, // 表单数据 - form: {} as UserRecord, + form: {} as DataRecord, // 表单验证规则 rules: { username: [{ required: true, message: '请输入用户名' }], @@ -607,11 +607,11 @@ * * @param params 查询参数 */ - const getList = (params: UserParam = { ...queryParams.value }) => { + const getList = (params: ListParam = { ...queryParams.value }) => { loading.value = true; - listUser(params) + list(params) .then((res) => { - userList.value = res.data.list; + dataList.value = res.data.list; total.value = res.data.total; }) .finally(() => { @@ -640,7 +640,7 @@ reset(); getDeptOptions(); getRoleOptions(); - getUser(id).then((res) => { + get(id).then((res) => { form.value = res.data; title.value = '修改用户'; visible.value = true; @@ -655,7 +655,7 @@ const toUpdateRole = (id: string) => { reset(); getRoleOptions(); - getUser(id).then((res) => { + get(id).then((res) => { form.value = res.data; userRoleVisible.value = true; }); @@ -726,13 +726,13 @@ proxy.$refs.formRef.validate((valid: any) => { if (!valid) { if (form.value.id !== undefined) { - updateUser(form.value, form.value.id).then((res) => { + update(form.value, form.value.id).then((res) => { handleCancel(); getList(); proxy.$message.success(res.msg); }); } else { - addUser(form.value).then((res) => { + add(form.value).then((res) => { handleCancel(); getList(); proxy.$message.success(res.msg); @@ -768,9 +768,9 @@ if (detailLoading.value) return; detailLoading.value = true; detailVisible.value = true; - getUser(id) + get(id) .then((res) => { - user.value = res.data; + dataDetail.value = res.data; }) .finally(() => { detailLoading.value = false; @@ -809,7 +809,7 @@ * @param ids ID 列表 */ const handleDelete = (ids: Array) => { - deleteUser(ids).then((res) => { + del(ids).then((res) => { proxy.$message.success(res.msg); getList(); }); @@ -855,14 +855,14 @@ * * @param record 记录信息 */ - const handleChangeStatus = (record: UserRecord) => { + const handleChangeStatus = (record: DataRecord) => { const { id } = record; if (id) { const tip = record.status === 1 ? '启用' : '禁用'; - getUser(id) + get(id) .then((res) => { res.data.status = record.status; - updateUser(res.data, id) + update(res.data, id) .then(() => { proxy.$message.success(`${tip}成功`); })