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

Compare commits

base: xiaomeng:74f4c540e8e0d4ae0e91037ac06fec96a32a6cb5
Branches Tags
xiaomeng:main
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:b1803c4420d4ac6585ef99c6106eb51bfbe4567f
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

No commits in common. "74f4c540e8e0d4ae0e91037ac06fec96a32a6cb5" and "b1803c4420d4ac6585ef99c6106eb51bfbe4567f" have entirely different histories.
74f4c540e8 ... b1803c4420

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

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

@ -1422,8 +1422,8 @@ export default {
} else {
num = el.environmentData + el1.unit
}
if(el.equipmentName==30){
if (el.targetValue == 1) {
if (el.targetValue == 1) {
if (el.equipmentNumber == 0) {
name = '目标' + el.environmentDataId
} else {
@ -1438,10 +1438,7 @@ export default {
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
}else{
name=el.environmentDataId
}
this.list.push({
...el,