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

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

Reviewed-on: #77
portal
xiaomeng 2023-12-16 10:07:18 +00:00
parent 4710f7c3e3 7f718fd082
commit 16d2b0b4ed
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -713,8 +713,8 @@ export default {
// } else { // } else {
// name = el.equipmentNumber + '#' + el.environmentDataId // 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) {
@ -722,14 +722,13 @@ export default {
name = '2#平均' + el.environmentDataId name = '2#平均' + el.environmentDataId
} else { } else {
if (el.targetValue == 1) { if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId name = el.equipmentNumber + '#目标' + 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,
@ -794,8 +793,8 @@ export default {
// }else{ // }else{
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) {
@ -803,11 +802,11 @@ export default {
name = '2#平均' + el.environmentDataId name = '2#平均' + el.environmentDataId
} else { } else {
if (el.targetValue == 1) { if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId name = el.equipmentNumber + '#目标' + el.environmentDataId
} else{ } else{
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
} }
this.list.push({ this.list.push({
...el, ...el,