From 4df0471b7dff0494625ff09969b1a13b5359a26e Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期一, 31 五月 2021 22:41:47 +0800
Subject: [PATCH] 统计表弹框UI优化；增加点击企业名称缩放至企业；二级表展示功能优化。
---
src/components/LayerController/logic/Company.js | 66 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 82490b9..f970f34 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -1,19 +1,21 @@
/**
- * 鍥哄簾
+ * 浼佷笟
*/
+
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
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
+const $store = require('../../../store/index').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({
L: L,
layer: layer
@@ -21,27 +23,27 @@
const res = await mapApi.getCompany()
// console.log(res)
const data = res.Result.DataInfo || {}
+ $store.state.companyPoints = data
for (let i = 0; i < data.length; i++) {
// console.log(data[i])
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
const positionY = data[i].Longitude
-
var iconUrl = companyImg
- const marker = L.marker([positionX, positionY], {
- icon: L.icon({
- iconUrl: iconUrl,
- iconSize: [30, 30],
- iconAnchor: [15, 15]
- }),
- test: data[i]
+ 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 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, 5],
- direction: 'bottom',
- className: 'company-bindTooltip'
+ const marker = L.marker([positionX, positionY], {
+ icon: myIcon,
+ test: data[i]
})
layer.addLayer(marker)
}
@@ -50,23 +52,27 @@
* 鐐逛綅榧犳爣绉诲叆寮规
* */
this.bindTooltip = (layer) => {
- console.log(layer)
+ // console.log(layer)
return '<div class="company-bindTooltip-hover"><h3>姹℃煋鐗╀骇鐢熺粺璁�</h3><ul>' +
- '<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
- '<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
- '</ul></div>'// layer.options.test.name
+ '<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
+ '<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
+ '</ul></div>'// layer.options.test.name
}
/*
* 鐐逛綅鐐瑰嚮浜嬩欢
*
* */
this.clickListener = (e) => {
- // this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.name
- }
- debugger
- console.log(dataValue)
- // return this.PublicBounced.$el
+ // console.log(e)
+ window.map.setView(e.latlng, 15)
+ // if (window.map.getZoom() >= 10) {
+ // window.map.removeLayer(e.layer)
+ // e.layer.remove()
+ // } else if (window.map.getZoom() < 10) {
+ // window.map.addLayer(e.layer)
+ // }
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.test.name
+ // }
}
}
--
Gitblit v1.8.0