From 0a0080a207a39e51a30a23a41c2054e842f36dae Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 06 四月 2021 18:21:27 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/Company.js | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index f4ff3f0..8fda8d0 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -19,9 +19,10 @@
layer: layer
})
const res = await mapApi.getCompany()
- console.log(res)
+ // console.log(res)
const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
+ // console.log(data[i])
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
const positionY = data[i].Longitude
@@ -32,28 +33,39 @@
iconUrl: iconUrl,
iconSize: [50, 50],
iconAnchor: [25, 25]
- })
+ }),
+ test: data[i]
})
-
+ marker.bindTooltip(data[i].name, {
+ permanent: true,
+ offset: [0, 14],
+ direction: 'bottom',
+ className: 'company-bindTooltip'
+ })
layer.addLayer(marker)
}
}
-
+ /*
+ * 鐐逛綅榧犳爣绉诲叆寮规
+ * */
this.bindTooltip = (layer) => {
console.log(layer)
- return '浼佷笟'
+ return '<div class="company-bindTooltip-hover"><h3>姹℃煋鐗╀骇鐢熺粺璁�</h3><ul>' +
+ '<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
+ '<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
+ '</ul></div>'// layer.options.test.name
}
-
- this.clickListener = (layer) => {
- /* this.animalService.pulseEffect(e.latlng)
- console.log(e)
- return this.PublicBounced.$el
- */
- console.log(layer)
+ /*
+ * 鐐逛綅鐐瑰嚮浜嬩欢
+ *
+ * */
+ this.clickListener = (e) => {
+ // this.animalService.pulseEffect(e.latlng)
+ const dataValue = {
+ StoragePlaceId: e.layer.options.test.name
+ }
+ debugger
+ console.log(dataValue)
+ // return this.PublicBounced.$el
}
-
- // 鍥哄簾鐐瑰嚮杩涜鐨� 鍐呭鐨勮缃�
- // SetSolidWasteContent (config, containerPopup) {
- // this.SolidWastePopup = containerPopup
- // }
}
--
Gitblit v1.8.0