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 @@
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 />
{{ formModel.sn }}
+
+
+
+ {{ formModel.vendor }}
+
+
+
+
+ {{ formModel.model }}
+
-
+
+
+ {{ addr }}
+
+
-
+
+
+ {{ addr }}
+
+
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',