From a089095b088f14101d5ab4b9fe1d05098f576493 Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期三, 12 五月 2021 17:54:39 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 9 +--------
src/components/LayerController/service/AnimalService.js | 13 +++++++++++++
src/components/LayerController/logic/WasteWater.js | 10 +---------
src/components/LayerController/logic/WasteSolid.js | 11 +----------
4 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 7d57975..2fe606c 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -74,7 +74,7 @@
},
title: title // 鏍囬
})
- this.setPanTo(e.latlng, 150)
+ this.animalService.setPanTo(e.latlng, 150)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
@@ -91,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)
}
}
diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index ec726a0..28b0938 100644
--- a/src/components/LayerController/logic/WasteSolid.js
+++ b/src/components/LayerController/logic/WasteSolid.js
@@ -66,7 +66,7 @@
title: title // 鏍囬
})
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
- this.setPanTo(e.latlng, 300)
+ this.animalService.setPanTo(e.latlng, 300)
}
// 涓嶅悓绫诲瀷鍥剧墖灏佽
@@ -78,14 +78,5 @@
effectOfChange = setting
}
return effectOfChange
- }
-
- // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
- this.setPanTo = (pos, value) => {
- var position = pos
- position = window.map.latLngToLayerPoint(position)
- position.y += value
- position = window.map.layerPointToLatLng(position)
- window.map.flyTo(position)
}
}
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 9d10a57..3d9587e 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -70,7 +70,7 @@
},
title: title // 鏍囬
})
- this.setPanTo(e.latlng, 150)
+ this.animalService.setPanTo(e.latlng, 150)
}
this.requestWasteWaterData = async (e) => {
// 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
@@ -132,13 +132,5 @@
break
}
return testChange
- }
- // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
- this.setPanTo = (pos, value) => {
- var position = pos
- position = window.map.latLngToLayerPoint(position)
- position.y += value
- position = window.map.layerPointToLatLng(position)
- window.map.flyTo(position)
}
}
diff --git a/src/components/LayerController/service/AnimalService.js b/src/components/LayerController/service/AnimalService.js
index 687b6e7..3de6468 100644
--- a/src/components/LayerController/service/AnimalService.js
+++ b/src/components/LayerController/service/AnimalService.js
@@ -33,6 +33,19 @@
}
}, 1000)
}
+
+ /**
+ * 璁剧疆寮圭獥骞崇Щ浣嶇疆
+ * @param pos
+ * @param value
+ */
+ setPanTo = (pos, value) => {
+ var position = pos
+ position = this.layer.latLngToLayerPoint(position)
+ position.y += value
+ position = this.layer.layerPointToLatLng(position)
+ this.layer.flyTo(position)
+ }
}
export default AnimalService
--
Gitblit v1.8.0