fix:修改设备告警 能源告警字段 对接 能碳告警

hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue

@@ -194,7 +194,7 @@
               textEllipsis: true,
             },
             {
-              title: '启用通知',
+              title: '启用状态',
               dataIndex: 'enableRules',
             },
           ],
@@ -288,7 +288,7 @@
               },
             ],
           },
-          params: { equipmentAlarmId: value.id },
+          params: { energyConsumptionAlarmId: value.id },
           // pagination: { pageSizeOptions: false },
           rowKey: 'id',
         };

hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue

@@ -25,6 +25,7 @@
               label: 'orgName',
               value: 'orgId',
             }"
+            :disabled="true"
             tree-node-filter-prop="orgName" />
         </a-form-item>
         <a-form-item label="数据来源" name="dataSources">
@@ -54,7 +55,8 @@
                 infoObject.dataSources && infoObject.dataSources[1] === 1
                   ? 'deviceName'
                   : 'pointName',
-              value: 'id',
+              value:
+                infoObject.dataSources && infoObject.dataSources[1] === 1 ? 'deviceInfoCode' : 'id',
             }" />
         </a-form-item>
         <a-form-item label="启用规则">
@@ -139,8 +141,6 @@
   import { http } from '/nerv-lib/util';
   import { dict } from '/@/api';
 
-  // import type { Rule } from 'ant-design-vue/es/form';
-
   const visible = ref(false);
   //父级数据
   const energyAlarm = ref({});
@@ -311,6 +311,10 @@
             infoObject.value.dataSourcesType,
             infoObject.value.dataSourcesWay,
           ];
+          //设备节点
+          if (infoObject.value.dataSourcesWay === 2) {
+            infoObject.value.deviceNode = Number(infoObject.value.deviceNode);
+          }
           delete infoObject.value.dataSourcesType;
           delete infoObject.value.dataSourcesWay;
           infoObject.value.comparisonType = infoObject.value.comparisonType.split(',');
@@ -348,8 +352,8 @@
         enableRules: 0,
         alarmList: [{ id: null, logic: null, num: null, isDelete: 0 }],
       };
+      infoObject.value.site = orgId.value;
     }
-
     visible.value = !visible.value;
   };
   //表单 判断规格
@@ -391,7 +395,7 @@
       //处理数据
       let data = { ...infoObject.value };
       //关联能耗告警id
-      data.equipmentAlarmId = energyAlarm.value.id;
+      data.energyConsumptionAlarmId = energyAlarm.value.id;
       data.errorCode = energyAlarm.value.errorCode;
       data.dataSourcesType = data.dataSources[0];
       data.dataSourcesWay = data.dataSources[1];

hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue

@@ -18,22 +18,26 @@
           placeholder="请选择告警频率"
           style="width: 100%"
           allowClear
-          :options="alarmFrequencyData" />
+          :options="alarmFrequencyData"
+          @change="handleChangeAlarmFrequency" />
       </a-form-item>
       <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="间隔时长">
         <ns-input-number
-          style="width: 60%"
+          style="width: 100%"
           v-model:value="infoObject.intervalDuration"
-          placeholder="请输入间隔时长" />
-        <a-select
-          v-model:value="infoObject.intervalDurationUnit"
-          placeholder="请选择间隔时长单位"
-          style="width: 40%"
-          allowClear
-          :options="intervalDurationUnitData" />
+          placeholder="请输入间隔时长">
+          <template #addonAfter>
+            <a-select
+              v-model:value="infoObject.intervalDurationUnit"
+              placeholder="请选择间隔时长单位"
+              style="width: 80px"
+              allowClear
+              :options="intervalDurationUnitData" />
+          </template>
+        </ns-input-number>
       </a-form-item>
       <a-form-item label="优先级" name="priority">
         <a-select
@@ -77,6 +81,12 @@
   import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
 
   const visible = ref(false);
+  // 间隔单位 默认值
+  const handleChangeAlarmFrequency = () => {
+    if (infoObject.value.alarmFrequency === 2 && !infoObject.value.intervalDurationUnit) {
+      infoObject.value.intervalDurationUnit = 1;
+    }
+  };
   //表单数据
   const infoObject = ref({
     alarmTitle: null,