Compare commits

..

No commits in common. "74f4c540e8e0d4ae0e91037ac06fec96a32a6cb5" and "b1803c4420d4ac6585ef99c6106eb51bfbe4567f" have entirely different histories.

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,9 +1438,6 @@ export default {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
} }
}else{
name=el.environmentDataId
}
this.list.push({ this.list.push({