From 3d9cf0d94cbea1a1235aa9d0fe6964e40d1ee093 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Tue, 13 Aug 2024 17:16:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentAlarm/editeEquipmentAlarm.vue    | 28 +++++++++++++------
 .../alarmManagement/alarmSettings/index.vue   |  3 +-
 .../alarmSettings/ts/equipmentAlarmConfig.ts  |  2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)

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 0f3b99f..189de15 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.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"
@@ -164,7 +167,10 @@
   };
   // 间隔单位 默认值
   const handleChangeAlarmFrequency = () => {
-    if (infoObject.value.alarmFrequency === 2 && !infoObject.value.intervalDurationUnit) {
+    if (
+      (infoObject.value.alarmFrequency === 2 || infoObject.value.alarmFrequency === 3) &&
+      !infoObject.value.intervalDurationUnit
+    ) {
       infoObject.value.intervalDurationUnit = 1;
     }
   };
@@ -250,8 +256,8 @@
   const btnClick = () => {
     //表单校验
     formRef.value.validate().then(() => {
-      // 告警频率重复时 都换成分钟  比较 监测时长 和 间隔时长  重复次数 * 间隔 <= 监测
-      if (infoObject.value.alarmFrequency === 2) {
+      // 告警频率重复时 都换成分钟  比较 监测时长 和 间隔时长  重复次数 * 间隔 <= 监测 是累计时 重复次数是1
+      if (infoObject.value.alarmFrequency === 2 || infoObject.value.alarmFrequency === 3) {
         // 监测时长
         let monitorTime = 0;
         switch (infoObject.value.monitorTimeUnit) {
@@ -270,18 +276,22 @@
         switch (infoObject.value.intervalDurationUnit) {
           case 1:
             intervalTime =
-              Number(infoObject.value.intervalDuration) * 1 * Number(infoObject.value.repetitions);
+              Number(infoObject.value.intervalDuration) *
+              1 *
+              Number(infoObject.value.repetitions ? infoObject.value.repetitions : 1);
             break;
           case 2:
             intervalTime =
-              Number(infoObject.value.intervalDuration) * 60 * Number(infoObject.value.repetitions);
+              Number(infoObject.value.intervalDuration) *
+              60 *
+              Number(infoObject.value.repetitions ? infoObject.value.repetitions : 1);
             break;
           case 3:
             intervalTime =
               Number(infoObject.value.intervalDuration) *
               60 *
               24 *
-              Number(infoObject.value.repetitions);
+              Number(infoObject.value.repetitions ? infoObject.value.repetitions : 1);
             break;
         }
         if (intervalTime > monitorTime) {
@@ -297,11 +307,13 @@
       //调用接口
       let data = { ...infoObject.value };
       data.createWorkOrder = Number(data.createWorkOrder);
-      if (data.alarmFrequency !== 2) {
+      if (data.alarmFrequency === 1) {
         data.repetitions = null;
         data.intervalDuration = null;
         data.intervalDurationUnit = null;
       }
+      console.log(data, '数据');
+
       if (!data.orgId) {
         data.orgId = orgId.value;
       }
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
index bb82861..e89b369 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
@@ -64,7 +64,8 @@
             </template>
             <template v-if="column.dataIndex === 'interval'">
               {{
-                record.intervalDuration && record.alarmFrequency.value === 2
+                record.intervalDuration &&
+                (record.alarmFrequency.value === 2 || record.alarmFrequency.value === 3)
                   ? record.intervalDuration + '' + record.intervalDurationUnit.label
                   : '-'
               }}
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 ca78c9e..50d04a1 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
@@ -127,7 +127,7 @@ export const equipmentAlarmTableConfig = (
               obj.intervalDurationUnit = data.intervalDurationUnit.value;
             }
             obj.createWorkOrder = obj.createWorkOrder + '';
-            if (obj.alarmFrequency !== 2) {
+            if (obj.alarmFrequency === 1) {
               obj.repetitions = null;
               obj.intervalDuration = null;
               obj.intervalDurationUnit = null;