From c2c35bfab620d688d3433ef8cd77f8f979fb5eea Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 10:00:06 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index e9f3aeb..7db2156 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -20,6 +20,7 @@
this.init = async (layer, L) => {
this.animalService = new AnimalService({ L: L, layer: layer })
const res = await mapApi.getWasteGas()
+ // console.log(res)
const data = res.Result.DataInfo || {}
// console.log(data)
for (let i = 0; i < data.length; i++) {
@@ -39,8 +40,8 @@
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [20, 35],
- iconAnchor: [10, 20]
+ iconSize: [30, 38],
+ iconAnchor: [15, 19]
})
})
layer.addLayer(marker)
@@ -58,6 +59,16 @@
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
+ // const GasOnlinedata = {
+ // onLineMonEmissPointId: 23,
+ // monItemId: 28,
+ // emissTypeld: 2,
+ // beginTime: 2020/0o4/0o6 15:13:20,
+ // endTime=2020/0o4/0o7;15:13:20,
+ // dataType:1
+ // }
+ // const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
+ // console.log(Mondata)
const result = await mapApi.getWasteGasDetails(dataValue)
// console.log(result.Result.DataInfo)
const PublicBounced = window.Vue.extend(publicBounced)
@@ -66,7 +77,7 @@
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
- this.setPanTo(e.latlng, 240)
+ this.setPanTo(e.latlng, 80)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
--
Gitblit v1.8.0