From eb1814292612626614f5bedec64d6a6a1323e92e Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Sat, 18 Oct 2025 22:21:30 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E5=8F=AF=E8=B0=83=E6=95=B4=E5=88=97?= =?UTF-8?q?=E5=AE=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orion-vue-views-components-table.vue.vm | 2 + orion-visor-ui/src/api/monitor/alarm-event.ts | 7 +- .../src/assets/style/arco-extends.less | 11 +++ .../components/host-table.vue | 6 +- .../components/exec/template/modal/index.vue | 2 + .../components/connect-log-table.vue | 2 + .../components/connect-session-table.vue | 4 +- .../components/file-log-table.vue | 2 + .../grant/components/host-group-grant.vue | 7 +- .../grant/components/host-identity-grant.vue | 5 +- .../asset/grant/components/host-key-grant.vue | 3 +- .../components/host-identity-table.vue | 2 + .../host-key/components/host-key-table.vue | 2 + .../asset/host-list/components/host-table.vue | 2 + .../workplace/components/batch-exec-table.vue | 2 + .../components/terminal-connect-table.vue | 2 + .../workplace/components/user-login-table.vue | 2 + .../exec-command-host-log-table.vue | 4 +- .../components/exec-command-log-table.vue | 6 +- .../components/exec-job-host-log-table.vue | 4 +- .../components/exec-job-log-table.vue | 2 + .../exec-job/components/exec-job-table.vue | 2 + .../components/exec-template-table.vue | 2 + .../components/upload-task-table.vue | 2 + .../components/alarm-event-clear-modal.vue | 46 +++++----- .../components/alarm-event-handle-modal.vue | 13 ++- .../components/alarm-event-table-base.vue | 89 ++++++++++++------- .../components/alarm-event-table.vue | 55 ++++++------ .../src/views/monitor/alarm-event/index.vue | 20 ++--- .../views/monitor/alarm-event/types/const.ts | 6 ++ .../alarm-event/types/table.columns.ts | 6 +- .../components/alarm-policy-table.vue | 2 + .../components/alarm-rule-form-drawer.vue | 6 +- .../components/alarm-rule-table.vue | 8 +- .../src/views/monitor/alarm-rule/index.vue | 2 + .../metrics/components/metrics-table.vue | 4 +- .../compoments/metrics-chart.vue | 19 ++-- .../components/monitor-host-table.vue | 2 + .../dict-key/components/dict-key-table.vue | 2 + .../components/dict-value-table.vue | 4 +- .../system/menu/components/menu-table.vue | 5 +- .../components/notify-template-table.vue | 2 + .../components/operator-log-simple-table.vue | 2 + .../components/operator-log-table.vue | 2 + .../views/user/role/components/role-table.vue | 2 + .../views/user/user/components/user-table.vue | 4 +- 46 files changed, 241 insertions(+), 145 deletions(-) diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm index b07818bd..030711d4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm @@ -91,6 +91,7 @@ #foreach($field in ${table.fields}) diff --git a/orion-visor-ui/src/api/monitor/alarm-event.ts b/orion-visor-ui/src/api/monitor/alarm-event.ts index 9c3f8d65..cf378ffa 100644 --- a/orion-visor-ui/src/api/monitor/alarm-event.ts +++ b/orion-visor-ui/src/api/monitor/alarm-event.ts @@ -25,7 +25,8 @@ export interface AlarmEventFalseAlarmRequest { */ export interface AlarmEventQueryRequest extends Pagination, OrderDirection { id?: number; - hostId?: number; + sourceType?: string; + sourceId?: number; agentKey?: string; policyId?: number; metricsId?: number; @@ -49,7 +50,9 @@ export interface AlarmEventClearRequest extends AlarmEventQueryRequest, ClearReq */ export interface AlarmEventQueryResponse extends TableData { id: number; - hostId: number; + sourceType: string; + sourceId: number; + sourceInfo: Record; hostName: string; hostAddress: string; agentKey: string; diff --git a/orion-visor-ui/src/assets/style/arco-extends.less b/orion-visor-ui/src/assets/style/arco-extends.less index 36723ab8..140d5909 100644 --- a/orion-visor-ui/src/assets/style/arco-extends.less +++ b/orion-visor-ui/src/assets/style/arco-extends.less @@ -66,6 +66,17 @@ } } +// 可调节列宽 +.table-resize .arco-table-th:not(.arco-table-th-expand):not(.arco-table-operation)::after { + content: ''; + position: absolute; + top: 25%; + right: 0; + width: 1px; + height: 50%; + background-color: var(--color-neutral-3); +} + // 垂直滚动 .arco-scrollbar-track-direction-vertical { width: 10px; diff --git a/orion-visor-ui/src/components/asset/host/authorized-host-modal/components/host-table.vue b/orion-visor-ui/src/components/asset/host/authorized-host-modal/components/host-table.vue index 93d5c274..c77078f4 100644 --- a/orion-visor-ui/src/components/asset/host/authorized-host-modal/components/host-table.vue +++ b/orion-visor-ui/src/components/asset/host/authorized-host-modal/components/host-table.vue @@ -1,14 +1,16 @@