From 198a7bda22b84929a8e2b23ee7e0ad35da1c9f85 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 20 四月 2021 16:40:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/assets/css/map/map-panel-style.less | 8 ++++----
src/components/LayerController/logic/Company.js | 9 +++++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index f9ded23..0a4a136 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -268,16 +268,16 @@
/***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/
.company-bindTooltip {
position: absolute;
- top: 0;
- left: 0;
+ top: 10px;
+ left: 8px;
display: flex;
justify-content: center;
justify-items: center;
img {
display: block;
- width: 32px;
- height: 32px;
+ width: 35px;
+ height: 35px;
margin-left: -16px;
margin-top: -16px
}
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 8ae71eb..8c4bd07 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -3,6 +3,7 @@
*/
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓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
@@ -26,8 +27,12 @@
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
const positionY = data[i].Longitude
-
var iconUrl = companyImg
+ 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,
@@ -58,7 +63,7 @@
* 鐐逛綅榧犳爣绉诲叆寮规
* */
this.bindTooltip = (layer) => {
- console.log(layer)
+ // console.log(layer)
return '<div class="company-bindTooltip-hover"><h3>姹℃煋鐗╀骇鐢熺粺璁�</h3><ul>' +
'<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
'<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
--
Gitblit v1.8.0