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

Compare commits

base: xiaomeng:16d2b0b4edf5d8a7d628f082db60d652afd83795
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:4710f7c3e3267a0b16b5f957c04a806e5620c195
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. "16d2b0b4edf5d8a7d628f082db60d652afd83795" and "4710f7c3e3267a0b16b5f957c04a806e5620c195" have entirely different histories.
16d2b0b4ed ... 4710f7c3e3

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

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

@ -713,7 +713,7 @@ export default {
// } else {
// name = el.equipmentNumber + '#' + el.environmentDataId
// }
if (el.equipmentNumber == 0) {
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
@ -722,13 +722,14 @@ export default {
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) {
name = el.equipmentNumber + '#目标' + el.environmentDataId
if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId
} else{
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
}
this.list.push({
...el,
name: name,
@ -793,7 +794,7 @@ export default {
// }else{
num = el.environmentData + el1.unit
// }
if (el.equipmentNumber == 0) {
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
@ -802,11 +803,11 @@ export default {
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) {
name = el.equipmentNumber + '#目标' + el.environmentDataId
if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId
} else{
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
}
this.list.push({
...el,