From 653c004b4f44396cdb4dce04c17152c7563e37f8 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 09 四月 2021 11:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/Company.js | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index ae08aa5..6c68380 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -2,7 +2,7 @@
* 鍥哄簾
*/
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
-const companyImg = '/assets/images/map/company.png'
+const companyImg = '/assets/images/map/company_refining.png'
const mapApi = require('../../../api/mapApi').default
const AnimalService = require('../service/AnimalService').default
@@ -28,20 +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: [13, 5]
- }),
+ iconAnchor: [15, 15]
+ }), */
+ icon: myIcon,
test: data[i]
})
- marker.bindTooltip(data[i].name, {
+ /* const htmls = '<ul><li>' + data[i].name + '</li></ul>'
+ marker.bindTooltip(htmls, {
permanent: true,
- offset: [0, 14],
+ offset: [0, 5],
direction: 'bottom',
className: 'company-bindTooltip'
- })
+ }) */
layer.addLayer(marker)
}
}
--
Gitblit v1.8.0