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-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java index bc789f71..b9878a39 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java @@ -258,7 +258,7 @@ public class HostIdentityServiceImpl implements HostIdentityService { .eq(HostIdentityDO::getName, domain.getName()); // 检查是否存在 boolean present = hostIdentityDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } /** diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java index 5ea6f8d8..94830dac 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -242,7 +242,7 @@ public class HostKeyServiceImpl implements HostKeyService { .eq(HostKeyDO::getName, domain.getName()); // 检查是否存在 boolean present = hostKeyDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } /** diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java index c9deab3e..cba640e8 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java @@ -408,7 +408,7 @@ public class ExecJobServiceImpl implements ExecJobService { .eq(ExecJobDO::getName, domain.getName()); // 检查是否存在 boolean present = execJobDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } /** diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java index a8d4ac01..41a834df 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java @@ -208,7 +208,7 @@ public class ExecTemplateServiceImpl implements ExecTemplateService { .eq(ExecTemplateDO::getName, domain.getName()); // 检查是否存在 boolean present = execTemplateDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java index 5f776efe..539dda0a 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java @@ -343,7 +343,7 @@ public class DataGroupServiceImpl implements DataGroupService { .eq(DataGroupDO::getName, domain.getName()); // 检查是否存在 boolean present = dataGroupDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java index 49ba95f4..e603863d 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java @@ -248,7 +248,7 @@ public class DictKeyServiceImpl implements DictKeyService { .eq(DictKeyDO::getKeyName, domain.getKeyName()); // 检查是否存在 boolean present = dictKeyDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } /** diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java index 57d153ec..a8dcb7fa 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java @@ -226,7 +226,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { .eq(NotifyTemplateDO::getBizType, domain.getBizType()); // 检查是否存在 boolean present = notifyTemplateDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java index ba110da2..e7125b82 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java @@ -243,7 +243,7 @@ public class TagServiceImpl implements TagService { .eq(TagDO::getName, domain.getName()); // 检查是否存在 boolean present = tagDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java index e072d773..f205b5b6 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java @@ -297,7 +297,7 @@ public class AlarmPolicyServiceImpl implements AlarmPolicyService { .eq(AlarmPolicyDO::getName, domain.getName()); // 检查是否存在 boolean present = alarmPolicyDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java index 6b22757c..adf112ee 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java @@ -203,7 +203,7 @@ public class MonitorMetricsServiceImpl implements MonitorMetricsService { .eq(MonitorMetricsDO::getValue, domain.getValue()); // 检查是否存在 boolean present = monitorMetricsDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java index b4db6c5a..cc74b314 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java @@ -217,7 +217,7 @@ public class CommandSnippetServiceImpl implements CommandSnippetService { .eq(CommandSnippetDO::getName, domain.getName()); // 检查是否存在 boolean present = commandSnippetDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } } diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java index 599bc8c1..10dcda14 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java @@ -217,7 +217,7 @@ public class PathBookmarkServiceImpl implements PathBookmarkService { .eq(PathBookmarkDO::getName, domain.getName()); // 检查是否存在 boolean present = pathBookmarkDAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + Assert.isFalse(present, ErrorMessage.NAME_PRESENT); } } 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',