From 6c3dd401ad97a59075b6a1e208cb55f0d4062b10 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Fri, 23 Aug 2024 13:11:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B9=E6=8D=AE=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4.00=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarmSettings/energyAlarm/configureEnergyAlarms.vue        | 10 ++++++++++
 .../alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue     |  1 +
 .../alarmSettings/energyAlarm/editeEnergyAlarm.vue             |  2 +-
 .../alarmSettings/equipmentAlarm/configureDeviceAlarms.vue     | 10 ++++++++++
 .../alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue  |  1 +
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
index 0ee568d..d93f273 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
@@ -11,6 +11,9 @@
           }"
           @click="clickSwitch({ enableRules: record.enableRules, record: record })" />
       </template>
+      <template v-if="column.dataIndex === 'conditionalJudgment'">
+        {{ getConditionalJudgment(record) }}
+      </template>
       <template v-if="column.dataIndex === 'comparisonType'">
         {{ getcomparisonType(record) }}
       </template>
@@ -69,6 +72,12 @@
           }
         }
       };
+      const getConditionalJudgment = (data: any) => {
+        const formattedValue = data.conditionalJudgment.replace(/(\d+)\.00/g, '$1');
+        // 返回处理后的值
+        console.log(formattedValue, 'value');
+        return formattedValue;
+      };
       const clickSwitch = (data: any) => {
         NsModal.confirm({
           title: '启用状态',
@@ -315,6 +324,7 @@
         getcomparisonType,
         orgId,
         tableConfig,
+        getConditionalJudgment,
         editConfigureEnergyAlarms,
         setconfigureDeviceAlarmsData,
       };
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 8bd1a49..3e36706 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -111,6 +111,7 @@
                 :min="-9999999999.99"
                 :max="9999999999.99"
                 :precision="2"
+                :formatter="(value) => `${value}`.replace(/\.00$/, '')"
                 v-model:value="infoObject.alarmList[index - 1].num" />
               <div
                 v-if="index > 1 && index === infoObject.alarmList?.length"
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 b931e47..987879a 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
@@ -32,7 +32,7 @@
       <a-form-item v-if="infoObject.alarmFrequency === 2" name="repetitions" label="重复次数">
         <ns-input-number
           v-model:value="infoObject.repetitions"
-          :min="0"
+          :min="1"
           :max="99"
           placeholder="请输入重复次数" />
       </a-form-item>
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
index 0d880f7..7c9828c 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
@@ -14,6 +14,9 @@
       <template v-if="column.dataIndex === 'valueType'">
         {{ record.valueType.label }}
       </template>
+      <template v-if="column.dataIndex === 'conditionalJudgment'">
+        {{ getConditionalJudgment(record) }}
+      </template>
     </template>
   </ns-view-list-table>
   <!-- 新增or编辑界面 -->
@@ -296,6 +299,12 @@
           rowKey: 'id',
         };
       };
+      const getConditionalJudgment = (data: any) => {
+        const formattedValue = data.conditionalJudgment.replace(/(\d+)\.00/g, '$1');
+        // 返回处理后的值
+        console.log(formattedValue, 'value');
+        return formattedValue;
+      };
       return {
         configureDeviceAlarmsData,
         show,
@@ -303,6 +312,7 @@
         doWnload,
         tableConfig,
         orgId,
+        getConditionalJudgment,
         mainRef,
         editObject,
         editConfigureDeviceAlarms,
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 2ca82d1..3152250 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -122,6 +122,7 @@
                 :min="-9999999999.99"
                 :max="9999999999.99"
                 :precision="2"
+                :formatter="(value) => `${value}`.replace(/\.00$/, '')"
                 v-model:value="infoObject.alarmList[index - 1].num" />
               <div
                 v-if="index > 1 && index === infoObject.alarmList?.length"