From 4a80ef5544ff210d9e0aaa4cb1eaf3dba8c39645 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 11:14:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/WasteGas.js | 50 +++++++-------------------------------------------
1 files changed, 7 insertions(+), 43 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 60bf0ef..2fe606c 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -21,7 +21,10 @@
*/
this.init = async (layer, L) => {
// console.log(WasteGasChats)
- this.animalService = new AnimalService({ L: L, layer: layer })
+ this.animalService = new AnimalService({
+ L: L,
+ layer: layer
+ })
const res = await mapApi.getWasteGas()
// console.log(res)
const data = res.Result.DataInfo || {}
@@ -53,44 +56,14 @@
}
this.bindTooltip = (layer) => {
- return layer.options.test.Name
+ return '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.test.Name
}
this.clickListener = async (e) => {
- // console.log(e)
+ console.log(e)
this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.StoragePlaceId
- }
- // console.log(e.layer.options.test.EpsGisMonPointId)
const title = e.layer.options.test.Name
const res = e.layer.options.test
- console.log(res)
- // const GasOnlinedata = {
- // onLineMonEmissPointId: '23',
- // monItemId: '28,31',
- // beginTime: '2020-04-06 15:13:20',
- // endTime: '2020-04-07 15:13:20',
- // dataType: '1'
- // }
- // const GasManualData = {
- // companyId: '3900100145',
- // labMonPointId: '219',
- // beginTime: '2020-04-06 15:13:20',
- // endTime: ' 2020-04-07 15:13:20'
- // }
- // const ManualData = await mapApi.getWasteGasManualData(GasManualData)
- // console.log(ManualData)
- // 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)
- // const instance = new PublicBounced()
- // // console.log(e.layer.options.test)
- // instance.$mount()
- // document.body.appendChild(instance.$el)
- // instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
window.$layer.open({
content: {
content: WasteGasIndex, // 缁勪欢
@@ -101,9 +74,7 @@
},
title: title // 鏍囬
})
- // console.log(e.layer.options.totransferData.EpsGisMonPointId)
- this.setPanTo(e.latlng, 150)
- // console.log(e.latlng)
+ this.animalService.setPanTo(e.latlng, 150)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
@@ -120,12 +91,5 @@
// effectOfChange = ImgGray
// }
return effectOfChange
- }
- 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