From 06b8e7a0ae832fdf83dcefd069b9cf9b5580f013 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 17:59:57 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 110 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 85 insertions(+), 25 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 676551d..d98e78a 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -15,7 +15,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-radio-group v-model="form.type" class="levelOfRisk">
+ <el-radio-group v-model="form.transferData" class="levelOfRisk">
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
<span class="levelOfRisk-type">{{ item.name }}</span>
</el-radio>
@@ -43,6 +43,7 @@
<script>
import mapApi from '@/api/mapApi'
+import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced'
export default {
name: 'SolidWasteSearch',
@@ -115,47 +116,106 @@
key: 'length'
}]
}],
- levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: '1'
- },
- {
- name: '姝ｅ父',
- value: '2'
- },
- {
- name: '棰勮',
- value: '3'
- }
- ],
form: {
keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
// 鏁版嵁鐨勪紶閫�
- transferData: ''
+ transferData: 1
},
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
// 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
- searchDataDisplay: []
+ searchDataDisplay: [],
+ instance: null,
+ intervals: [],
+ layer: window.map,
+ L: window.L,
+ times: 5,
+ colors: ['#98FB98', '#ff0000']
}
},
methods: {
- setBounced (val) {
+ // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
+ async handleSearch (data) {
+ // console.log(this.form.keyword)
+ const result = await mapApi.getSolidWaste(data)
+ this.searchDataDisplay = result.Result.DataInfo
+ },
+ // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
+ 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) {
this.solidWasteTypeOptions.forEach(item => {
if (val === item.value) {
this.handleSearch(item.value)
}
})
- },
- // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
- async handleSearch (data) {
- // console.log(this.form.keyword)
- const result = await mapApi.getSolidWaste(data)
- console.log(result)
- this.searchDataDisplay = result.Result.DataInfo
}
}
}
--
Gitblit v1.8.0