🔨 修改文本描述.

orion-visor-ui/src/api/monitor/alarm-event.ts

@@ -4,7 +4,7 @@ import axios from 'axios';
 import qs from 'query-string';
 
 /**
- * 告警记录处理请求
+ * 告警事件处理请求
  */
 export interface AlarmEventHandleRequest {
   idList?: Array<number>;
@@ -14,14 +14,14 @@ export interface AlarmEventHandleRequest {
 }
 
 /**
- * 告警记录误报请求
+ * 告警事件误报请求
  */
 export interface AlarmEventFalseAlarmRequest {
   idList?: Array<number>;
 }
 
 /**
- * 告警记录查询请求
+ * 告警事件查询请求
  */
 export interface AlarmEventQueryRequest extends Pagination, OrderDirection {
   id?: number;
@@ -39,13 +39,13 @@ export interface AlarmEventQueryRequest extends Pagination, OrderDirection {
 }
 
 /**
- * 告警记录清理请求
+ * 告警事件清理请求
  */
 export interface AlarmEventClearRequest extends AlarmEventQueryRequest, ClearRequest {
 }
 
 /**
- * 告警记录查询响应
+ * 告警事件查询响应
  */
 export interface AlarmEventQueryResponse extends TableData {
   id: number;
@@ -75,7 +75,7 @@ export interface AlarmEventQueryResponse extends TableData {
 }
 
 /**
- * 处理告警记录
+ * 处理告警事件
  */
 export function handleAlarmEvent(request: AlarmEventHandleRequest) {
   return axios.post<number>('/monitor/alarm-event/handle', request);
@@ -89,28 +89,28 @@ export function setAlarmEventFalse(request: AlarmEventFalseAlarmRequest) {
 }
 
 /**
- * 分页查询告警记录
+ * 分页查询告警事件
  */
 export function getAlarmEventPage(request: AlarmEventQueryRequest) {
   return axios.post<DataGrid<AlarmEventQueryResponse>>('/monitor/alarm-event/query', request);
 }
 
 /**
- * 查询告警记录数量
+ * 查询告警事件数量
  */
 export function getAlarmEventCount(request: AlarmEventQueryRequest) {
   return axios.post<number>('/monitor/alarm-event/count', request);
 }
 
 /**
- * 删除告警记录
+ * 删除告警事件
  */
 export function deleteAlarmEvent(id: number) {
   return axios.delete<number>('/monitor/alarm-event/delete', { params: { id } });
 }
 
 /**
- * 批量删除告警记录
+ * 批量删除告警事件
  */
 export function batchDeleteAlarmEvent(idList: Array<number>) {
   return axios.delete<number>('/monitor/alarm-event/batch-delete', {
@@ -122,7 +122,7 @@ export function batchDeleteAlarmEvent(idList: Array<number>) {
 }
 
 /**
- * 清理告警记录
+ * 清理告警事件
  */
 export function clearMonitorAlarmEvent(request: AlarmEventClearRequest) {
   return axios.post<number>('/monitor/alarm-event/clear', request);

orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue

@@ -6,7 +6,7 @@
       <div class="table-left-bar-handle">
         <!-- 标题 -->
         <div class="table-title">
-          告警记录列表
+          告警事件列表
         </div>
       </div>
       <!-- 右侧操作 -->

orion-visor-ui/src/views/monitor/alarm-event/types/const.ts

@@ -14,7 +14,7 @@ export const FalseAlarm = {
 // 告警条件 字典项
 export const TriggerConditionKey = 'alarmTriggerCondition';
 
-// 告警记录处理状态 字典项
+// 告警事件处理状态 字典项
 export const HandleStatusKey = 'alarmEventHandleStatus';
 
 // 是否为误报 字典项

orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-form-drawer.vue

@@ -35,21 +35,26 @@
           <a-form-item v-if="formModel.allEffect === 0"
                        :field="'tag-' + (index + 1)"
                        :label="'指标标签-' + (index + 1)">
-            <a-space :size="12">
+            <a-space :size="12" class="tag-wrapper">
               <!-- 标签名称 -->
               <a-input v-model="tag.key"
-                       style="width: 128px;"
-                       placeholder="指标标签名称" />
+                       style="width: 108px;"
+                       placeholder="标签名称" />
               <!-- 标签值 -->
               <a-select v-model="tag.value"
                         class="tag-values"
                         style="width: 260px"
                         :max-tag-count="2"
-                        :options="measurementTags[measurement] || []"
-                        placeholder="标签值"
-                        tag-nowrap
+                        :options="[measurement] || []"
+                        placeholder="输入或选择标签值"
                         multiple
-                        allow-create />
+                        allow-create>
+                <template #empty>
+                  <a-empty>
+                    请输入标签值
+                  </a-empty>
+                </template>
+              </a-select>
               <!-- 移除 -->
               <a-button title="移除"
                         style="width: 32px"
@@ -200,7 +205,6 @@
   import { assignOmitRecord } from '@/utils';
   import { TriggerConditionKey, LevelKey, DefaultCondition, DefaultLevel, } from '../types/const';
   import { createAlarmRule, updateAlarmRule } from '@/api/monitor/alarm-rule';
-  import { isBoolean } from '@/utils/is';
   import { Message } from '@arco-design/web-vue';
   import { useDictStore, useCacheStore } from '@/store';
   import { getMonitorHostPolicyRuleTags } from '@/api/monitor/monitor-host';
@@ -220,7 +224,7 @@
   const tags = ref<Array<RuleTag>>([]);
   const hasTags = ref(false);
   const measurement = ref('');
-  const measurementTags = ref<Record<string, string[]>>({});
+  const  = ref<Record<string, string[]>>({});
 
   const defaultForm = (): AlarmRuleUpdateRequest => {
     return {
@@ -326,13 +330,13 @@
 
   // 加载全部标签
   const loadTags = () => {
-    const tags = measurementTags.value[measurement.value];
+    const tags = .value[measurement.value];
     if (tags) {
       return;
     }
     // 加载标签
     getMonitorHostPolicyRuleTags(formModel.value.policyId as number, measurement.value).then(({ data }) => {
-      measurementTags.value[measurement.value as any] = data;
+      .value[measurement.value as any] = data;
     });
   };
 
@@ -420,6 +424,11 @@
     margin-right: 12px;
   }
 
+  .tag-wrapper {
+    width: 100%;
+    justify-content: space-between;
+  }
+
   .alarm-level-select, .condition-select {
 
     :deep(.arco-select-view-suffix) {
@@ -430,4 +439,5 @@
   :deep(.tag-values .arco-select-view-inner) {
     flex-wrap: nowrap !important;
   }
+
 </style>

orion-visor-ui/src/views/monitor/monitor-detail/compoments/detail-header.vue

@@ -9,7 +9,7 @@
                 :hide-content="true">
           <a-tab-pane :key="TabKeys.OVERVIEW" title="主机概览" />
           <a-tab-pane :key="TabKeys.CHART" title="监控图表" />
-          <a-tab-pane :key="TabKeys.ALARM" title="告警记录" />
+          <a-tab-pane :key="TabKeys.ALARM" title="告警事件" />
         </a-tabs>
         <a-divider direction="vertical"
                    style="height: 22px; margin: 0 16px 0 8px;"
@@ -42,7 +42,7 @@
     </div>
     <!-- 右侧 -->
     <div class="header-right">
-      <!-- 告警记录标签 -->
+      <!-- 告警事件标签 -->
       <div v-if="activeKey === TabKeys.OVERVIEW" class="handle-wrapper">
         <a-tag v-if="overrideTimestamp">更新时间: {{ dateFormat(new Date(overrideTimestamp)) }}</a-tag>
       </div>