From faadb3a39e89b2cb7a00e81e3778f480f1f09998 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 14 四月 2021 17:38:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/WasteWater.js | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index d8abe79..5b510ae 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' // 姝ｅ父
+const NormalImg = '/assets/images/map/wastewater/fs_bright_green.png' // 姝ｅ父
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
}
@@ -62,21 +64,22 @@
endTime: '2020-04-07 15:13:20',
dataType: '2'
}
- // const dateValue = {
- // onLineMonEmissPointId: '23',
- // monItemId: '28,31',
- // beginTime: '2020-04-06 15:13:20',
- // endTime: '2020-04-07',
- // dataType: '1'
- // }
+ const dateValue = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06',
+ endTime: '2020-04-07',
+ dataType: '1'
+ }
const hourData = await mapApi.getQueryOnlineMonData(hourValue)
- // const dateData = await mapApi.getQueryOnlineMonData(dateValue)
+ const dateData = await mapApi.getQueryOnlineMonData(dateValue)
+ // console.log(dateData)
// const drawback = await mapApi.getWasteWaterMonitoring()
// console.log(drawback)
const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, 'feishui')
+ instance.setWaterData(e.layer.options.test, result.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