From 4f210560973162685449e99ece819a1aad190db1 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期二, 20 四月 2021 14:12:16 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/Company.js | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 82490b9..f88c2e9 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -9,9 +9,9 @@
module.exports = function () {
/**
- * 杩斿洖marker瀵硅薄鏁扮粍
- * @param L leaflet瀵硅薄
- */
+ * 杩斿洖marker瀵硅薄鏁扮粍
+ * @param L leaflet瀵硅薄
+ */
this.init = async (layer, L) => {
// const SolidWasteIcon = this.SolidWasteIcon()
this.animalService = new AnimalService({
@@ -19,7 +19,7 @@
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])
@@ -28,21 +28,29 @@
const positionY = data[i].Longitude
var iconUrl = companyImg
+ const htmls = '<div><img src="' + iconUrl + '"><ul><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li></ul></div>'
+ var myIcon = L.divIcon({
+ html: htmls,
+ className: 'company-bindTooltip',
+ iconSize: 16
+ })
+
const marker = L.marker([positionX, positionY], {
- icon: L.icon({
+ /* icon: L.icon({
iconUrl: iconUrl,
iconSize: [30, 30],
iconAnchor: [15, 15]
- }),
+ }), */
+ icon: myIcon,
test: data[i]
})
- const htmls = '<ul><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li></ul>'
+ /* 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)
}
}
--
Gitblit v1.8.0