From 40397fab315de90285763467e4a1c70116202dad Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 19 四月 2021 20:07:59 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteWater.js | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 54 insertions(+), 35 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 2ed9ee0..2e1205e 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -1,10 +1,13 @@
/**
* 搴熸按
*/
+// import WasteWater from "../../table/components/WasteWater";
+
const AnimalService = require('../service/AnimalService').default
const mapApi = require('../../../api/mapApi').default
// 寮圭獥鏁版嵁寮曡繘
-const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+const WasteWaterIndex = require('@components/BaseNav/WasteWater/WasteWaterIndex').default
+// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
const NormalImg = '/assets/images/map/wastewater/fs_bright_green.png' // 姝ｅ父
const OffImg = '/assets/images/map/wastewater/fs_gray.png' // 鍋滆繍
@@ -34,11 +37,11 @@
const testValue = data[i].ContrLevel
const iconUrl = this.differentTypes(testValue)
const marker = L.marker([positionX, positionY], {
- test: data[i],
+ totransferData: data[i],
icon: L.icon({
iconUrl: iconUrl,
iconSize: [35, 35],
- iconAnchor: [18, 18]
+ iconAnchor: [15, 15]
})
})
layer.addLayer(marker)
@@ -46,42 +49,57 @@
}
// 鍒嗗壊绾�-------------------------------------------------------------------------------
- // this.
this.bindTooltip = (layer) => {
- return layer.options.test.Name
+ return layer.options.totransferData.Name
}
- this.clickListener = async (e) => {
- // console.log(e)
+ this.clickListener = (e) => {
+ // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.StoragePlaceId
- }
- 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, detailData.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
- // console.log(e.layer.options.test)
- instance.$mount()
- document.body.appendChild(instance.$el)
- this.setPanTo(e.latlng, 80)
+ /* 鐐瑰嚮鏁版嵁鐨勬帴鍙ｈ姹� */
+ this.requestWasteWaterData(e).then(e)
+ console.log()
+ }
+ this.requestWasteWaterData = async (e) => {
+ // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.test.StoragePlaceId
+ // }
+ // 寮规鏍囬
+ const title = e.layer.options.totransferData.Name
+ console.log(e.layer.options)
+ // 鍩烘湰淇℃伅 tabs
+ // const resultBasic = await mapApi.getWasteWater(dataValue)
+ // 鍥捐〃淇℃伅灞曠ず echarts
+ // 瀹炴椂鏁版嵁
+ // const resultReal = await mapApi.getDataItems(Value)
+ // 灏忔椂鏁版嵁 鍙� 鏄庣粏琛ㄦ暟鎹�
+ // const result = await mapApi.getQueryOnlineMonData(dataValue)
+ // 鏃ユ暟鎹� 鍙� 鏄庣粏琛ㄦ暟鎹�
+ // const result = await mapApi.getQueryOnlineMonData(dataValue)
+ // 浜哄伐鏁版嵁
+ // const resultEchart = await mapApi.getQueryLabMonData(dataValue)
+
+ // // 缁戝畾寮规瀹炰緥
+ // const PublicBounced = window.Vue.extend(publicBounced)
+ // const instance = new PublicBounced().$mount()
+ // document.body.appendChild(instance.$el)
+ // // document.body.removeChild(instance.$el)
+ // // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
+ // instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
+ /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
+ this.setPanTo(e.latlng, 150)
+ window.$layer.open({
+ content: {
+ content: WasteWaterIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ info: this.info
+ // storagePlaceId: e.layer.options.totransferData.StoragePlaceId
+ }
+ },
+ title: title // 鏍囬
+ })
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
@@ -115,6 +133,7 @@
}
return testChange
}
+ // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
this.setPanTo = (pos, value) => {
var position = pos
position = window.map.latLngToLayerPoint(position)
--
Gitblit v1.8.0