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

Compare commits

base: xiaomeng:30bfeaba449f481dcdaa26918052ae9f1b975a5d
Branches Tags
xiaomeng:main
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:cf28b195052ec15aec0c6ccdac86aa159b176d1a
Branches Tags
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

No commits in common. "30bfeaba449f481dcdaa26918052ae9f1b975a5d" and "cf28b195052ec15aec0c6ccdac86aa159b176d1a" have entirely different histories.
30bfeaba44 ... cf28b19505

1 changed files with 17 additions and 1 deletions
Show Stats Expand all files Collapse all files

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

@ -698,10 +698,18 @@ 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
} }
@ -771,9 +779,17 @@ 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
} }