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

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

Browse Source 
Reviewed-on: #237
This commit is contained in:
xiaomeng 2025-05-08 08:30:08 +00:00
commit b1803c4420
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,12 +13,20 @@
}}</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>
@ -1415,9 +1423,26 @@ 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: el.environmentDataId, name: name,
num: num, num: num,
img: require(`../../assets/image/real-time-${el.formula}.png`) img: require(`../../assets/image/real-time-${el.formula}.png`)
}) })