From 6ace815c16170b0a7fc68bf280f63bffe96612e6 Mon Sep 17 00:00:00 2001 From: zhangshuaibao <15731629597@163.com> Date: 星期三, 14 四月 2021 18:24:30 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/panel/topicSearch/SolidWasteSearch.vue | 64 ++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 3 deletions(-) diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue index 76793a7..d98e78a 100644 --- a/src/components/panel/topicSearch/SolidWasteSearch.vue +++ b/src/components/panel/topicSearch/SolidWasteSearch.vue @@ -43,6 +43,7 @@ <script> import mapApi from '@/api/mapApi' +import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced' export default { name: 'SolidWasteSearch', @@ -135,7 +136,13 @@ } ], // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑 - searchDataDisplay: [] + searchDataDisplay: [], + instance: null, + intervals: [], + layer: window.map, + L: window.L, + times: 5, + colors: ['#98FB98', '#ff0000'] } }, methods: { @@ -143,13 +150,64 @@ async handleSearch (data) { // console.log(this.form.keyword) const result = await mapApi.getSolidWaste(data) - console.log(result) this.searchDataDisplay = result.Result.DataInfo }, // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀� - setBounced (val) { + async setBounced (val) { const pos = [val.Latitude, val.Longitude] window.map.flyTo(pos, 11) + const t1 = setTimeout(async () => { + const dataValue = { + StoragePlaceId: val.StoragePlaceId + } + // 寮规鏍囬 + const title = val.Name + // 鍩烘湰淇℃伅 tabs + const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue) + // 璇︾粏淇℃伅灞曠ず table + const resultDetailed = await mapApi.getSolidWasteDetail(dataValue) + + // 缁戝畾寮规瀹炰緥 + this.instance && this.instance.closePopup() + const PublicBounced = window.Vue.extend(publicBounced) + this.instance = new PublicBounced().$mount() + document.body.appendChild(this.instance.$el) + // document.body.removeChild(instance.$el) + // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹� + this.instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei') + this.setPanTo(pos, 250) + }, 1000) + console.log(t1) + // clearTimeout(t1) + this.pulseEffect(pos) + }, + + // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢 + setPanTo (pos, value) { + var position = pos + position = window.map.latLngToLayerPoint(position) + position.y += value + position = window.map.layerPointToLatLng(position) + window.map.flyTo(position) + }, + pulseEffect (xy) { + // 鎻掍欢 鏁堟灉瀹炵幇 + var pulsingIcon = this.L.icon.pulse({ + iconSize: [20, 20], + color: this.colors[0], + fillColor: '' + }) + var picGroupMarker = this.L.marker(xy, { icon: pulsingIcon }).addTo(this.layer) + var times = this.times + // 瀹氭椂 + var timeInterval = setInterval(() => { + if (times > 0) { + times-- + } else { + clearInterval(timeInterval) + picGroupMarker.remove() + } + }, 1000) }, // select鐨刼ption鐨勬暟鎹�夋嫨 handlePipelineType (val) { -- Gitblit v1.8.0