From fa5d74f2b139a8067fdda7585330a33c9cf0d6a4 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 18:39:32 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue  |    7 
 src/components/BaseNav/PublicBounced/common/PublicChart.vue          |    6 
 src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue  |   16 
 src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue |  108 +-----
 src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue      |  707 ++++++++++++++++++++++++++++++++++++++++------
 src/components/BaseNav/PublicBounced/PublicBounced.vue               |    4 
 6 files changed, 651 insertions(+), 197 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 4df41b8..82839fc 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -57,9 +57,11 @@
       getWasteWaterMonitoringDetails: [],
       getQueryOnlineMonData: [],
       ManualData: []
-      // getGasQueryOnlineMonData: []
     }
   },
+  beforeUpdate () {
+    this.$refs.PublicChart.$refs.Echats.CreateChart()
+  },
   methods: {
     closePopup () {
       this.flag = false
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index 0ea49c3..b7d1745 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -24,7 +24,7 @@
             <span >瓒呮爣</span>
             <i style=" background: orange;"></i>
         </div>
-        <component :is="currentTab" v-bind="$attrs" ref="Echatrs"></component>
+        <component :is="currentTab" v-bind="$attrs" ref="Echats"></component>
     </div>
 </template>
 
@@ -50,10 +50,6 @@
     EChartsHourWasteWater,
     EChartsDateWasteWater,
     EChartsWasteWaterTable
-  },
-  mounted () {
-    this.$refs.Echatrs.CreateChart()
-    this.$refs.Echatrs.effChartShow()
   },
   data () {
     return {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index 334965e..b6d5031 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -152,10 +152,10 @@
   methods: {
     onSubmit () {
       console.log('submit!')
-      this.CreateChart(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
+      this.CreateCharts(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
     },
 
-    CreateChart: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
+    CreateCharts: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
       this.mychartDay = this.$echarts.init(this.$refs.main)
       this.mychartDay.clear()
       var dataUnit = ''
@@ -335,7 +335,8 @@
         },
         grid: { // 缃戞牸
           top: '20%',
-          left: '5%'
+          left: '12%',
+          bottom: '15%'
           // containLabel: true
         },
         legend: { // 鍥句緥
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index c7d73cf..879b85c 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -25,16 +25,6 @@
                         </span>
                     </div>
                 </div>
-<!--                <div>-->
-<!--                    閲囨牱鐐规暟:-->
-<!--                    <el-select v-model="formInline.region">-->
-<!--                        <el-option label="0" value="0"></el-option>-->
-<!--                        <el-option label="25" value="25"></el-option>-->
-<!--                        <el-option label="50" value="50"></el-option>-->
-<!--                        <el-option label="75" value="75"></el-option>-->
-<!--                        <el-option label="100" value="100"></el-option>-->
-<!--                    </el-select>-->
-<!--                </div>-->
                 <div class="detailbtn"  @click="onSubmit">鏌ヨ</div>
                 <div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
              </div>
@@ -43,7 +33,6 @@
         <!-- 鏄庣粏寮规 -->
         <el-dialog :visible.sync="dialogVisible"
                    :append-to-body="true"
-                   :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"
                    width="68%"
                    center
                    v-dialogDrag
@@ -143,7 +132,7 @@
   mounted () {
     this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
     this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    this.onSubmit()
+    // this.onSubmit()
     // this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
   },
   updated () {
@@ -346,7 +335,8 @@
         },
         grid: { // 缃戞牸
           top: '20%',
-          left: '5%'
+          left: '6%',
+          bottom: '15%'
           // containLabel: true
         },
         legend: { // 鍥句緥
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
index 90d24e1..241625a 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
@@ -1,59 +1,52 @@
 <template>
-<!--  <el-table :data="tableData" style="width:730px" height="200px">-->
-<!--    <el-table-column v-for="(item, index) in tableLabel" :key="index" :prop="item.prop"-->
-<!--                     :label="item.label">-->
-<!--       <el-table-column v-for="(item1, index1) in item.label" :key="index1" :prop="item1.prop" :label="item1.label">-->
-<!--      </el-table-column>-->
-<!--    </el-table-column>-->
-<!--  </el-table>-->
   <el-table
       :data="tableData"
       style="width: 100%;height: 100%">
     <el-table-column
-        prop="tableData.LabMonTime"
+        prop="LabMonTime"
         label="妫�娴嬫椂闂�">
     </el-table-column>
     <el-table-column
         label="姘哀鍖栫墿">
       <el-table-column
-          prop="tableData.MonItemId"
+          prop="NOMonTime"
           label="鐩戞祴鍊�">
       </el-table-column>
       <el-table-column
-          prop="tableData.LabMonTime"
+          prop="NOEndTime"
           label="鏍囧噯鍊�">
       </el-table-column>
     </el-table-column>
     <el-table-column
         label="浜屾哀鍖栫~">
       <el-table-column
-          prop="tableData.MonItemId"
+          prop="SOMontime"
           label="鐩戞祴鍊�">
       </el-table-column>
       <el-table-column
-          prop="tableData.LabMonTime"
+          prop="SoEndTime"
           label="鏍囧噯鍊�">
       </el-table-column>
     </el-table-column>
     <el-table-column
         label="鐑熷皹">
       <el-table-column
-          prop="tableData.MonItemId"
+          prop="MonItemId"
           label="鐩戞祴鍊�">
       </el-table-column>
       <el-table-column
-          prop="tableData.LabMonTime"
+          prop="EndMonTime"
           label="鏍囧噯鍊�">
       </el-table-column>
     </el-table-column>
     <el-table-column
-        label="榛戝害">
+        label="闈炵敳鐑锋�荤儍">
       <el-table-column
-          prop="tableData.MonItemId"
+          prop="MonItemId"
           label="鐩戞祴鍊�">
       </el-table-column>
       <el-table-column
-          prop="tableData.LabMonTime"
+          prop="MonItemId"
           label="鏍囧噯鍊�">
       </el-table-column>
     </el-table-column>
@@ -65,71 +58,28 @@
   name: 'EChartsTable',
   data () {
     return {
-      // tableLabel: [
-      //   {
-      //     label: '妫�娴嬫椂闂�',
-      //     prop: 'StoragePlaceId'
-      //   },
-      //   {
-      //     label: '浜屾哀鍖栫~',
-      //     prop: [
-      //       {
-      //         label: '鐩戞祴鍊�',
-      //         NOMonitor: ''
-      //       },
-      //       {
-      //         label: '鏍囧噯鍊�',
-      //         NOtandard: ''
-      //       }]
-      //   },
-      //   {
-      //     label: '姘哀鍖栫墿',
-      //     prop: [
-      //       {
-      //         label: '鐩戞祴鍊�',
-      //         NOMonitor: ''
-      //       },
-      //       {
-      //         label: '鏍囧噯鍊�',
-      //         NOtandard: ''
-      //       }]
-      //   },
-      //   {
-      //     label: '鐑熷皹',
-      //     prop: [
-      //       {
-      //         label: '鐩戞祴鍊�',
-      //         NOMonitor: ''
-      //       },
-      //       {
-      //         label: '鏍囧噯鍊�',
-      //         NOtandard: ''
-      //       }]
-      //   },
-      //   {
-      //     label: '榛戝害',
-      //     prop: [
-      //       {
-      //         label: '鐩戞祴鍊�',
-      //         NOMonitor: ''
-      //       },
-      //       {
-      //         label: '鏍囧噯鍊�',
-      //         NOtandard: ''
-      //       }]
-      //   }
-      // ],
-      tableData: ''
+      tableData: [{
+        LabMonTime: '2021-02-05 09:54',
+        MonItemId: '---',
+        EndMonTime: '30',
+        NOMonTime: '44',
+        NOEndTime: '100',
+        SOMontime: '9',
+        SoEndTime: '50'
+      }, {
+        LabMonTime: '2021-01-14 10:15',
+        MonItemId: '---',
+        EndMonTime: '30',
+        NOMonTime: '70',
+        NOEndTime: '100',
+        SOMontime: '---',
+        SoEndTime: '50'
+      }]
     }
   },
   created () {
-    this.$nextTick(() => {
-      // this.$attrs.ManualData.forEach(item => {
-      this.tableData = [...this.$attrs.ManualData]
-      // })
-      // this.tableData.LabMonTime = 100
-      console.log(this.tableData)
-    })
+    // this.tableData = [...this.$attrs.ManualData]
+    // console.log(this.tableData)
   }
 }
 
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 7cf33e4..b5c38fb 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -68,7 +68,13 @@
         id: 'mychart_ss ',
         title: '鐑熷皹',
         legend: [
-          { name: '姘哀鍖栫墿', icon: 'image://../assets/imgs/legend/NOX.png', textStyle: { color: '#ccc' }, itemWidth: 20, itemHeight: 5 },
+          {
+            name: '姘哀鍖栫墿',
+            icon: 'image://../assets/imgs/legend/NOX.png',
+            textStyle: { color: '#ccc' },
+            itemWidth: 20,
+            itemHeight: 5
+          },
           {
             icon: 'image://../assets/imgs/legend/SO2.png',
             itemHeight: 5,
@@ -96,136 +102,495 @@
         ydatas: [
           {
             name: '姘哀鍖栫墿',
-            data: [{ name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 39.51431] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 38.76508] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.57471] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.3796] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.10718] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.81126] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.9184] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.08839] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.3718] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.8966] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.3998] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.11937] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.12424] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.99567] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.48063] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.62222] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.84583] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.80923] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.93465] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.78891] },
-              { name: '姘哀鍖栫墿', value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.54268] }],
+            data: [{
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 39.51431]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 38.76508]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.57471]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.3796]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.10718]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.81126]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.9184]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.08839]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.3718]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.8966]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.3998]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 37.11937]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 36.12424]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.99567]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.48063]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.62222]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 34.84583]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.80923]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.93465]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.78891]
+            },
+            {
+              name: '姘哀鍖栫墿',
+              value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 35.54268]
+            }],
             zdcbcolor: 'red',
             zxcolor: '#00B0F0',
             bzz: 50
           },
           {
             name: '浜屾哀鍖栫~',
-            data: [{ name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.112573] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.578955] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.869465] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.270735] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.355475] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.242907] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.230558] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.262951] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.268744] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.159671] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.955352] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.110546] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.235723] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.443502] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.708939] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.882327] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 6.017494] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.410021] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.379694] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.551433] },
-              { name: '浜屾哀鍖栫~', value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.819743] }],
+            data: [{
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.112573]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.578955]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.869465]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.270735]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.355475]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.242907]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.230558]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.262951]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.268744]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.159671]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.955352]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.110546]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.235723]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.443502]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.708939]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.882327]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 6.017494]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.410021]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.379694]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.551433]
+            },
+            {
+              name: '浜屾哀鍖栫~',
+              value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.819743]
+            }],
             zdcbcolor: 'red',
             zxcolor: '#fff21c',
             bzz: 50
           },
           {
             name: '搴熸皵娴侀噺',
-            data: [{ name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.012617] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.992213] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.026886] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.052861] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.038826] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.062339] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.071915] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.053693] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.03562] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.043983] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.059231] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.042176] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.028253] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.024891] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.01542] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.025787] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.038269] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.01441] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.010105] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.012341] },
-              { name: '搴熸皵娴侀噺', value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.996146] }],
+            data: [{
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.012617]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.992213]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.026886]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.052861]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.038826]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.062339]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.071915]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.053693]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.03562]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.043983]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.059231]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.042176]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.028253]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.024891]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.01542]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.025787]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.038269]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.01441]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.010105]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 5.012341]
+            },
+            {
+              name: '搴熸皵娴侀噺',
+              value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 4.996146]
+            }],
             zdcbcolor: 'red',
             zxcolor: '#9ACD32',
             bzz: null
           },
           {
             name: '鐑熷皹',
-            data: [{ name: '鐑熷皹', value: [['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8297127]] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8347292] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9218481] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.913429] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9026684] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8060119] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.781314] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8958074] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9093901] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8743498] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9024854] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9456897] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9747347] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9200308] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8987293] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8613345] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8747463] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8883187] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.881333] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9142911] },
-              { name: '鐑熷皹', value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9569058] }],
+            data: [{
+              name: '鐑熷皹',
+              value: [['Tue Apr 13 2021 09:18:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8297127]]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:18:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8347292]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:18:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9218481]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:19:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.913429]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:19:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9026684]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:19:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8060119]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:19:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.781314]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:20:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8958074]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:20:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9093901]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:20:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8743498]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:20:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9024854]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:21:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9456897]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:21:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9747347]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:21:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9200308]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:21:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8987293]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:22:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8613345]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:22:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8747463]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:22:34 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.8883187]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:22:49 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.881333]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:23:04 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9142911]
+            },
+            {
+              name: '鐑熷皹',
+              value: ['Tue Apr 13 2021 09:23:19 GMT+0800 (涓浗鏍囧噯鏃堕棿)', 0.9569058]
+            }],
             zdcbcolor: 'red',
             zxcolor: '#f48183',
             bzz: 10
           }],
         yname: ' 娴撳害(mg/m鲁)'
-      }
+      },
+      JSONTimeData: {
+        id: 21,
+        unionTagCodeList: ['TJIP45.rl3AT25035', 'TJIP45.rl3AT25033', 'TJIP45.rl3FT35032', 'TJIP45.rl3AT25034']
+        // BBZMAPPING: {
+        //   姘哀鍖栫墿: 50,
+        //   浜屾哀鍖栫~: 50,
+        //   搴熸皵娴侀噺: null,
+        //   鐑熷皹: 10
+        // }
+      },
+      res: [{ UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 36.02153, ReadTime: '2021/04/14 03:59:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 35.7473, ReadTime: '2021/04/14 03:59:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 35.56014, ReadTime: '2021/04/14 04:00:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 35.59335, ReadTime: '2021/04/14 04:00:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 34.49617, ReadTime: '2021/04/14 04:00:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 34.33835, ReadTime: '2021/04/14 04:00:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 34.93116, ReadTime: '2021/04/14 04:01:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 35.831, ReadTime: '2021/04/14 04:01:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 36.67476, ReadTime: '2021/04/14 04:01:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 38.04687, ReadTime: '2021/04/14 04:01:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 37.78848, ReadTime: '2021/04/14 04:02:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 38.03456, ReadTime: '2021/04/14 04:02:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 37.81089, ReadTime: '2021/04/14 04:02:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 39.28693, ReadTime: '2021/04/14 04:02:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 39.79956, ReadTime: '2021/04/14 04:03:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 40.11547, ReadTime: '2021/04/14 04:03:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 40.72007, ReadTime: '2021/04/14 04:03:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 43.11903, ReadTime: '2021/04/14 04:03:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 44.28426, ReadTime: '2021/04/14 04:04:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 45.07601, ReadTime: '2021/04/14 04:04:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25035', TagValue: 43.81406, ReadTime: '2021/04/14 04:04:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.312585, ReadTime: '2021/04/14 03:59:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.507234, ReadTime: '2021/04/14 03:59:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.383248, ReadTime: '2021/04/14 04:00:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.385284, ReadTime: '2021/04/14 04:00:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.719143, ReadTime: '2021/04/14 04:00:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.730373, ReadTime: '2021/04/14 04:00:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.602137, ReadTime: '2021/04/14 04:01:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.459584, ReadTime: '2021/04/14 04:01:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.313675, ReadTime: '2021/04/14 04:01:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.305554, ReadTime: '2021/04/14 04:01:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.911544, ReadTime: '2021/04/14 04:02:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.744454, ReadTime: '2021/04/14 04:02:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.267665, ReadTime: '2021/04/14 04:02:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.606314, ReadTime: '2021/04/14 04:02:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.599967, ReadTime: '2021/04/14 04:03:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 1.939136, ReadTime: '2021/04/14 04:03:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.03244, ReadTime: '2021/04/14 04:03:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.183742, ReadTime: '2021/04/14 04:03:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.323384, ReadTime: '2021/04/14 04:04:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.403428, ReadTime: '2021/04/14 04:04:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25033', TagValue: 2.347282, ReadTime: '2021/04/14 04:04:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.018858, ReadTime: '2021/04/14 03:59:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.020605, ReadTime: '2021/04/14 03:59:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.047671, ReadTime: '2021/04/14 04:00:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.020306, ReadTime: '2021/04/14 04:00:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.054744, ReadTime: '2021/04/14 04:00:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.027292, ReadTime: '2021/04/14 04:00:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.026794, ReadTime: '2021/04/14 04:01:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.03381, ReadTime: '2021/04/14 04:01:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.041131, ReadTime: '2021/04/14 04:01:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.02754, ReadTime: '2021/04/14 04:01:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 4.998859, ReadTime: '2021/04/14 04:02:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.014368, ReadTime: '2021/04/14 04:02:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.019042, ReadTime: '2021/04/14 04:02:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.046045, ReadTime: '2021/04/14 04:02:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.024141, ReadTime: '2021/04/14 04:03:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.016951, ReadTime: '2021/04/14 04:03:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.01229, ReadTime: '2021/04/14 04:03:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.00666, ReadTime: '2021/04/14 04:03:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 5.005168, ReadTime: '2021/04/14 04:04:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 4.99309, ReadTime: '2021/04/14 04:04:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3FT35032', TagValue: 4.983859, ReadTime: '2021/04/14 04:04:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.128864, ReadTime: '2021/04/14 03:59:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.096089, ReadTime: '2021/04/14 03:59:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.13711, ReadTime: '2021/04/14 04:00:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.191255, ReadTime: '2021/04/14 04:00:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.159299, ReadTime: '2021/04/14 04:00:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.089755, ReadTime: '2021/04/14 04:00:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.098142, ReadTime: '2021/04/14 04:01:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.084317, ReadTime: '2021/04/14 04:01:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.040828, ReadTime: '2021/04/14 04:01:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.066903, ReadTime: '2021/04/14 04:01:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.12027, ReadTime: '2021/04/14 04:02:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.075927, ReadTime: '2021/04/14 04:02:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.062984, ReadTime: '2021/04/14 04:02:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.190477, ReadTime: '2021/04/14 04:02:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.192902, ReadTime: '2021/04/14 04:03:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.061741, ReadTime: '2021/04/14 04:03:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 0.991724, ReadTime: '2021/04/14 04:03:30', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.006655, ReadTime: '2021/04/14 04:03:45', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.044971, ReadTime: '2021/04/14 04:04:00', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.077099, ReadTime: '2021/04/14 04:04:15', ErrorMessage: null },
+        { UnionTagCode: 'TJIP45.rl3AT25034', TagValue: 1.131417, ReadTime: '2021/04/14 04:04:30', ErrorMessage: null }],
+      startTime: '',
+      endTime: '',
+      step: ''
     }
   },
   mounted () {
     this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
     this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
     this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+    // this.IntervalEXHRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.JSONTimeData.BBZMAPPING)
   },
   methods: {
-    // EndTime () {
-    //   var myDate = new Date()
-    //   var mytime = myDate.toLocaleTimeString() // 鑾峰彇褰撳墠鏃堕棿
-    //   console.log(mytime)
-    // },
-    // handleshowcomplaint(row) {
-    //   this.temp.complaint_consultationtime = new Date()
-    // },
     onSubmit () {
       this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
     },
-    // formatter (value, index) {
-    //   return parseFloat(value).toFixed(2)
+    /**
+     * RTDB 鏍煎紡杞崲
+     * @param res
+     * @returns {[]}
+     */
+    // getRtdbFormat (res) {
+    //   var data = res.collection.items
+    //   var dataArray = []
+    //   for (var i = 0; i < data.length; i++) {
+    //     var dataFormat = {
+    //       UnionTagCode: data[i].data[0].value,
+    //       TagValue: parseFloat(data[i].data[1].value),
+    //       ReadTime: data[i].data[3].value,
+    //       ErrorMessage: data[i].data[5].value
+    //     }
+    //     dataArray.push(dataFormat)
+    //   }
+    //   return dataArray
     // },
+    // 1.鍧愭爣杞村疄鐜�,鐢诲疄鏃舵暟鎹�
     DrawEXHRealTimeDateChart (id, title, legend, ydatas, yname) {
       this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
       // this.myChart.clear()
@@ -463,6 +828,7 @@
         }],
         series: serLists
       }
