From 38fea8139670d34cedea336fbd1ba34fc92bcf02 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 22 四月 2021 21:34:59 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/Company.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index f88c2e9..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
@@ -19,15 +20,19 @@
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])
// 缁忕含搴� 浣嶇疆
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