From 4a80ef5544ff210d9e0aaa4cb1eaf3dba8c39645 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 11:14:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 136 +++++++++++++++------------------------------
1 files changed, 45 insertions(+), 91 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index d98e78a..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,7 +44,7 @@
<script>
import mapApi from '@/api/mapApi'
-import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced'
+import WasteSolidIndex from '@/components/BaseNav/WasteSolid/WasteSolidIndex'
export default {
name: 'SolidWasteSearch',
@@ -51,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: '鍖哄煙',
@@ -115,37 +137,18 @@
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: {
+ // select鐨刼ption鐨勬暟鎹�夋嫨
+ handlePipelineType (val) {
+ this.solidWasteTypeOptions.forEach(item => {
+ if (val === item.value) {
+ this.handleSearch(item.value)
+ }
+ })
+ },
// 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
async handleSearch (data) {
// console.log(this.form.keyword)
@@ -153,68 +156,19 @@
this.searchDataDisplay = result.Result.DataInfo
},
// 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
- async setBounced (val) {
+ setBounced (val) {
+ // console.log(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)
- }
+ window.map.flyTo(pos, 15)
+ window.$layer.open({
+ content: {
+ content: WasteSolidIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: val.StoragePlaceId
+ }
+ },
+ title: val.Name
})
}
}
--
Gitblit v1.8.0