From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/Company.js | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 7ccce20..8c4bd07 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -2,16 +2,17 @@
* 鍥哄簾
*/
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
-const companyImg = '/assets/images/map/company.png'
+const companyImg = '/assets/images/map/company_refining.png'
+const companyOil = '/assets/images/map/company_oil.png'
const mapApi = require('../../../api/mapApi').default
const AnimalService = require('../service/AnimalService').default
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,35 +20,66 @@
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])
+ // console.log(data[i])
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
const positionY = data[i].Longitude
-
var iconUrl = companyImg
- const marker = L.marker.magic([positionX, positionY], {
- icon: L.icon({
- iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
- })
+ if (data[i].type) {
+ if (data[i].type === 2) {
+ iconUrl = companyOil
+ }
+ }
+ 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({
+ 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)
}
}
-
+ /*
+ * 鐐逛綅榧犳爣绉诲叆寮规
+ * */
this.bindTooltip = (layer) => {
- console.log(layer)
- return '浼佷笟'
+ // 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)
- return this.PublicBounced.$el
+ // this.animalService.pulseEffect(e.latlng)
+ const dataValue = {
+ StoragePlaceId: e.layer.options.test.name
+ }
+ debugger
+ console.log(dataValue)
+ // return this.PublicBounced.$el
}
}
--
Gitblit v1.8.0