From 0bd34c441a3e2592500be5d3577d5c52d29e5416 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 09 四月 2021 09:44:07 +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, 16 insertions(+), 6 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 0be9e1a..2ae5507 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -33,12 +33,12 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
const testValue = data[i].ContrLevel
const iconUrl = this.differentTypes(testValue)
- const marker = L.marker.magic([positionX, positionY], {
+ const marker = L.marker([positionX, positionY], {
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [35, 35],
+ iconAnchor: [18, 18]
})
})
layer.addLayer(marker)
@@ -55,13 +55,16 @@
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
- const result = await mapApi.getWasteWater(dataValue)
- // console.log(result)
+ 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.setGasData(result, 'feishui')
+ instance.setWaterData(e.layer.options.test, result.Result.DataInfo, drawback.Result.DataInfo, 'feishui')
+ // console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
+ this.setPanTo(e.latlng, 80)
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
@@ -95,4 +98,11 @@
}
return testChange
}
+ this.setPanTo = (pos, value) => {
+ var position = pos
+ position = window.map.latLngToLayerPoint(position)
+ position.y += value
+ position = window.map.layerPointToLatLng(position)
+ window.map.flyTo(position)
+ }
}
--
Gitblit v1.8.0