From 8091bc10cccde4264db893fc2308350117902c7e Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Mon, 15 Jul 2024 16:40:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=83=BD=E6=BA=90=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E6=8D=A2=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/view/alarmManagement/alarmSettings/index.vue           |  9 +++++++++
 .../view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts | 10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
index 157605a..6f59342 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
@@ -83,6 +83,15 @@
                   clickSwitch({ type: 3, enableRules: record.enableRules, record: record })
                 " />
             </template>
+            <template v-if="column.dataIndex === 'monitorFrequencys'">
+              {{ record.monitorFrequency.label }}
+            </template>
+            <template v-if="column.dataIndex === 'rep'">
+              {{ record.repetitions.label }}
+            </template>
+            <template v-if="column.dataIndex === 'prioritys'">
+              {{ record.priority.label }}
+            </template>
           </template>
         </ns-view-list-table>
         <a-button
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
index 77bec08..d5caddf 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
@@ -12,7 +12,7 @@ const tableKeyMap = [
   },
   {
     title: '优先级',
-    dataIndex: 'priority',
+    dataIndex: 'prioritys',
   },
   {
     title: '告警标题',
@@ -24,12 +24,11 @@ const tableKeyMap = [
   },
   {
     title: '重复次数',
-    dataIndex: 'repetitions',
-    textEllipsis: true,
+    dataIndex: 'rep',
   },
   {
     title: '监测时长',
-    dataIndex: 'monitorFrequency',
+    dataIndex: 'monitorFrequencys',
   },
   {
     title: '是否启用',
@@ -99,6 +98,9 @@ export const energyAlarmConfigs = (
           name: 'FeedBackDetail',
           dynamicParams: ['uuid', 'appealType'],
           handle: (data: any) => {
+            data.monitorFrequency = data.monitorFrequency.value;
+            data.priority = data.priority.value;
+            data.repetitions = data.repetitions.value;
             editeEnergyAlarm.value.toggle(data);
           },
         },