From d0391dba3708d3f32bcd94e1881d1b598a0d9ef0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 15 四月 2021 17:21:10 +0800
Subject: [PATCH] 修改图表问题

---
 src/components/LayerController/logic/WasteWater.js |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 2ae5507..2ed9ee0 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -6,10 +6,10 @@
 // 寮圭獥鏁版嵁寮曡繘
 const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
 
-const NormalImg = '/assets/images/map/wastewater/fs_green.png' // 姝e父
+const NormalImg = '/assets/images/map/wastewater/fs_bright_green.png' // 姝e父
 const OffImg = '/assets/images/map/wastewater/fs_gray.png' // 鍋滆繍
 const AbnormalImg = '/assets/images/map/wastewater/fs_blue.png' // 寮傚父
-const MissImg = '/assets/images/map/wastewater/fs_yellow.png' // 缂哄け
+const MissImg = '/assets/images/map/wastewater/fs_bright_green.png' // 缂哄け
 const AlarmImg = '/assets/images/map/wastewater/fs_red.png' // 鎶ヨ闂儊
 const WarnImg = '/assets/images/map/wastewater/fs_orange.png' // 棰勮闂儊
 
@@ -45,6 +45,8 @@
     }
   }
 
+  // 鍒嗗壊绾�-------------------------------------------------------------------------------
+  // this.
   this.bindTooltip = (layer) => {
     return layer.options.test.Name
   }
@@ -55,12 +57,27 @@
     const dataValue = {
       StoragePlaceId: e.layer.options.test.StoragePlaceId
     }
-    const drawback = await mapApi.getWasteWaterMonitoring()
-    console.log(drawback)
-    const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
+    const hourValue = {
+      onLineMonEmissPointId: '23',
+      monItemId: '28,31',
+      beginTime: '2020-04-06 15:13:20',
+      endTime: '2020-04-07 15:13:20',
+      dataType: '2'
+    }
+    const dateValue = {
+      onLineMonEmissPointId: '23',
+      monItemId: '28,31',
+      beginTime: '2020-04-06',
+      endTime: '2020-04-07',
+      dataType: '1'
+    }
+    const detailData = await mapApi.getWasteWaterMonitoringDetails(dataValue) // 鏄庣粏琛ㄨ繑鍥炴暟鎹�
+    const hourData = await mapApi.getQueryOnlineMonData(hourValue) // 灏忔椂鏁版嵁
+    const dateData = await mapApi.getQueryOnlineMonData(dateValue) // 鏃ユ暟鎹�
+    // const drawback = await mapApi.getWasteWaterMonitoring()
     const PublicBounced = window.Vue.extend(publicBounced)
     const instance = new PublicBounced()
-    instance.setWaterData(e.layer.options.test, result.Result.DataInfo, drawback.Result.DataInfo, 'feishui')
+    instance.setWaterData(e.layer.options.test, detailData.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
     // console.log(e.layer.options.test)
     instance.$mount()
     document.body.appendChild(instance.$el)

--
Gitblit v1.8.0