From 270f4c72b8566400fe29f78099f5e206908ef501 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 15:52:32 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteWater.js | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index d8abe79..af239fe 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -62,21 +62,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