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

Compare commits

base: xiaomeng:30bfeaba449f481dcdaa26918052ae9f1b975a5d
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

4 Commits
30bfeaba44 ... 4710f7c3e3

Author SHA1 Message Date
xiaomeng
4710f7c3e3 Merge pull request 'pc-master' (#76) from pc-master into portal 
Reviewed-on: #76
 2023-12-16 05:55:48 +00:00
home孙
18c8159b0b 1 2023-12-16 13:40:10 +08:00
home孙
2295d61251 1 2023-12-16 13:36:54 +08:00
home孙
ce46ebeae3 1 2023-12-16 13:11:52 +08:00
1 changed files with 34 additions and 3 deletions
Show Stats 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
// }else{
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) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId
} else{
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
this.list.push({
...el,
@ -771,13 +795,20 @@ export default {
num = el.environmentData + el1.unit
// }
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId
} else{
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
this.list.push({
...el,
name: name,