平均/目标修改
parent
3768e57d72
commit
5edf37db7c
|
@ -1,7 +1,8 @@
|
|||
<template>
|
||||
<div class="formula realTime">
|
||||
<!-- 生态气象站 -->
|
||||
<div class="page-content new-data" v-if="deviceName == 30" :class="deviceName == 10 || deviceName == 30 ? 'control-page' : ''">
|
||||
<div class="page-content new-data" v-if="deviceName == 30"
|
||||
:class="deviceName == 10 || deviceName == 30 ? 'control-page' : ''">
|
||||
|
||||
<div class="table-title">
|
||||
<img src="../../assets/image/real-time.png" alt="" />
|
||||
|
@ -12,7 +13,7 @@
|
|||
}}</span> -->
|
||||
{{ list[0].updateTime ? list[0].updateTime : '' }}
|
||||
</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="list-view" v-for="item, index in list " :key="index">
|
||||
<img :src="item.img" alt="">
|
||||
|
@ -502,7 +503,7 @@ export default {
|
|||
this.deviceName = store.equipmentList[this.indexs - 1].deviceName
|
||||
this.deviceState = store.equipmentList[this.indexs - 1].deviceState
|
||||
// this.getTime()
|
||||
console.log(store.equipmentList[this.indexs - 1].deviceName,this.indexs - 1,77);
|
||||
console.log(store.equipmentList[this.indexs - 1].deviceName, this.indexs - 1, 77);
|
||||
setTimeout(() => {
|
||||
that.dataInit();
|
||||
that.timer && clearInterval(that.timer)
|
||||
|
@ -855,24 +856,25 @@ export default {
|
|||
// name = '2#平均' + el.environmentDataId
|
||||
// }
|
||||
// } else {
|
||||
// name = el.equipmentNumber + '#' + el.environmentDataId
|
||||
// if (el.targetValue == 1) {
|
||||
// name = el.equipmentNumber + '#目标' + 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
|
||||
|
||||
if (el.targetValue == 1) {
|
||||
name = '目标' + el.environmentDataId
|
||||
} else {
|
||||
if (el.targetValue == 1) {
|
||||
name = el.equipmentNumber + '#目标' + el.environmentDataId
|
||||
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: name,
|
||||
|
@ -942,17 +944,13 @@ export default {
|
|||
num = el.environmentData + el1.unit
|
||||
}
|
||||
// }
|
||||
if (el.equipmentNumber == 0) {
|
||||
|
||||
name = '1#平均' + el.environmentDataId
|
||||
|
||||
} else if (el.equipmentNumber == 15) {
|
||||
|
||||
name = '2#平均' + el.environmentDataId
|
||||
|
||||
if (el.targetValue == 1) {
|
||||
name = '目标' + el.environmentDataId
|
||||
} else {
|
||||
if (el.targetValue == 1) {
|
||||
name = el.equipmentNumber + '#目标' + el.environmentDataId
|
||||
if (el.equipmentNumber == 0) {
|
||||
name = '1#平均' + el.environmentDataId
|
||||
} else if (el.equipmentNumber == 15) {
|
||||
name = '2#平均' + el.environmentDataId
|
||||
} else {
|
||||
name = el.equipmentNumber + '#' + el.environmentDataId
|
||||
}
|
||||
|
@ -1038,20 +1036,20 @@ export default {
|
|||
} else if (this.deviceName == 30) {
|
||||
this.api.getControlRtDatastation(formData).then(res => {
|
||||
this.controlList = []
|
||||
this.list=[]
|
||||
this.list = []
|
||||
if (res.data.code == 200) {
|
||||
res.data.data.forEach((el, index) => {
|
||||
list.forEach((el1, index1) => {
|
||||
if (el.formula == el1.value) {
|
||||
// console.log(el1);
|
||||
var num = 0
|
||||
var name=''
|
||||
var name = ''
|
||||
if (el.equipmentStart == 0) {
|
||||
num = '故障'
|
||||
} else {
|
||||
num = el.environmentData + el1.unit
|
||||
}
|
||||
|
||||
|
||||
this.list.push({
|
||||
...el,
|
||||
name: el.environmentDataId,
|
||||
|
|
Loading…
Reference in New Issue