From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteWater.js | 40 +++++-----------------------------------
1 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 6f67ed6..6203258 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -1,13 +1,14 @@
/**
* 搴熸按
*/
-// import WasteWater from "../../table/components/WasteWater";
+
+// 鍏叡鏂规硶 panTo() 寮曠敤
+const { setPanTo } = require('../../../utils/utils')
const AnimalService = require('../service/AnimalService').default
const mapApi = require('../../../api/mapApi').default
// 寮圭獥鏁版嵁寮曡繘
const WasteWaterIndex = require('@components/BaseNav/WasteWater/WasteWaterIndex').default
-// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
const NormalImg = '/assets/images/map/wastewater/fs_bright_green.png' // 姝ｅ父
const OffImg = '/assets/images/map/wastewater/fs_gray.png' // 鍋滆繍
@@ -48,20 +49,19 @@
}
}
- // 鍒嗗壊绾�-------------------------------------------------------------------------------
this.bindTooltip = (layer) => {
return '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.totransferData.Name
}
this.clickListener = (e) => {
- // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
this.animalService.pulseEffect(e.latlng)
+ setPanTo(e.latlng, 200)
// 寮规鏍囬
const title = e.layer.options.totransferData.Name
const res = e.layer.options.totransferData
window.$layer.open({
content: {
- content: WasteWaterIndex, // 缁勪欢
+ comp: WasteWaterIndex, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
// info: this.info
@@ -70,36 +70,6 @@
},
title: '澶╂触鐭冲寲' + title // 鏍囬
})
- this.animalService.setPanTo(e.latlng, 150)
- }
- this.requestWasteWaterData = async (e) => {
- // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
- // const dataValue = {
- // StoragePlaceId: e.layer.options.test.StoragePlaceId
- // }
- // 寮规鏍囬
- // const title = e.layer.options.totransferData.Name
- // console.log(e.layer.options)
- // 鍩烘湰淇℃伅 tabs
- // const resultBasic = await mapApi.getWasteWater(dataValue)
- // 鍥捐〃淇℃伅灞曠ず echarts
- // 瀹炴椂鏁版嵁
- // const resultReal = await mapApi.getDataItems(Value)
- // 灏忔椂鏁版嵁 鍙� 鏄庣粏琛ㄦ暟鎹�
- // const result = await mapApi.getQueryOnlineMonData(dataValue)
- // 鏃ユ暟鎹� 鍙� 鏄庣粏琛ㄦ暟鎹�
- // const result = await mapApi.getQueryOnlineMonData(dataValue)
- // 浜哄伐鏁版嵁
- // const resultEchart = await mapApi.getQueryLabMonData(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()寮瑰嚭妗嗗钩绉讳簨浠� */
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
--
Gitblit v1.8.0