From fc9eeb9f8b2efba55acfb62a2cb1186ccf2fcad4 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 09 四月 2021 10:31:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteWater.js | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 2ae5507..d8abe79 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -55,12 +55,28 @@
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
- const drawback = await mapApi.getWasteWaterMonitoring()
- console.log(drawback)
+ 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 15:13:20',
+ // endTime: '2020-04-07',
+ // dataType: '1'
+ // }
+ const hourData = await mapApi.getQueryOnlineMonData(hourValue)
+ // const dateData = await mapApi.getQueryOnlineMonData(dateValue)
+ // 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, drawback.Result.DataInfo, 'feishui')
+ instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, 'feishui')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
--
Gitblit v1.8.0