pc-master #76

Merged
xiaomeng merged 3 commits from pc-master into portal 2023-12-16 05:55:49 +00:00
Showing only changes of commit 18c8159b0b - Show all commits

View File

@ -795,13 +795,20 @@ export default {
num = el.environmentData + el1.unit
// }
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId
} else{
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
this.list.push({
...el,
name: name,