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 30d7668..a9a9aee 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue @@ -27,7 +27,10 @@ - + { - if (infoObject.value.alarmFrequency === 2 && !infoObject.value.intervalDurationUnit) { + if (infoObject.value.alarmFrequency !== 1 && !infoObject.value.intervalDurationUnit) { infoObject.value.intervalDurationUnit = 1; } + if (infoObject.value.alarmFrequency === 3) { + infoObject.value.repetitions = null; + } }; //组织id const orgId = ref(''); @@ -217,7 +223,7 @@ data.orgId = orgId.value; } data.createWorkOrder = Number(data.createWorkOrder); - if (data.alarmFrequency !== 2) { + if (data.alarmFrequency === 1) { data.repetitions = null; data.intervalDuration = null; data.intervalDurationUnit = null; 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 189de15..1ca1573 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue @@ -173,6 +173,11 @@ ) { infoObject.value.intervalDurationUnit = 1; } + console.log(infoObject.value.alarmFrequency); + + if (infoObject.value.alarmFrequency === 3) { + infoObject.value.repetitions = null; + } }; //表单 判断规格 const rules = { diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue index e89b369..f9502e9 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue @@ -118,7 +118,7 @@