xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Reviewed-on: #75
portal
xiaomeng 2023-12-16 02:53:38 +00:00
parent cf28b19505 e97ac08eb5
commit 30bfeaba44
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/page/realTime.vue
View File

@ -698,18 +698,10 @@ export default {
// }else{ // }else{
num = el.environmentData + el1.unit num = el.environmentData + el1.unit
// } // }
if (el.equipmentNumber == 0) { if (el.equipmentNumber == 0) {
if (el.targetValue == 1) {
name = '目标' + el.environmentDataId
} else {
name = '1#平均' + el.environmentDataId name = '1#平均' + el.environmentDataId
}
} else if (el.equipmentNumber == 15) { } else if (el.equipmentNumber == 15) {
if (el.targetValue == 1) {
name = '目标' + el.environmentDataId
} else {
name = '2#平均' + el.environmentDataId name = '2#平均' + el.environmentDataId
}
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
@ -779,17 +771,9 @@ export default {
num = el.environmentData + el1.unit num = el.environmentData + el1.unit
// } // }
if (el.equipmentNumber == 0) { if (el.equipmentNumber == 0) {
if (el.targetValue == 1) {
name = '目标' + el.environmentDataId
} else {
name = '1#平均' + el.environmentDataId name = '1#平均' + el.environmentDataId
}
} else if (el.equipmentNumber == 15) { } else if (el.equipmentNumber == 15) {
if (el.targetValue == 1) {
name = '目标' + el.environmentDataId
} else {
name = '2#平均' + el.environmentDataId name = '2#平均' + el.environmentDataId
}
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }