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

平均/目标修改

pull/96/head
孙萌 2024-01-19 10:32:51 +08:00
parent 3768e57d72
commit 5edf37db7c
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
<template> <template>
<div class="formula realTime"> <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"> <div class="table-title">
<img src="../../assets/image/real-time.png" alt="" /> <img src="../../assets/image/real-time.png" alt="" />
@ -855,24 +856,25 @@ export default {
// name = '2#平均' + el.environmentDataId // name = '2#平均' + el.environmentDataId
// } // }
// } else { // } else {
// if (el.targetValue == 1) {
// name = el.equipmentNumber + '#目标' + el.environmentDataId
// } else {
// name = el.equipmentNumber + '#' + el.environmentDataId // 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) { 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 { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }
} }
this.list.push({ this.list.push({
...el, ...el,
name: name, name: name,
@ -942,17 +944,13 @@ export default {
num = el.environmentData + el1.unit 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) { 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 { } else {
name = el.equipmentNumber + '#' + el.environmentDataId name = el.equipmentNumber + '#' + el.environmentDataId
} }