diff --git a/orion-visor-ui/src/api/asset/host-identity.ts b/orion-visor-ui/src/api/asset/host-identity.ts index f721b1c6..eab1445b 100644 --- a/orion-visor-ui/src/api/asset/host-identity.ts +++ b/orion-visor-ui/src/api/asset/host-identity.ts @@ -12,6 +12,7 @@ export interface HostIdentityCreateRequest { username?: string; password?: string; keyId?: number; + description?: string; } /** @@ -32,6 +33,7 @@ export interface HostIdentityQueryRequest extends Pagination { type?: string; username?: string; keyId?: number; + description?: string; } /** @@ -44,6 +46,7 @@ export interface HostIdentityQueryResponse extends TableData { username: string; password: string; keyId: number; + description: string; createTime: number; updateTime: number; creator: string; diff --git a/orion-visor-ui/src/api/asset/host-key.ts b/orion-visor-ui/src/api/asset/host-key.ts index ae196076..5afca379 100644 --- a/orion-visor-ui/src/api/asset/host-key.ts +++ b/orion-visor-ui/src/api/asset/host-key.ts @@ -11,6 +11,7 @@ export interface HostKeyCreateRequest { publicKey?: string; privateKey?: string; password?: string; + description?: string; } /** @@ -30,6 +31,7 @@ export interface HostKeyQueryRequest extends Pagination { name?: string; publicKey?: string; privateKey?: string; + description?: string; } /** @@ -41,8 +43,11 @@ export interface HostKeyQueryResponse extends TableData { publicKey: string; privateKey: string; password: string; + description: string; createTime: number; updateTime: number; + creator: string; + updater: string; } /** diff --git a/orion-visor-ui/src/api/asset/host.ts b/orion-visor-ui/src/api/asset/host.ts index c415099b..46929b72 100644 --- a/orion-visor-ui/src/api/asset/host.ts +++ b/orion-visor-ui/src/api/asset/host.ts @@ -1,4 +1,3 @@ -import type { SelectOptionData } from '@arco-design/web-vue'; import type { DataGrid, Pagination } from '@/types/global'; import type { TableData } from '@arco-design/web-vue/es/table/interface'; import axios from 'axios'; @@ -19,6 +18,7 @@ export interface HostCreateRequest { port?: number; tags?: Array; groupIdList?: Array; + description?: string; } /** @@ -58,6 +58,7 @@ export interface HostQueryRequest extends Pagination { status?: string; tags?: Array; queryTag?: boolean; + description?: string; } /** @@ -81,6 +82,7 @@ export interface HostQueryResponse extends TableData, HostQueryResponseExtra { color: string; tags: Array<{ id: number, name: string }>; groupIdList: Array; + description: string; } /** diff --git a/orion-visor-ui/src/api/asset/terminal-connect-log.ts b/orion-visor-ui/src/api/asset/terminal-connect-log.ts index 993ca1ec..1fa3da35 100644 --- a/orion-visor-ui/src/api/asset/terminal-connect-log.ts +++ b/orion-visor-ui/src/api/asset/terminal-connect-log.ts @@ -101,7 +101,9 @@ export function getTerminalConnectLogCount(request: TerminalConnectLogQueryReque * 清空终端连接日志 */ export function clearTerminalConnectLog(request: TerminalConnectLogClearRequest) { - return axios.post('/asset/terminal-connect-log/clear', request); + return axios.post('/asset/terminal-connect-log/clear', request, { + timeout: 60000, + }); } /** diff --git a/orion-visor-ui/src/api/exec/exec-command-log.ts b/orion-visor-ui/src/api/exec/exec-command-log.ts index f6982c7c..1dcb3245 100644 --- a/orion-visor-ui/src/api/exec/exec-command-log.ts +++ b/orion-visor-ui/src/api/exec/exec-command-log.ts @@ -90,7 +90,9 @@ export function getExecCommandLogCount(request: ExecLogQueryRequest) { * 清空批量执行日志 */ export function clearExecCommandLog(request: ExecLogClearRequest) { - return axios.post('/asset/exec-command-log/clear', request); + return axios.post('/asset/exec-command-log/clear', request, { + timeout: 60000, + }); } /** diff --git a/orion-visor-ui/src/api/exec/exec-job-log.ts b/orion-visor-ui/src/api/exec/exec-job-log.ts index b3998f46..75d2d43b 100644 --- a/orion-visor-ui/src/api/exec/exec-job-log.ts +++ b/orion-visor-ui/src/api/exec/exec-job-log.ts @@ -83,7 +83,9 @@ export function getExecJobLogCount(request: ExecLogQueryRequest) { * 清空计划任务日志 */ export function clearExecJobLog(request: ExecLogClearRequest) { - return axios.post('/asset/exec-job-log/clear', request); + return axios.post('/asset/exec-job-log/clear', request, { + timeout: 60000, + }); } /** diff --git a/orion-visor-ui/src/api/exec/upload-task.ts b/orion-visor-ui/src/api/exec/upload-task.ts index ea901071..23eefb7a 100644 --- a/orion-visor-ui/src/api/exec/upload-task.ts +++ b/orion-visor-ui/src/api/exec/upload-task.ts @@ -185,5 +185,7 @@ export function getUploadTaskCount(request: UploadTaskQueryRequest) { * 清空查询批量上传任务 */ export function clearUploadTask(request: UploadTaskClearRequest) { - return axios.post('/asset/upload-task/clear', request); + return axios.post('/asset/upload-task/clear', request, { + timeout: 60000, + }); } diff --git a/orion-visor-ui/src/api/user/operator-log.ts b/orion-visor-ui/src/api/user/operator-log.ts index 257931b2..3d514c86 100644 --- a/orion-visor-ui/src/api/user/operator-log.ts +++ b/orion-visor-ui/src/api/user/operator-log.ts @@ -77,5 +77,7 @@ export function getOperatorLogCount(request: OperatorLogQueryRequest) { * 清空操作日志 */ export function clearOperatorLog(request: OperatorLogClearRequest) { - return axios.post('/infra/operator-log/clear', request); + return axios.post('/infra/operator-log/clear', request, { + timeout: 60000, + }); } diff --git a/orion-visor-ui/src/api/user/role.ts b/orion-visor-ui/src/api/user/role.ts index 772475fa..53d37598 100644 --- a/orion-visor-ui/src/api/user/role.ts +++ b/orion-visor-ui/src/api/user/role.ts @@ -9,6 +9,7 @@ export interface RoleCreateRequest { name?: string; code?: string; status?: number; + description?: string; } /** @@ -34,6 +35,7 @@ export interface RoleQueryRequest extends Pagination { name?: string; code?: string; status?: number; + description?: string; } /** @@ -44,6 +46,7 @@ export interface RoleQueryResponse extends TableData { name: string; code: string; status: number; + description: string; createTime: number; updateTime: number; creator: string; diff --git a/orion-visor-ui/src/api/user/user.ts b/orion-visor-ui/src/api/user/user.ts index 00a81eaf..97b291ae 100644 --- a/orion-visor-ui/src/api/user/user.ts +++ b/orion-visor-ui/src/api/user/user.ts @@ -14,6 +14,7 @@ export interface UserCreateRequest { avatar?: string; mobile?: string; email?: string; + description?: string; } /** @@ -23,7 +24,6 @@ export interface UserUpdateRequest extends UserCreateRequest { id?: number; status?: number; roleIdList?: Array; - password?: string; } /** @@ -39,6 +39,7 @@ export interface UserQueryRequest extends Pagination { email?: string; status?: number; lastLoginTime?: string; + description?: string; } /** @@ -53,6 +54,7 @@ export interface UserQueryResponse extends TableData { email: string; status: number; lastLoginTime?: number; + description: string; createTime: number; updateTime: number; creator: string; diff --git a/orion-visor-ui/src/views/asset/grant/types/table.columns.ts b/orion-visor-ui/src/views/asset/grant/types/table.columns.ts index beac0419..24f1807e 100644 --- a/orion-visor-ui/src/views/asset/grant/types/table.columns.ts +++ b/orion-visor-ui/src/views/asset/grant/types/table.columns.ts @@ -46,6 +46,12 @@ export const hostKeyColumns = [ slotName: 'name', ellipsis: true, tooltip: true + }, { + title: '描述', + dataIndex: 'description', + slotName: 'description', + ellipsis: true, + tooltip: true, }, { title: '创建时间', dataIndex: 'createTime', @@ -55,15 +61,6 @@ export const hostKeyColumns = [ render: ({ record }) => { return dateFormat(new Date(record.createTime)); }, - }, { - title: '修改时间', - dataIndex: 'updateTime', - slotName: 'updateTime', - align: 'center', - width: 180, - render: ({ record }) => { - return dateFormat(new Date(record.updateTime)); - }, }, ] as TableColumnData[]; @@ -98,13 +95,19 @@ export const hostIdentityColumns = [ dataIndex: 'keyId', slotName: 'keyId', }, { - title: '修改时间', - dataIndex: 'updateTime', - slotName: 'updateTime', + title: '描述', + dataIndex: 'description', + slotName: 'description', + ellipsis: true, + tooltip: true, + }, { + title: '创建时间', + dataIndex: 'createTime', + slotName: 'createTime', align: 'center', width: 180, render: ({ record }) => { - return dateFormat(new Date(record.updateTime)); + return dateFormat(new Date(record.createTime)); }, }, ] as TableColumnData[]; diff --git a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue index c096e8a3..f8713596 100644 --- a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue +++ b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue @@ -18,7 +18,7 @@ + @click="router.push({ name: GrantRouteName, query: { key: GrantKey.HOST_IDENTITY_ROLE }})"> 角色授权 + +