From 773d95207f090e69c4b80b7f867401606e440518 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Tue, 7 Oct 2025 14:27:19 +0800
Subject: [PATCH] =?UTF-8?q?:hammer:=20=E7=BB=9F=E4=B8=80=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E9=A3=8E=E6=A0=BC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/style/arco-extends.less        |  2 +-
 orion-visor-ui/src/assets/style/global.less   | 52 -------------------
 orion-visor-ui/src/assets/style/layout.less   |  6 +--
 .../components/exec/log/panel/exec-host.vue   | 24 ++++++++-
 .../components/exec/log/panel/log-item.vue    |  2 +-
 .../view/card-list/components/card-header.vue |  2 +-
 orion-visor-ui/src/utils/is.ts                |  4 ++
 .../src/views/dashboard/workplace/index.vue   |  2 +-
 .../batch-upload/components/upload-panel.vue  |  2 +-
 .../components/exec-command-panel.vue         |  2 +-
 .../components/alarm-event-table-base.vue     |  4 +-
 .../components/alarm-event-table.vue          |  2 +-
 .../components/alarm-policy-form-modal.vue    |  4 +-
 .../components/alarm-rule-table.vue           |  2 +-
 .../compoments/alarm-event-tab.vue            |  2 +-
 .../components/dict-value-form-modal.vue      |  3 ++
 .../src/views/system/setting/index.vue        |  2 +-
 orion-visor-ui/src/views/user/info/index.vue  |  2 +-
 18 files changed, 47 insertions(+), 72 deletions(-)

