From 44670fecb984ced41512446cdcd8a28a202a120f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 08 四月 2021 14:31:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/Company.js | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index a9a51c9..82490b9 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,33 +28,45 @@
const positionY = data[i].Longitude
var iconUrl = companyImg
- const marker = L.marker.magic([positionX, positionY], {
+ const marker = L.marker([positionX, positionY], {
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
}),
test: data[i]
})
- marker.bindTooltip(data[i].name, {
+ 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>'
+ marker.bindTooltip(htmls, {
permanent: true,
- offset: [0, -16],
- direction: 'top',
- className: ''
+ offset: [0, 5],
+ direction: 'bottom',
+ className: 'company-bindTooltip'
})
-
layer.addLayer(marker)
}
}
-
+ /*
+ * 鐐逛綅榧犳爣绉诲叆寮规
+ * */
this.bindTooltip = (layer) => {
- // console.log(layer)
- // return layer.options.test.name
+ console.log(layer)
+ return '<div class="company-bindTooltip-hover"><h3>姹℃煋鐗╀骇鐢熺粺璁�</h3><ul>' +
+ '<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
+ '<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
+ '</ul></div>'// layer.options.test.name
}
-
+ /*
+ * 鐐逛綅鐐瑰嚮浜嬩欢
+ *
+ * */
this.clickListener = (e) => {
// this.animalService.pulseEffect(e.latlng)
- console.log(e)
+ const dataValue = {
+ StoragePlaceId: e.layer.options.test.name
+ }
+ debugger
+ console.log(dataValue)
// return this.PublicBounced.$el
}
}
--
Gitblit v1.8.0