diff --git a/orion-ops-ui/src/api/user/user.ts b/orion-ops-ui/src/api/user/user.ts index 115f233d..8cfad6c5 100644 --- a/orion-ops-ui/src/api/user/user.ts +++ b/orion-ops-ui/src/api/user/user.ts @@ -1,5 +1,4 @@ import axios from 'axios'; -import qs from 'query-string'; import { DataGrid, Pagination } from '@/types/global'; /** @@ -21,6 +20,8 @@ export interface UserCreateRequest { */ export interface UserUpdateRequest extends UserCreateRequest { id: number; + roles?: Array; + password?: string; } /** @@ -44,7 +45,6 @@ export interface UserQueryRequest extends Pagination { export interface UserQueryResponse { id?: number; username?: string; - password?: string; nickname?: string; avatar?: string; mobile?: string; @@ -71,6 +71,27 @@ export function updateUser(request: UserUpdateRequest) { return axios.put('/infra/system-user/update', request); } +/** + * 修改用户状态 + */ +export function updateUserStatus(request: UserUpdateRequest) { + return axios.put('/infra/system-user/update-status', request); +} + +/** + * 修改用户角色 + */ +export function updateUserRole(request: UserUpdateRequest) { + return axios.put('/infra/system-user/update-role', request); +} + +/** + * 重置用户密码 + */ +export function resetUserPassword(request: UserUpdateRequest) { + return axios.put('/infra/system-user/reset-password', request); +} + /** * 通过 id 查询用户 */ @@ -79,15 +100,10 @@ export function getUser(id: number) { } /** - * 通过 id 批量查询用户 + * 查询所有用户 */ -export function getUserList(idList: Array) { - return axios.get('/infra/system-user/list', { - params: { idList }, - paramsSerializer: params => { - return qs.stringify(params, { arrayFormat: 'comma' }); - } - }); +export function getUserList() { + return axios.get('/infra/system-user/list'); } /** @@ -104,14 +120,3 @@ export function deleteUser(id: number) { return axios.delete('/infra/system-user/delete', { params: { id } }); } -/** - * 通过 id 批量删除用户 - */ -export function batchDeleteUser(idList: Array) { - return axios.delete('/infra/system-user/delete-batch', { - params: { idList }, - paramsSerializer: params => { - return qs.stringify(params, { arrayFormat: 'comma' }); - } - }); -} diff --git a/orion-ops-ui/src/views/system/menu/types/table.columns.ts b/orion-ops-ui/src/views/system/menu/types/table.columns.ts index f82edc0f..6503f527 100644 --- a/orion-ops-ui/src/views/system/menu/types/table.columns.ts +++ b/orion-ops-ui/src/views/system/menu/types/table.columns.ts @@ -38,7 +38,6 @@ const columns = [ title: '组件名称', dataIndex: 'component', slotName: 'component', - width: 150, ellipsis: true, tooltip: true, }, { diff --git a/orion-ops-ui/src/views/user/role/components/role-form-modal.vue b/orion-ops-ui/src/views/user/role/components/role-form-modal.vue index b44dc04d..eb55e8f8 100644 --- a/orion-ops-ui/src/views/user/role/components/role-form-modal.vue +++ b/orion-ops-ui/src/views/user/role/components/role-form-modal.vue @@ -3,7 +3,7 @@ body-class="modal-form" title-align="start" :title="title" - :top="120" + :top="80" :align-center="false" :draggable="true" :mask-closable="false" diff --git a/orion-ops-ui/src/views/user/role/components/role-table.vue b/orion-ops-ui/src/views/user/role/components/role-table.vue index 6fb97092..f9c9424a 100644 --- a/orion-ops-ui/src/views/user/role/components/role-table.vue +++ b/orion-ops-ui/src/views/user/role/components/role-table.vue @@ -17,7 +17,7 @@ @@ -62,24 +62,24 @@ - - - - 删除 - - - @@ -91,16 +65,38 @@ label-align="left" :loading="loading" :columns="columns" - v-model:selectedKeys="selectedKeys" - :row-selection="rowSelection" :data="tableRenderData" :pagination="pagination" @page-change="(page) => fetchTableData(page, pagination.pageSize)" @page-size-change="(size) => fetchTableData(pagination.current, size)" :bordered="false"> + +