diff --git a/orion-visor-ui/src/assets/style/arco-extends.less b/orion-visor-ui/src/assets/style/arco-extends.less
index aeab168a..36723ab8 100644
--- a/orion-visor-ui/src/assets/style/arco-extends.less
+++ b/orion-visor-ui/src/assets/style/arco-extends.less
@@ -95,7 +95,7 @@
 
 // 标准卡片
 .general-card {
-  border-radius: 4px;
+  border-radius: 8px;
   border: none;
 
   & > .arco-card-header {
diff --git a/orion-visor-ui/src/assets/style/global.less b/orion-visor-ui/src/assets/style/global.less
index 3d82980c..f0156776 100644
--- a/orion-visor-ui/src/assets/style/global.less
+++ b/orion-visor-ui/src/assets/style/global.less
@@ -14,58 +14,6 @@ body {
   -webkit-font-smoothing: antialiased;
 }
 
-// -- echarts
-.echarts-tooltip-diy {
-  background: linear-gradient(304.17deg,
-    rgba(253, 254, 255, 0.6) -6.04%,
-  rgba(244, 247, 252, 0.6) 85.2%) !important;
-  border: none !important;
-  backdrop-filter: blur(10px) !important;
-  /* Note: backdrop-filter has minimal browser support */
-
-  border-radius: 6px !important;
-
-  .content-panel {
-    display: flex;
-    justify-content: space-between;
-    padding: 0 9px;
-    background: rgba(255, 255, 255, 0.8);
-    width: 164px;
-    height: 32px;
-    line-height: 32px;
-    box-shadow: 6px 0 20px rgba(34, 87, 188, 0.1);
-    border-radius: 4px;
-    margin-bottom: 4px;
-  }
-
-  .tooltip-title {
-    margin: 0 0 10px 0;
-  }
-
-  p {
-    margin: 0;
-  }
-
-  .tooltip-title,
-  .tooltip-value {
-    font-size: 13px;
-    line-height: 15px;
-    display: flex;
-    align-items: center;
-    text-align: right;
-    color: #1D2129;
-    font-weight: bold;
-  }
-
-  .tooltip-item-icon {
-    display: inline-block;
-    margin-right: 8px;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-  }
-}
-
 // flex
 .flex-center {
   display: flex;
diff --git a/orion-visor-ui/src/assets/style/layout.less b/orion-visor-ui/src/assets/style/layout.less
index 68f23ab8..3b695b13 100644
--- a/orion-visor-ui/src/assets/style/layout.less
+++ b/orion-visor-ui/src/assets/style/layout.less
@@ -162,8 +162,8 @@
   height: 100%;
   display: flex;
   flex-direction: column;
-  border-radius: 4px;
-  border: 1px solid var(--color-neutral-3);
+  border-radius: 8px;
+  //border: 1px solid var(--color-neutral-3);
   transition-property: all;
 
   & > .arco-card-header {
@@ -230,7 +230,7 @@
 // -- card
 .simple-card {
   background: var(--color-bg-2);
-  border-radius: 4px;
+  border-radius: 8px;
 }
 
 // -- doption
diff --git a/orion-visor-ui/src/components/exec/log/panel/exec-host.vue b/orion-visor-ui/src/components/exec/log/panel/exec-host.vue
index 48877527..1dcab835 100644
--- a/orion-visor-ui/src/components/exec/log/panel/exec-host.vue
+++ b/orion-visor-ui/src/components/exec/log/panel/exec-host.vue
@@ -27,7 +27,19 @@
           </div>
           <!-- 状态 -->
           <div class="exec-host-item-status">
-            <a-tag :color="getDictValue(execHostStatusKey, item.status, 'execColor')">
+            <!-- 执行结果 -->
+            <a-tag v-if="item.exitCode || item.exitCode === 0"
+                   class="exit-code-tag"
+                   title="exitCode"
+                   :color="item.exitCode === 0 ? 'rgb(var(--arcoblue-4))' : 'rgb(var(--orangered-4))'">
+              <template #icon>
+                <icon-check v-if="item.exitCode === 0" />
+                <icon-exclamation v-else />
+              </template>
+              <span class="exit-code-value">{{ item.exitCode }}</span>
+            </a-tag>
+            <!-- 执行状态 -->
+            <a-tag v-else :color="getDictValue(execHostStatusKey, item.status, 'execColor')">
               {{ getDictValue(execHostStatusKey, item.status) }}
             </a-tag>
           </div>
@@ -141,8 +153,16 @@
     &-status {
       display: flex;
       justify-content: flex-end;
-    }
+      gap: 8px;
 
+      :deep(.exit-code-tag .arco-tag-icon) {
+        color: #FFFFFF;
+      }
+
+      .exit-code-value {
+        font-weight: 600;
+      }
+    }
   }
 
 </style>
diff --git a/orion-visor-ui/src/components/exec/log/panel/log-item.vue b/orion-visor-ui/src/components/exec/log/panel/log-item.vue
index d6b29d8d..2d8fa5b4 100644
--- a/orion-visor-ui/src/components/exec/log/panel/log-item.vue
+++ b/orion-visor-ui/src/components/exec/log/panel/log-item.vue
@@ -15,7 +15,7 @@
         <!-- exitCode -->
         <a-tag v-if="host.exitCode || host.exitCode === 0"
                :color="host.exitCode === 0 ? 'arcoblue' : 'orangered'"
-               title="exit code">
+               title="exitCode">
           <template #icon>
             <icon-check v-if="host.exitCode === 0" />
             <icon-exclamation v-else />
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 57ad712d..6259cea5 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
@@ -179,7 +179,7 @@
     &-wrapper {
       background: var(--color-bg-2);
       padding: 0 12px;
-      border-radius: 4px;
+      border-radius: 8px;
 
       .card-list-info {
         height: var(--header-info-height);
diff --git a/orion-visor-ui/src/utils/is.ts b/orion-visor-ui/src/utils/is.ts
index a4b6dca8..8800d004 100644
--- a/orion-visor-ui/src/utils/is.ts
+++ b/orion-visor-ui/src/utils/is.ts
@@ -12,6 +12,10 @@ export function isString(obj: any): obj is string {
   return opt.call(obj) === '[object String]';
 }
 
+export function isBoolean(obj: any): obj is boolean {
+  return opt.call(obj) === '[object Boolean]';
+}
+
 export function isNumber(obj: any): obj is number {
   return opt.call(obj) === '[object Number]' && obj === obj; // eslint-disable-line
 }
diff --git a/orion-visor-ui/src/views/dashboard/workplace/index.vue b/orion-visor-ui/src/views/dashboard/workplace/index.vue
index ea703a28..ccf4d1c9 100644
--- a/orion-visor-ui/src/views/dashboard/workplace/index.vue
+++ b/orion-visor-ui/src/views/dashboard/workplace/index.vue
@@ -98,7 +98,7 @@
 
   :deep(.card) {
     padding: 16px 20px;
-    border-radius: 4px;
+    border-radius: 8px;
     background-color: var(--color-bg-2);
 
     &-title {
diff --git a/orion-visor-ui/src/views/exec/batch-upload/components/upload-panel.vue b/orion-visor-ui/src/views/exec/batch-upload/components/upload-panel.vue
index b3b9613b..353575b0 100644
--- a/orion-visor-ui/src/views/exec/batch-upload/components/upload-panel.vue
+++ b/orion-visor-ui/src/views/exec/batch-upload/components/upload-panel.vue
@@ -301,7 +301,7 @@
     .panel-item {
       height: 100%;
       padding: 16px;
-      border-radius: 4px;
+      border-radius: 8px;
       margin-right: 16px;
       position: relative;
       background: var(--color-bg-2);
diff --git a/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel.vue b/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel.vue
index 59c555a5..179df173 100644
--- a/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel.vue
+++ b/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel.vue
@@ -295,7 +295,7 @@
 
     .exec-form-container, .exec-command-container, .exec-history-container {
       background: var(--color-bg-2);
-      border-radius: 4px;
+      border-radius: 8px;
       height: 100%;
       padding: 16px;
       position: relative;
diff --git a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue
index 83b986e2..1c161fa1 100644
--- a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue
@@ -229,8 +229,8 @@
 
   // 获取指标名称
   const getMetricsField = (metricsId: number, field: string) => {
-    return (monitorMetrics as Array<MetricsQueryResponse>).find(m => m.id === metricsId)?.[field];
-  };
+    return (monitorMetrics as Array<MetricsQueryResponse> || []).find(m => m.id === metricsId)?.[field];
+ };
 
   // 提取标签
   const extraTags = (record: AlarmEventQueryResponse) => {
diff --git a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table.vue b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table.vue
index d5facd64..212c4db6 100644
--- a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table.vue
@@ -48,7 +48,7 @@
                                allow-clear />
       </a-form-item>
       <!-- 数据集 -->
-      <a-form-item field="metricsId" label="数据集">
+      <a-form-item field="metricsMeasurement" label="数据集">
         <a-select v-model="formModel.metricsMeasurement"
                   :options="toOptions(MetricsMeasurementKey)"
                   placeholder="数据集"
diff --git a/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue b/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue
index 88026878..e07b8154 100644
--- a/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue
@@ -30,8 +30,8 @@
                    placeholder="请输入策略描述"
                    allow-clear />
         </a-form-item>
-        <!-- 通知模板 -->
-        <a-form-item field="notifyIdList" label="通知模板">
+        <!-- 通知渠道 -->
+        <a-form-item field="notifyIdList" label="通知渠道">
           <notify-template-selector v-model="formModel.notifyIdList"
                                     biz-type="ALARM"
                                     multiple
diff --git a/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-table.vue b/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-table.vue
index 3a64350e..26f51f42 100644
--- a/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-table.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-table.vue
@@ -203,7 +203,7 @@
 
   // 获取指标名称
   const getMetricsField = (metricsId: number, field: string) => {
-    return (monitorMetrics as Array<MetricsQueryResponse>).find(m => m.id === metricsId)?.[field];
+    return (monitorMetrics as Array<MetricsQueryResponse> || []).find(m => m.id === metricsId)?.[field];
   };
 
   // 切换规则开关
diff --git a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/alarm-event-tab.vue b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/alarm-event-tab.vue
index ca42f5ac..107f0175 100644
--- a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/alarm-event-tab.vue
+++ b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/alarm-event-tab.vue
@@ -41,7 +41,7 @@
                                allow-clear />
       </a-form-item>
       <!-- 数据集 -->
-      <a-form-item field="metricsId" label="数据集">
+      <a-form-item field="metricsMeasurement" label="数据集">
         <a-select v-model="formModel.metricsMeasurement"
                   :options="toOptions(MetricsMeasurementKey)"
                   placeholder="数据集"
diff --git a/orion-visor-ui/src/views/system/dict-value/components/dict-value-form-modal.vue b/orion-visor-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
index cfc0d574..ac14cf3d 100644
--- a/orion-visor-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
+++ b/orion-visor-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
@@ -177,6 +177,9 @@
             if (type === ValueType.BOOLEAN) {
               extraValue.value[nameKey] = false;
               continue;
+            } else if (type === ValueType.STRING) {
+              extraValue.value[nameKey] = '';
+              continue;
             }
             formRef.value.setFields({
               [nameKey]: {
diff --git a/orion-visor-ui/src/views/system/setting/index.vue b/orion-visor-ui/src/views/system/setting/index.vue
index 77421866..1920e05e 100644
--- a/orion-visor-ui/src/views/system/setting/index.vue
+++ b/orion-visor-ui/src/views/system/setting/index.vue
@@ -90,7 +90,7 @@
     padding: 16px;
     display: flex;
     flex-direction: column;
-    border-radius: 4px;
+    border-radius: 8px;
   }
 
   :deep(.arco-tabs-nav-tab-list) {
diff --git a/orion-visor-ui/src/views/user/info/index.vue b/orion-visor-ui/src/views/user/info/index.vue
index 086f9124..2a696258 100644
--- a/orion-visor-ui/src/views/user/info/index.vue
+++ b/orion-visor-ui/src/views/user/info/index.vue
@@ -117,7 +117,7 @@
     padding: 16px;
     display: flex;
     flex-direction: column;
-    border-radius: 4px;
+    border-radius: 8px;
   }
 
   :deep(.arco-tabs-nav-tab-list) {