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

---
 .../alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue       | 9 +++++++--
 .../alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue    | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
index 3e36706..31e274f 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -140,14 +140,14 @@
                 <img style="width: 17px" src="../../../../../src/icon/del.png" />
               </div>
             </div>
-            <div
+            <!-- <div
               v-if="
                 infoObject.alarmList[index - 1]?.num === '' ||
                 infoObject.alarmList[index - 1]?.logic === null
               "
               style="width: 100%; color: #ff4d4f; text-align: center; margin-bottom: 5px">
               请选择正确的逻辑{{ index }} 或 输入正确的数值{{ index }}
-            </div>
+            </div> -->
           </template>
           <div
             v-if="infoObject.alarmList?.length < 2"
@@ -417,6 +417,11 @@
   const getBoolean = () => {
     for (const item of infoObject.value.alarmList) {
       if (item.logic === null || item.num === '') {
+        NsMessage.error('请选择逻辑和数值');
+        return false;
+      }
+      if (typeof item.num !== 'number') {
+        NsMessage.error('请输入正确数值');
         return false;
       }
     }
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
index 3152250..e073020 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -151,14 +151,14 @@
                 <img style="width: 17px" src="../../../../../src/icon/del.png" />
               </div>
             </div>
-            <div
+            <!-- <div
               v-if="
                 infoObject.alarmList[index - 1]?.num === '' ||
                 infoObject.alarmList[index - 1]?.logic === null
               "
               style="width: 100%; color: #ff4d4f; text-align: center; margin-bottom: 5px">
               请选择正确的逻辑{{ index }} 或 输入正确的数值{{ index }}
-            </div>
+            </div> -->
           </template>
           <div
             v-if="infoObject?.alarmList?.length < 2"
@@ -432,6 +432,11 @@
   const getBoolean = () => {
     for (const item of infoObject.value.alarmList) {
       if (item.logic === null || item.num === '') {
+        NsMessage.error('请选择逻辑和数值');
+        return false;
+      }
+      if (typeof item.num !== 'number') {
+        NsMessage.error('请输入正确数值');
         return false;
       }
     }