Merge pull request '1' (#237) from pc-master into portal
Reviewed-on: #237
This commit is contained in:
commit
b1803c4420
@ -13,6 +13,14 @@
|
||||
}}</span> -->
|
||||
{{ updateTime}}
|
||||
</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="left-view-new">
|
||||
<div class="list-view" v-for="item, index in list " :key="index">
|
||||
@ -1415,9 +1423,26 @@ export default {
|
||||
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({
|
||||
...el,
|
||||
name: el.environmentDataId,
|
||||
name: name,
|
||||
num: num,
|
||||
img: require(`../../assets/image/real-time-${el.formula}.png`)
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user