xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix:修改告警设置问题

Browse Source
This commit is contained in:
zhaohy
2024-09-03 14:52:43 +08:00
parent 0698847543
commit 6b03be0119
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,14 +140,14 @@
<img style="width: 17px" src="../../../../../src/icon/del.png" /> <img style="width: 17px" src="../../../../../src/icon/del.png" />
</div> </div>
</div> </div>
<div <!-- <div
v-if=" v-if="
infoObject.alarmList[index - 1]?.num === '' || infoObject.alarmList[index - 1]?.num === '' ||
infoObject.alarmList[index - 1]?.logic === null infoObject.alarmList[index - 1]?.logic === null
" "
style="width: 100%; color: #ff4d4f; text-align: center; margin-bottom: 5px"> style="width: 100%; color: #ff4d4f; text-align: center; margin-bottom: 5px">
请选择正确的逻辑{{ index }} 或 输入正确的数值{{ index }} 请选择正确的逻辑{{ index }} 或 输入正确的数值{{ index }}
</div> </div> -->
</template> </template>
<div <div
v-if="infoObject.alarmList?.length < 2" v-if="infoObject.alarmList?.length < 2"
@@ -417,6 +417,11 @@
const getBoolean = () => { const getBoolean = () => {
for (const item of infoObject.value.alarmList) { for (const item of infoObject.value.alarmList) {
if (item.logic === null || item.num === '') { if (item.logic === null || item.num === '') {
NsMessage.error('请选择逻辑和数值');
return false;
}
if (typeof item.num !== 'number') {
NsMessage.error('请输入正确数值');
return false; return false;
} }
} }

9
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
View File

@@ -151,14 +151,14 @@
<img style="width: 17px" src="../../../../../src/icon/del.png" /> <img style="width: 17px" src="../../../../../src/icon/del.png" />
</div> </div>
</div> </div>
<div <!-- <div
v-if=" v-if="
infoObject.alarmList[index - 1]?.num === '' || infoObject.alarmList[index - 1]?.num === '' ||
infoObject.alarmList[index - 1]?.logic === null infoObject.alarmList[index - 1]?.logic === null
" "
style="width: 100%; color: #ff4d4f; text-align: center; margin-bottom: 5px"> style="width: 100%; color: #ff4d4f; text-align: center; margin-bottom: 5px">
请选择正确的逻辑{{ index }} 或 输入正确的数值{{ index }} 请选择正确的逻辑{{ index }} 或 输入正确的数值{{ index }}
</div> </div> -->
</template> </template>
<div <div
v-if="infoObject?.alarmList?.length < 2" v-if="infoObject?.alarmList?.length < 2"
@@ -432,6 +432,11 @@
const getBoolean = () => { const getBoolean = () => {
for (const item of infoObject.value.alarmList) { for (const item of infoObject.value.alarmList) {
if (item.logic === null || item.num === '') { if (item.logic === null || item.num === '') {
NsMessage.error('请选择逻辑和数值');
return false;
}
if (typeof item.num !== 'number') {
NsMessage.error('请输入正确数值');
return false; return false;
} }
} }