From 5bbf46d141fc898ff3f22fdd72c4b6937b93fd53 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sat, 1 Nov 2025 22:52:50 +0800
Subject: [PATCH] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../host/extra/model/HostSpecExtraModel.java  | 10 ++++++
 orion-visor-ui/src/api/asset/host-extra.ts    |  2 ++
 orion-visor-ui/src/assets/style/layout.less   |  2 +-
 .../view/card-list/components/card-header.vue |  6 ++--
 orion-visor-ui/src/utils/event.ts             |  2 +-
 .../host-list/components/host-form-spec.vue   | 36 ++++++++++++++++---
 .../monitor-host/types/table.columns.ts       |  9 ++++-
 7 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSpecExtraModel.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSpecExtraModel.java
index 42982e9a..8a359090 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSpecExtraModel.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSpecExtraModel.java
@@ -51,6 +51,16 @@ public class HostSpecExtraModel implements GenericsDataModel {
      */
     private String sn;
 
+    /**
+     * 制造商
+     */
+    private String vendor;
+
+    /**
+     * 型号
+     */
+    private String model;
+
     /**
      * 系统名称
      */
diff --git a/orion-visor-ui/src/api/asset/host-extra.ts b/orion-visor-ui/src/api/asset/host-extra.ts
index c77a90d0..70f050fb 100644
--- a/orion-visor-ui/src/api/asset/host-extra.ts
+++ b/orion-visor-ui/src/api/asset/host-extra.ts
@@ -49,6 +49,8 @@ export interface HostLabelExtraSettingModel {
 // 标签规格模型
 export interface HostSpecExtraModel {
   sn: string;
+  vendor: string;
+  model: string;
   osName: string;
   cpuCount: number;
   cpuPhysicalCore: number;
diff --git a/orion-visor-ui/src/assets/style/layout.less b/orion-visor-ui/src/assets/style/layout.less
index 55ba8ad5..ab955a50 100644
--- a/orion-visor-ui/src/assets/style/layout.less
+++ b/orion-visor-ui/src/assets/style/layout.less
@@ -198,7 +198,7 @@
 }
 
 .card-filter-wrapper {
-  padding: 18px 24px;
+  padding: 24px 24px 16px 24px;
 
   .card-filter-form {
     width: 320px;
diff --git a/orion-visor-ui/src/components/view/card-list/components/card-header.vue b/orion-visor-ui/src/components/view/card-list/components/card-header.vue
index 6259cea5..e66511d7 100644
--- a/orion-visor-ui/src/components/view/card-list/components/card-header.vue
+++ b/orion-visor-ui/src/components/view/card-list/components/card-header.vue
@@ -112,7 +112,7 @@
 
 <script lang="ts" setup>
   import type { CardProps } from '../types/props';
-  import { ref, computed } from 'vue';
+  import { ref, computed, nextTick } from 'vue';
   import { useAppStore } from '@/store';
   import { triggerMouseEvent } from '@/utils/event';
   import { HeaderEmitter } from '../types/emits';
@@ -157,7 +157,9 @@
   // 搜索
   const filterSearch = () => {
     bubblesEmitter(HeaderEmitter.SEARCH);
-    triggerMouseEvent(filterRef);
+    nextTick(() => {
+      triggerMouseEvent(filterRef);
+    });
   };
 
 </script>
diff --git a/orion-visor-ui/src/utils/event.ts b/orion-visor-ui/src/utils/event.ts
index d1b0fc1b..aa5a3e8f 100644
--- a/orion-visor-ui/src/utils/event.ts
+++ b/orion-visor-ui/src/utils/event.ts
@@ -37,5 +37,5 @@ export const triggerMouseEvent = (ref: Ref, e = 'click') => {
     bubbles: true,
     cancelable: true,
   });
-  ref.value.dispatchEvent(event);
+  ref.value?.dispatchEvent?.(event);
 };
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue
index 0a8cbc68..f4fa0dd1 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-spec.vue
@@ -11,6 +11,24 @@
                  allow-clear />
         <span v-else class="text">{{ formModel.sn }}</span>
       </a-descriptions-item>
+      <!-- 制造商 -->
+      <a-descriptions-item label="制造商" :span="2">
+        <a-input v-if="editing"
+                 v-model="formModel.vendor"
+                 class="input"
+                 size="mini"
+                 allow-clear />
+        <span v-else class="text">{{ formModel.vendor }}</span>
+      </a-descriptions-item>
+      <!-- 设备型号 -->
+      <a-descriptions-item label="设备型号" :span="2">
+        <a-input v-if="editing"
+                 v-model="formModel.model"
+                 class="input"
+                 size="mini"
+                 allow-clear />
+        <span v-else class="text">{{ formModel.model }}</span>
+      </a-descriptions-item>
       <!-- 系统名称 -->
       <a-descriptions-item label="系统名称" :span="2">
         <a-input v-if="editing"
@@ -121,19 +139,29 @@
       </a-descriptions-item>
       <!-- 公网地址 -->
       <a-descriptions-item label="公网地址" :span="2">
-        <a-input-tag v-model="formModel.publicIpAddresses"
-                     :readonly="!editing"
+        <a-input-tag v-if="editing"
+                     v-model="formModel.publicIpAddresses"
                      class="input"
                      size="mini"
                      allow-clear />
+        <a-space v-else>
+          <a-tag v-for="addr in (formModel.publicIpAddresses || [])">
+            {{ addr }}
+          </a-tag>
+        </a-space>
       </a-descriptions-item>
       <!-- 私网地址 -->
       <a-descriptions-item label="私网地址" :span="2">
-        <a-input-tag v-model="formModel.privateIpAddresses"
-                     :readonly="!editing"
+        <a-input-tag v-if="editing"
+                     v-model="formModel.privateIpAddresses"
                      class="input"
                      size="mini"
                      allow-clear />
+        <a-space v-else>
+          <a-tag v-for="addr in (formModel.privateIpAddresses || [])">
+            {{ addr }}
+          </a-tag>
+        </a-space>
       </a-descriptions-item>
       <!-- 负责人 -->
       <a-descriptions-item label="负责人" :span="2">
diff --git a/orion-visor-ui/src/views/monitor/monitor-host/types/table.columns.ts b/orion-visor-ui/src/views/monitor/monitor-host/types/table.columns.ts
index 8a0221ed..a62d1d2d 100644
--- a/orion-visor-ui/src/views/monitor/monitor-host/types/table.columns.ts
+++ b/orion-visor-ui/src/views/monitor/monitor-host/types/table.columns.ts
@@ -13,10 +13,17 @@ const columns = [
     title: '主机信息',
     dataIndex: 'hostInfo',
     slotName: 'hostInfo',
-    width: 248,
+    width: 268,
     align: 'left',
     fixed: 'left',
     default: true,
+  }, {
+    title: '主机规格',
+    dataIndex: 'hostSpec',
+    slotName: 'hostSpec',
+    width: 248,
+    align: 'left',
+    default: true,
   }, {
     title: '告警策略',
     dataIndex: 'alarmPolicy',