+      console.log(option)
       this.RealTimeChart.setOption(option)
 
       // this.RealTimeChart.on('legendselectchanged', function (params) {
@@ -488,6 +854,155 @@
       // RealTimeChart.on('click', function (params) {
       //   var nowDate = new Date().Format()
       // })
+    },
+    getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
+      if (this.res.length > 0) {
+        // 澶勭悊鏁版嵁寮�濮�
+        var d = res
+        var nameList = [] // 瀛樻斁鍥句緥
+
+        var data // 鏁版嵁绫诲瀷// var data={name:'',value:[now1.getFullYear(), now1.getMonth() + 1, now1.getDate().join('/'),value]}
+        var datalist // 瀛樻斁data鐨勬暟缁�
+        // var bzh = []
+        for (var i = 0; i < d.length; i++) {
+          if (d[i].ErrorMessage != null) {
+            continue
+          }
+          // var name = CFG.DATA_REALTIME_TAGCODETABLE[d[i].UnionTagCode].TagName
+
+          if (nameList.length === 0) {
+            nameList.push(name)
+
+            var newdate = new Date(this.res.ReadTime)
+            data = {
+              name: name,
+              value: [newdate, this.res.TagValue]
+            }
+
+            datalist = {
+              name: name,
+              data: [data]
+            }
+
+            this.EXHRealTimeDataList.push(datalist)
+          } else if (nameList.indexOf(name) < 0) {
+            nameList.push(name)
+
+            // var newdate = new Date(d[i].ReadTime)
+
+            data = {
+              name: name,
+              value: [newdate, d[i].TagValue]
+            }
+            datalist = {
+              name: name,
+              data: [data]
+            }
+            this.EXHRealTimeDataList.push(datalist)
+          } else if (i === d.length - 1) {
+            if (nameList.indexOf(name) < 0) {
+              nameList.push(name)
+
+              // var newdate = new Date(d[i].ReadTime)
+
+              data = {
+                name: name,
+                value: [newdate, d[i].TagValue]
+              }
+              datalist = {
+                name: name,
+                data: [data]
+              }
+              // EXHRealTimeDataList.push(datalist)
+            } else {
+              // var newdate = new Date(d[i].ReadTime)
+              data = {
+                name: name,
+                value: [newdate, d[i].TagValue]
+              }
+              for (var k = 0; k < this.EXHRealTimeDataList.length; k++) {
+                if (this.EXHRealTimeDataList[k].name === name) {
+                  this.EXHRealTimeDataList[k].data.push(data)
+                }
+              }
+            }
+          } else {
+            const newdate = new Date(d[i].ReadTime)
+            data = {
+              name: name,
+              value: [newdate, d[i].TagValue]
+            }
+            for (let k = 0; k < this.EXHRealTimeDataList.length; k++) {
+              if (this.EXHRealTimeDataList[k].name === name) {
+                this.EXHRealTimeDataList[k].data.push(data)
+              }
+            }
+          }
+        }
+
+        // var divid = 'mychart_ss'
+        // var title = name
+        var lengList = []
+        var objTemp
+
+        for (var l = 0; l < nameList.length; l++) {
+          var obj
+          var iconurl
+          if (nameList[l] === '浜屾哀鍖栫~') {
+            iconurl = 'image://../assets/imgs/legend/SO2.png'
+          } else if (nameList[l] === '姘哀鍖栫墿') {
+            iconurl = 'image://../assets/imgs/legend/NOX.png'
+          } else if (nameList[l] === '鐑熷皹') {
+            iconurl = 'image://../assets/imgs/legend/YanChen.png'
+          } else if (nameList[l] === '闈炵敳鐑锋�荤儍') {
+            iconurl = 'image://../assets/imgs/legend/grn.png'
+          } else if (nameList[l] === '娓╁害') {
+            iconurl = 'image://../assets/imgs/legend/WenDu.png'
+          } else {
+            iconurl = 'image://../assets/imgs/legend/VOCs.png'
+          }
+
+          if (nameList[l] === '搴熸皵' || nameList[l] === '搴熸皵娴侀噺') { // 灏嗗簾姘旀祦閲忔帓鍒版暟缁勬渶鍚�
+            objTemp = {
+              name: nameList[l],
+              icon: iconurl,
+              textStyle: {
+                color: '#ccc'
+              },
+              itemWidth: 20,
+              itemHeight: 5
+            }
+          } else {
+            obj = {
+              name: nameList[l],
+              icon: iconurl,
+              textStyle: {
+                color: '#ccc'
+              },
+              itemWidth: 20,
+              itemHeight: 5
+            }
+            lengList.push(obj)
+          }
+        }
+        lengList.push(objTemp)
+
+        this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+      }
+    },
+    // 閽╁瓙璋冪敤瀹炴椂
+    IntervalEXHRealTimeDate (id, unionTagCodeList, BBZMAPPING) {
+      // 瀹氭椂鍣ㄥ嚱鏁�
+      this.interValHander = setInterval(function () {
+        // $('.RealTime').empty()
+        this.startTime = dayjs().subtract(5, 'minute').format('YYYY-MM-DD HH:mm:ss')
+        this.endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+        this.step = '15'
+        // this.getRtdb15s(this.unionTagCodeList, this.startTime, this.endTime, this.step, this.res)
+        // PreQueryTime=endTime;
+        this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+        this.IntervalEXHRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.BBZMAPPING)
+      }, 15000)
     }
   }
 }

--
Gitblit v1.8.0