平均/目标修改
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="" />
|
||||
|
@ -855,24 +856,25 @@ export default {
|
|||
// name = '2#平均' + el.environmentDataId
|
||||
// }
|
||||
// } else {
|
||||
// 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
|
||||
|
||||
} else {
|
||||
// }
|
||||
if (el.targetValue == 1) {
|
||||
name = el.equipmentNumber + '#目标' + el.environmentDataId
|
||||
name = '目标' + 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: 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
|
||||
|
||||
} else {
|
||||
if (el.targetValue == 1) {
|
||||
name = el.equipmentNumber + '#目标' + el.environmentDataId
|
||||
name = '目标' + 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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue