From b89794d8bebb3a3bf15e06cfae32ae055bf1180f Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Tue, 13 Aug 2024 17:30:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=91=8A=E8=AD=A6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarmSettings/energyAlarm/editeEnergyAlarm.vue           | 12 +++++++++---
 .../alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue     |  5 +++++
 .../src/view/alarmManagement/alarmSettings/index.vue         |  2 +-
 .../alarmManagement/alarmSettings/ts/energyAlarmConfig.ts    |  5 ++++-
 .../alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts |  3 +++
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
index 30d7668..a9a9aee 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
@@ -27,7 +27,10 @@
       <a-form-item v-if="infoObject.alarmFrequency === 2" name="repetitions" label="重复次数">
         <ns-input-number v-model:value="infoObject.repetitions" placeholder="请输入重复次数" />
       </a-form-item>
-      <a-form-item v-if="infoObject.alarmFrequency === 2" name="intervalDuration" label="间隔时长">
+      <a-form-item
+        v-if="infoObject.alarmFrequency === 2 || infoObject.alarmFrequency === 3"
+        name="intervalDuration"
+        label="间隔时长">
         <ns-input-number
           style="width: 100%"
           v-model:value="infoObject.intervalDuration"
@@ -87,9 +90,12 @@
   const visible = ref(false);
   // 间隔单位 默认值
   const handleChangeAlarmFrequency = () => {
-    if (infoObject.value.alarmFrequency === 2 && !infoObject.value.intervalDurationUnit) {
+    if (infoObject.value.alarmFrequency !== 1 && !infoObject.value.intervalDurationUnit) {
       infoObject.value.intervalDurationUnit = 1;
     }
+    if (infoObject.value.alarmFrequency === 3) {
+      infoObject.value.repetitions = null;
+    }
   };
   //组织id
   const orgId = ref('');
@@ -217,7 +223,7 @@
         data.orgId = orgId.value;
       }
       data.createWorkOrder = Number(data.createWorkOrder);
-      if (data.alarmFrequency !== 2) {
+      if (data.alarmFrequency === 1) {
         data.repetitions = null;
         data.intervalDuration = null;
         data.intervalDurationUnit = null;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
index 189de15..1ca1573 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -173,6 +173,11 @@
     ) {
       infoObject.value.intervalDurationUnit = 1;
     }
+    console.log(infoObject.value.alarmFrequency);
+
+    if (infoObject.value.alarmFrequency === 3) {
+      infoObject.value.repetitions = null;
+    }
   };
   //表单 判断规格
   const rules = {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
index e89b369..f9502e9 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
@@ -118,7 +118,7 @@
             </template>
             <template v-if="column.dataIndex === 'interval'">
               {{
-                record.intervalDuration && record.alarmFrequency.value === 2
+                record.intervalDuration && record.alarmFrequency.value !== 1
                   ? record.intervalDuration + '' + record.intervalDurationUnit.label
                   : '-'
               }}
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 d11906a..cfd9733 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
@@ -136,11 +136,14 @@ export const energyAlarmConfigs = (
               obj.monitorFrequency = data.monitorFrequency.value;
             }
             obj.createWorkOrder = obj.createWorkOrder + '';
-            if (obj.alarmFrequency !== 2) {
+            if (obj.alarmFrequency === 1) {
               obj.repetitions = null;
               obj.intervalDuration = null;
               obj.intervalDurationUnit = null;
             }
+            if (obj.alarmFrequency === 3) {
+              obj.repetitions = null;
+            }
             editeEnergyAlarm.value.toggle(obj);
           },
         },
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
index 50d04a1..6c5e03b 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
@@ -132,6 +132,9 @@ export const equipmentAlarmTableConfig = (
               obj.intervalDuration = null;
               obj.intervalDurationUnit = null;
             }
+            if (obj.alarmFrequency === 3) {
+              obj.repetitions = null;
+            }
             obj.monitorTimeUnit = data.monitorTimeUnit.value;
             editEquipmentAlarm.value.toggle(obj);
           },