From ea98592012b14cf7f778216cc7bdf1f97f5b918a Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Fri, 10 Oct 2025 13:26:01 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E7=9B=91=E6=8E=A7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=BB=88=E7=AB=AF.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/convert/MonitorHostConvert.java | 3 +- .../monitor/entity/vo/MonitorHostVO.java | 3 + .../src/api/monitor/monitor-host.ts | 1 + .../host-list/components/host-card-list.vue | 2 +- .../asset/host-list/components/host-table.vue | 2 +- .../compoments/detail-header.vue | 98 ++++++++++++------- .../components/monitor-host-card-list.vue | 42 +++++--- .../components/monitor-host-table.vue | 42 +++++--- 8 files changed, 132 insertions(+), 61 deletions(-) diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/MonitorHostConvert.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/MonitorHostConvert.java index af2f19cd..836b1f22 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/MonitorHostConvert.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/convert/MonitorHostConvert.java @@ -22,6 +22,7 @@ */ package org.dromara.visor.module.monitor.convert; +import org.dromara.visor.common.mapstruct.StringConversion; import org.dromara.visor.module.asset.entity.dto.host.HostDTO; import org.dromara.visor.module.asset.entity.dto.host.HostQueryDTO; import org.dromara.visor.module.monitor.entity.domain.MonitorHostDO; @@ -40,7 +41,7 @@ import org.mapstruct.factory.Mappers; * @version 1.0.0 * @since 2025-8-14 16:27 */ -@Mapper +@Mapper(uses = StringConversion.class) public interface MonitorHostConvert { MonitorHostConvert MAPPER = Mappers.getMapper(MonitorHostConvert.class); diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/MonitorHostVO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/MonitorHostVO.java index cd4d4925..efcc1126 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/MonitorHostVO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/MonitorHostVO.java @@ -76,6 +76,9 @@ public class MonitorHostVO implements Serializable { @Schema(description = "主机地址") private String address; + @Schema(description = "主机类型") + private List types; + @Schema(description = "主机状态") private String status; diff --git a/orion-visor-ui/src/api/monitor/monitor-host.ts b/orion-visor-ui/src/api/monitor/monitor-host.ts index 3b84677e..c64012d7 100644 --- a/orion-visor-ui/src/api/monitor/monitor-host.ts +++ b/orion-visor-ui/src/api/monitor/monitor-host.ts @@ -96,6 +96,7 @@ export interface MonitorHostQueryResponse extends TableData { code: string; address: string; status: string; + types: Array; agentKey: string; agentVersion: string; latestVersion: string; diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue index ae29d146..91e1af1c 100644 --- a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue +++ b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue @@ -230,7 +230,7 @@ + @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type }})"> {{ type }} diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue index 19fa8581..9a93ad8d 100644 --- a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue +++ b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue @@ -275,7 +275,7 @@ + @click="openNewRoute({ name: 'terminal', query: { connect: record.id, type }})"> {{ type }} diff --git a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/detail-header.vue b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/detail-header.vue index 96a03de6..8c32b15b 100644 --- a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/detail-header.vue +++ b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/detail-header.vue @@ -44,46 +44,70 @@
+ + + 连接终端 + + + + + 连接终端 + + + + 更新时间: {{ dateFormat(new Date(overrideTimestamp)) }}
- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
@@ -102,6 +126,7 @@ import { copy } from '@/hooks/copy'; import { useDictStore } from '@/store'; import { dateFormat } from '@/utils'; + import { openNewRoute } from '@/router'; import { TabKeys, ChartRangeKey } from '../types/const'; import { OnlineStatusKey } from '@/views/monitor/monitor-host/types/const'; import { parseWindowUnit, WindowUnitFormatter } from '@/utils/metrics'; @@ -209,6 +234,7 @@ .handle-wrapper { display: flex; + gap: 8px; } } diff --git a/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-card-list.vue b/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-card-list.vue index d2f9bb47..23bc89a7 100644 --- a/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-card-list.vue +++ b/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-card-list.vue @@ -270,43 +270,62 @@ 修改配置 - + 复制 Key 安装探针 安装成功 {{ toggleDictValue(AlarmSwitchKey, record.alarmSwitch, 'label') + '告警' }} + + + + 连接终端 + + + + + + + 连接终端 + + + + @@ -333,6 +352,7 @@ import { AgentInstallStatus, tagColor } from '@/views/asset/host-list/types/const'; import { copy } from '@/hooks/copy'; import { getFileSize } from '@/utils/file'; + import { openNewRoute } from '@/router'; import { getPercentProgressColor } from '@/utils/charts'; import useMonitorHostList from '../types/use-monitor-host-list'; import MonitorCell from './monitor-cell.vue'; diff --git a/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-table.vue b/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-table.vue index a0294611..cd90ed45 100644 --- a/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-table.vue +++ b/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-table.vue @@ -322,43 +322,62 @@ 修改配置 - + 复制 Key 安装探针 安装成功 {{ toggleDictValue(AlarmSwitchKey, record.alarmSwitch, 'label') + '告警' }} + + + + 连接终端 + + + + + + + 连接终端 + + + + @@ -386,6 +405,7 @@ import { copy } from '@/hooks/copy'; import { getPercentProgressColor } from '@/utils/charts'; import { getFileSize } from '@/utils/file'; + import { openNewRoute } from '@/router'; import { dateFormat, dataColor } from '@/utils'; import { Message, Modal } from '@arco-design/web-vue'; import useMonitorHostList from '../types/use-monitor-host-list';