From 022dea326d8ea2f68dee90a49e8103ad8f398cd1 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 17:18:55 +0800
Subject: [PATCH] 固废废水废气弹框问题修改
---
src/components/LayerController/logic/WasteSolid.js | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index 6ca9dea..3046b2d 100644
--- a/src/components/LayerController/logic/WasteSolid.js
+++ b/src/components/LayerController/logic/WasteSolid.js
@@ -1,7 +1,7 @@
/**
* 鍥哄簾
*/
-
+const WasteSolidIndex = require('@components/BaseNav/WasteSolid/WasteSolidIndex').default
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
const defaultImg = '/assets/images/map/solidwaste/voc.png'
const setting = '/assets/images/map/solidwaste/gf_green2.png'
@@ -12,7 +12,6 @@
const AnimalService = require('../service/AnimalService').default
// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
-const PublicVideo = require('../../BaseNav/PublicVideo').default
module.exports = function () {
/**
@@ -35,7 +34,8 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
const judgeValue = getSolidWasteData[i].StorageQty
var iconUrl = this.differentTypes(judgeValue)
-
+ // console.log(getSolidWasteData[i].Latitude, getSolidWasteData[i].Longitude)
+ // console.log(getSolidWasteData[i])
const marker = L.marker([positionX, positionY], {
totransferData: getSolidWasteData[i],
icon: L.icon({
@@ -44,6 +44,9 @@
iconAnchor: [15, 15]
})
})
+ // console.log(L.icon)
+ // console.log(iconUrl)
+ // console.log(marker)
layer.addLayer(marker)
}
}
@@ -95,7 +98,7 @@
this.setPanTo(e.latlng, 300)
window.$layer.open({
content: {
- content: PublicVideo, // 缁勪欢
+ content: WasteSolidIndex, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
info: this.info,
--
Gitblit v1.8.0