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

Reviewed-on: #122
portal
xiaomeng 2024-03-04 09:51:26 +00:00
commit c341cd0e17
1 changed files with 4 additions and 4 deletions

View File

@ -984,9 +984,9 @@ export default {
} }
} else { } else {
if (el.equipmentNumber == 0) { if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDatald name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) { } else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDatald name = '2#平均' + el.environmentDataId
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
@ -1072,9 +1072,9 @@ export default {
} }
} else { } else {
if (el.equipmentNumber == 0) { if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDatald name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) { } else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDatald name = '2#平均' + el.environmentDataId
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }