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

Compare commits

base: xiaomeng:b1803c4420d4ac6585ef99c6106eb51bfbe4567f
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:5f6b637b9213c83e33eb5697c5824d8f9d48efd0
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. "b1803c4420d4ac6585ef99c6106eb51bfbe4567f" and "5f6b637b9213c83e33eb5697c5824d8f9d48efd0" have entirely different histories.
b1803c4420 ... 5f6b637b92

1 changed files with 2 additions and 27 deletions
Show Stats Expand all files Collapse all files

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

@ -13,20 +13,12 @@
}}</span> --> }}</span> -->
{{ updateTime}} {{ updateTime}}
</div> </div>
<div class="flex-view border-none warning-btn" v-if="deviceName == 30">
<div class="input-btn ">
<div class="btn green" @click="openWarn">
<img src="../../assets/image/real-time-icon2.png" alt="" />短信报警
</div>
</div>
</div>
<div class="flex-list realTime-bottom" :class="deviceName == 30 ? 'weather' : ''"> <div class="flex-list realTime-bottom" :class="deviceName == 30 ? 'weather' : ''">
<div class="left-view-new"> <div class="left-view-new">
<div class="list-view" v-for="item, index in list " :key="index"> <div class="list-view" v-for="item, index in list " :key="index">
<img :src="item.img" alt=""> <img :src="item.img" alt="">
<div> <div>
<div class="text">{{ item.name }}</div> <div class="text">{{ item.name }}</div>
<div class="number" :style="item.num=='故障'?'color:rgba(252, 125, 106, 1)':''"> {{ getControlData(item) }}</div> <div class="number" :style="item.num=='故障'?'color:rgba(252, 125, 106, 1)':''"> {{ getControlData(item) }}</div>
</div> </div>
</div> </div>
@ -1423,26 +1415,9 @@ export default {
num = el.environmentData + el1.unit num = el.environmentData + el1.unit
} }
if (el.targetValue == 1) {
if (el.equipmentNumber == 0) {
name = '目标' + el.environmentDataId
} else {
name = '目标' + el.equipmentNumber + '#' + el.environmentDataId
}
} else {
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else {
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
this.list.push({ this.list.push({
...el, ...el,
name: name, name: el.environmentDataId,
num: num, num: num,
img: require(`../../assets/image/real-time-${el.formula}.png`) img: require(`../../assets/image/real-time-${el.formula}.png`)
}) })