From b765df07d1b732dad563712a49d0c0d810d940c9 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期一, 19 四月 2021 18:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/WasteSolid.js | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index cd3d48a..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'
@@ -11,7 +11,7 @@
// 浣跨敤灏佽鏂规硶
const AnimalService = require('../service/AnimalService').default
-const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
module.exports = function () {
/**
@@ -34,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({
@@ -43,6 +44,9 @@
iconAnchor: [15, 15]
})
})
+ // console.log(L.icon)
+ // console.log(iconUrl)
+ // console.log(marker)
layer.addLayer(marker)
}
}
@@ -72,26 +76,37 @@
// 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
this.requestSolidWasteData = async (e) => {
// 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
- const dataValue = {
- StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
- }
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
+ // }
// console.log(e.layer.options.totransferData.Name)
// 寮规鏍囬
const title = e.layer.options.totransferData.Name
// 鍩烘湰淇℃伅 tabs
- const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
+ // const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
// 璇︾粏淇℃伅灞曠ず table
- const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
+ // const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
- // 缁戝畾寮规瀹炰緥
- const PublicBounced = window.Vue.extend(publicBounced)
- const instance = new PublicBounced().$mount()
- document.body.appendChild(instance.$el)
- // document.body.removeChild(instance.$el)
- // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
- instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
+ // // 缁戝畾寮规瀹炰緥
+ // const PublicBounced = window.Vue.extend(publicBounced)
+ // const instance = new PublicBounced().$mount()
+ // document.body.appendChild(instance.$el)
+ // // document.body.removeChild(instance.$el)
+ // // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
+ // instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
this.setPanTo(e.latlng, 300)
+ window.$layer.open({
+ content: {
+ content: WasteSolidIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ info: this.info,
+ storagePlaceId: e.layer.options.totransferData.StoragePlaceId
+ }
+ },
+ title: title // 鏍囬
+ })
}
// flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
--
Gitblit v1.8.0