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 @@ -
请选择正确的逻辑{{ index }} 或 输入正确的数值{{ index }} -
+ -->
{ 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 @@
-
请选择正确的逻辑{{ index }} 或 输入正确的数值{{ index }} -
+ -->
{ 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; } }