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

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

Reviewed-on: #76
portal
xiaomeng 2023-12-16 05:55:48 +00:00
parent 30bfeaba44 18c8159b0b
commit 4710f7c3e3
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,14 +697,38 @@ 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,
@ -771,13 +795,20 @@ 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,