From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/Company.js | 43 +++++++++++++++++--------------------------
1 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 8c4bd07..d6b7ea2 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -1,6 +1,7 @@
/**
- * 鍥哄簾
+ * 浼佷笟
*/
+
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
const companyImg = '/assets/images/map/company_refining.png'
const companyOil = '/assets/images/map/company_oil.png'
@@ -14,7 +15,6 @@
* @param L leaflet瀵硅薄
*/
this.init = async (layer, L) => {
- // const SolidWasteIcon = this.SolidWasteIcon()
this.animalService = new AnimalService({
L: L,
layer: layer
@@ -39,23 +39,10 @@
className: 'company-bindTooltip',
iconSize: 16
})
-
const marker = L.marker([positionX, positionY], {
- /* icon: L.icon({
- iconUrl: iconUrl,
- iconSize: [30, 30],
- iconAnchor: [15, 15]
- }), */
icon: myIcon,
test: data[i]
})
- /* const htmls = '<ul><li>' + data[i].name + '</li></ul>'
- marker.bindTooltip(htmls, {
- permanent: true,
- offset: [0, 5],
- direction: 'bottom',
- className: 'company-bindTooltip'
- }) */
layer.addLayer(marker)
}
}
@@ -63,23 +50,27 @@
* 鐐逛綅榧犳爣绉诲叆寮规
* */
this.bindTooltip = (layer) => {
- // console.log(layer)
+ // console.log(layer)
return '<div class="company-bindTooltip-hover"><h3>姹℃煋鐗╀骇鐢熺粺璁�</h3><ul>' +
- '<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
- '<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
- '</ul></div>'// layer.options.test.name
+ '<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
+ '<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
+ '</ul></div>'// layer.options.test.name
}
/*
* 鐐逛綅鐐瑰嚮浜嬩欢
*
* */
this.clickListener = (e) => {
- // this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.name
- }
- debugger
- console.log(dataValue)
- // return this.PublicBounced.$el
+ // console.log(e)
+ window.map.setView(e.latlng, 15)
+ // if (window.map.getZoom() >= 10) {
+ // window.map.removeLayer(e.layer)
+ // e.layer.remove()
+ // } else if (window.map.getZoom() < 10) {
+ // window.map.addLayer(e.layer)
+ // }
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.test.name
+ // }
}
}
--
Gitblit v1.8.0