|
@ -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; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|