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

Compare commits

base: xiaomeng:4710f7c3e3267a0b16b5f957c04a806e5620c195
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:30bfeaba449f481dcdaa26918052ae9f1b975a5d
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. "4710f7c3e3267a0b16b5f957c04a806e5620c195" and "30bfeaba449f481dcdaa26918052ae9f1b975a5d" have entirely different histories.
4710f7c3e3 ... 30bfeaba44

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

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

@ -697,38 +697,14 @@ export default {
// num=this.countType3(el.environmentData)+el1.unit // num=this.countType3(el.environmentData)+el1.unit
// }else{ // }else{
num = el.environmentData + el1.unit num = el.environmentData + el1.unit
// }
// if (el.equipmentNumber == 0) {
// if (el.targetValue == 1) {
// name = '1#目标' + el.environmentDataId
// } else {
// name = '1#平均' + el.environmentDataId
// }
// } else if (el.equipmentNumber == 15) {
// if (el.targetValue == 1) {
// name = '2#目标' + el.environmentDataId
// } else {
// name = '2#平均' + el.environmentDataId
// }
// } else {
// name = el.equipmentNumber + '#' + el.environmentDataId
// } // }
if (el.equipmentNumber == 0) { if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) { } else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
}
this.list.push({ this.list.push({
...el, ...el,
@ -795,20 +771,13 @@ export default {
num = el.environmentData + el1.unit num = el.environmentData + el1.unit
// } // }
if (el.equipmentNumber == 0) { if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) { } else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId
} else { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
}
this.list.push({ this.list.push({
...el, ...el,
name: name, name: name,