From 896776bdfb2435ba9ed49996e39f007cc487ffe0 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 11 五月 2021 10:48:04 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 171 +++++++++++++++-----------------------------------------
1 files changed, 47 insertions(+), 124 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 78a436b..5814b50 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -29,7 +29,8 @@
<el-scrollbar style="height:286.22px">
<div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index"
@click="setBounced(item)">
- <i class="state"></i>
+ <!-- <i class="state"></i>-->
+ <img src="../../../../public/assets/images/map/solidwaste/gf_green2.png" alt="" class="state">
<div>
<h3>###鐐煎寲閮�</h3>
<p>鎵�灞為儴闂細<span>{{ item.Name }}</span></p>
@@ -43,8 +44,7 @@
<script>
import mapApi from '@/api/mapApi'
-import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced'
-import defaultImg from '../../../../public/assets/images/map/solidwaste/gf_green2.png'
+import WasteSolidIndex from '@/components/BaseNav/WasteSolid/WasteSolidIndex'
export default {
name: 'SolidWasteSearch',
@@ -52,6 +52,27 @@
data () {
return {
judgeVisible: true,
+ form: {
+ keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+ // 鏁版嵁鐨勪紶閫�
+ transferData: 1
+ },
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
+ // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
+ searchDataDisplay: [],
solidWasteTypeOptions: [{
value: '1',
label: '鍖哄煙',
@@ -116,130 +137,10 @@
label: '闀垮害(m)',
key: 'length'
}]
- }],
- form: {
- keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
- // 鏁版嵁鐨勪紶閫�
- transferData: 1
- },
- levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: 1
- },
- {
- name: '姝ｅ父',
- value: 2
- },
- {
- name: '棰勮',
- value: 3
- }
- ],
- // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
- searchDataDisplay: [],
- instance: null,
- intervals: [],
- layer: window.map,
- L: window.L,
- times: 5,
- colors: ['#98FB98', '#ff0000']
+ }]
}
},
methods: {
- // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
- async handleSearch (data) {
- // console.log(this.form.keyword)
- const result = await mapApi.getSolidWaste(data)
- this.searchDataDisplay = result.Result.DataInfo
- // 寰幆閬嶅巻鏁版嵁 鏍规嵁杩涜marker 鐨勫垱寤�
- for (let i = 0; i < this.searchDataDisplay.length; i++) {
- // 缁忕含搴� 浣嶇疆
- const positionX = this.searchDataDisplay[i].Latitude
- const positionY = this.searchDataDisplay[i].Longitude
-
- // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
- const judgeValue = this.searchDataDisplay[i].StorageQty
- var iconUrl = this.differentTypes(judgeValue)
-
- const marker = this.L.marker([positionX, positionY], {
- // totransferData: this.searchDataDisplay[i],
- icon: this.L.icon({
- iconUrl: iconUrl,
- iconSize: [30, 30],
- iconAnchor: [15, 15]
- })
- })
- this.layer.addLayer(marker)
- }
- },
- // 涓嶅悓绫诲瀷鍥剧墖灏佽
- differentTypes (judgeValue) {
- var effectOfChange
- if (judgeValue === 1) {
- effectOfChange = defaultImg
- } else {
- effectOfChange = defaultImg
- }
- return effectOfChange
- },
- // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
- 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 => {
@@ -247,6 +148,28 @@
this.handleSearch(item.value)
}
})
+ },
+ // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
+ async handleSearch (data) {
+ // console.log(this.form.keyword)
+ const result = await mapApi.getSolidWaste(data)
+ this.searchDataDisplay = result.Result.DataInfo
+ },
+ // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
+ setBounced (val) {
+ // console.log(val)
+ const pos = [val.Latitude, val.Longitude]
+ window.map.flyTo(pos, 15)
+ window.$layer.open({
+ content: {
+ content: WasteSolidIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: val.StoragePlaceId
+ }
+ },
+ title: val.Name
+ })
}
}
}
--
Gitblit v1.8.0