Merge pull request '1' (#238) from pc-master into portal

Reviewed-on: #238
This commit is contained in:
xiaomeng 2025-05-09 01:52:15 +00:00
commit 74f4c540e8

View File

@ -1422,7 +1422,7 @@ export default {
} else { } else {
num = el.environmentData + el1.unit num = el.environmentData + el1.unit
} }
if(el.equipmentName==30){
if (el.targetValue == 1) { if (el.targetValue == 1) {
if (el.equipmentNumber == 0) { if (el.equipmentNumber == 0) {
name = '目标' + el.environmentDataId name = '目标' + el.environmentDataId
@ -1438,6 +1438,9 @@ export default {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
} }
}else{
name=el.environmentDataId
}
this.list.push({ this.list.push({