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

---
 .../equipmentAlarm/editeEquipmentAlarm.vue         | 50 ++++++++++++++--------
 1 file changed, 32 insertions(+), 18 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 68c421b..ade1d0c 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -15,20 +15,6 @@
       <a-form-item name="alarmTitle" label="告警标题">
         <ns-input allowClear v-model:value="infoObject.alarmTitle" placeholder="请输入告警标题" />
       </a-form-item>
-      <a-form-item name="monitorTime" label="监测时长">
-        <ns-input-number
-          allowClear
-          v-model:value="infoObject.monitorTime"
-          placeholder="请输入监测时长" />
-      </a-form-item>
-      <a-form-item label="监测时长单位" name="monitorTimeUnit">
-        <a-select
-          v-model:value="infoObject.monitorTimeUnit"
-          placeholder="请选择监测时长单位"
-          style="width: 100%"
-          allowClear
-          :options="MonitorTimeUnitEnum" />
-      </a-form-item>
       <a-form-item label="告警频率" name="alarmFrequency">
         <a-select
           v-model:value="infoObject.alarmFrequency"
@@ -56,6 +42,30 @@
           </template>
         </ns-input-number>
       </a-form-item>
+      <a-form-item name="monitorTime" label="监测时长">
+        <ns-input-number
+          allowClear
+          style="width: 100%"
+          v-model:value="infoObject.monitorTime"
+          placeholder="请输入监测时长">
+          <template #addonAfter>
+            <a-select
+              v-model:value="infoObject.monitorTimeUnit"
+              placeholder="请选择监测时长单位"
+              style="width: 80px"
+              allowClear
+              :options="MonitorTimeUnitEnum" />
+          </template>
+        </ns-input-number>
+      </a-form-item>
+      <!-- <a-form-item label="监测时长单位" name="monitorTimeUnit">
+        <a-select
+          v-model:value="infoObject.monitorTimeUnit"
+          placeholder="请选择监测时长单位"
+          style="width: 100%"
+          allowClear
+          :options="MonitorTimeUnitEnum" />
+      </a-form-item> -->
       <a-form-item label="优先级" name="priority">
         <a-select
           v-model:value="infoObject.priority"
@@ -101,7 +111,7 @@
     alarmTitle: null,
     alarmFrequency: null,
     monitorTime: null,
-    monitorTimeUnit: null,
+    monitorTimeUnit: 2,
     priority: null,
     createWorkOrder: null,
     intervalDurationUnit: null,
@@ -141,7 +151,7 @@
         alarmTitle: null,
         alarmFrequency: null,
         monitorTime: null,
-        monitorTimeUnit: null,
+        monitorTimeUnit: 2,
         priority: null,
         createWorkOrder: null,
         intervalDurationUnit: null,
@@ -180,7 +190,11 @@
         required: true,
         trigger: 'change',
         validator: (rules: any, monitorTime: any, cbfn: any) => {
-          if (Number.isInteger(monitorTime) && monitorTime > 0) {
+          if (
+            Number.isInteger(monitorTime) &&
+            monitorTime > 0 &&
+            infoObject.value.monitorTimeUnit
+          ) {
             cbfn();
           } else {
             cbfn('请输入正确的监测时长');
@@ -220,7 +234,7 @@
     ],
     createWorkOrder: [{ required: true, message: '请选择是否创建工单', trigger: 'change' }],
     priority: [{ required: true, message: '请选择优先级', trigger: 'change' }],
-    monitorTimeUnit: [{ required: true, message: '请选择监测时长单位', trigger: 'change' }],
+    // monitorTimeUnit: [{ required: true, message: '请选择监测时长单位', trigger: 'change' }],
   };
   //开关
   const changeSwitch = () => {