From 93a9b3228d214602a899791992726a01925c5ac4 Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期四, 13 五月 2021 14:20:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteSolid.js | 67 ++++++++-------------------------
1 files changed, 16 insertions(+), 51 deletions(-)
diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index 6ca9dea..28b0938 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'
@@ -10,9 +10,6 @@
const mapApi = require('../../../api/mapApi').default
// 浣跨敤灏佽鏂规硶
const AnimalService = require('../service/AnimalService').default
-
-// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
-const PublicVideo = require('../../BaseNav/PublicVideo').default
module.exports = function () {
/**
@@ -49,14 +46,27 @@
}
this.bindTooltip = (layer) => {
+ // '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' +
return layer.options.totransferData.Name
}
this.clickListener = (e) => {
// 鐐瑰嚮marker鐨刾ulse()鍏夋尝
this.animalService.pulseEffect(e.latlng)
- /* 鐐瑰嚮鏁版嵁鐨勬帴鍙ｈ姹� */
- this.requestSolidWasteData(e).then(e)
+ // 寮规鏍囬
+ const title = e.layer.options.totransferData.Name
+ window.$layer.open({
+ content: {
+ content: WasteSolidIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: e.layer.options.totransferData.StoragePlaceId
+ }
+ },
+ title: title // 鏍囬
+ })
+ /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
+ this.animalService.setPanTo(e.latlng, 300)
}
// 涓嶅悓绫诲瀷鍥剧墖灏佽
@@ -68,50 +78,5 @@
effectOfChange = setting
}
return effectOfChange
- }
-
- // 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
- this.requestSolidWasteData = async (e) => {
- // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
- // 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)
- // 璇︾粏淇℃伅灞曠ず table
- // 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')
- /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
- this.setPanTo(e.latlng, 300)
- window.$layer.open({
- content: {
- content: PublicVideo, // 缁勪欢
- parent: this, // 鐖剁粍浠�
- data: { // 浼犻�掔殑鍙傛暟
- info: this.info,
- storagePlaceId: e.layer.options.totransferData.StoragePlaceId
- }
- },
- title: title // 鏍囬
- })
- }
-
- // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
- this.setPanTo = (pos, value) => {
- var position = pos
- position = window.map.latLngToLayerPoint(position)
- position.y += value
- position = window.map.layerPointToLatLng(position)
- window.map.flyTo(position)
}
}
--
Gitblit v1.8.0