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

Compare commits

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

2 Commits
cf28b19505 ... 30bfeaba44

Author SHA1 Message Date
xiaomeng
30bfeaba44 Merge pull request '1' (#75) from pc-master into portal 
Reviewed-on: #75
 2023-12-16 02:53:38 +00:00
home孙
e97ac08eb5 1 2023-12-16 09:53:45 +08:00
1 changed files with 1 additions and 17 deletions
Show Stats Expand all files Collapse all files

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

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