From faadb3a39e89b2cb7a00e81e3778f480f1f09998 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 14 四月 2021 17:38:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 105 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 34 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index fc2bca7..a974f81 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -15,11 +15,11 @@
</el-option>
</el-select>
</el-form-item>
- <el-radio-group v-model="form.type" class="levelOfRisk">
- <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name }}</span>
+ <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>
</el-radio-group>
-
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -43,26 +43,13 @@
<script>
import mapApi from '@/api/mapApi'
+import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced'
export default {
name: 'SolidWasteSearch',
props: ['title'],
data () {
return {
- levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: '1'
- },
- {
- name: '姝ｅ父',
- value: '2'
- },
- {
- name: '棰勮',
- value: '3'
- }
- ],
judgeVisible: true,
solidWasteTypeOptions: [{
value: '1',
@@ -129,37 +116,87 @@
key: 'length'
}]
}],
- radio: '1',
form: {
keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
// 鏁版嵁鐨勪紶閫�
- transferData: ''
+ transferData: 1
},
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
// 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
- searchDataDisplay: []
+ searchDataDisplay: [],
+ searchDataDisplayName: '',
+ searchDataDisplayId: ''
}
},
methods: {
- setBounced (item) {
- console.log(item)
- const bound = this.L.geoJSON([item], {}).getBounds()
- var layer = window.serviceLayerHelper.getByLayerId(item.StoragePlaceId)
- layer && layer.openPopup()
- this.$store.state.map.flyToBounds(bound)
- },
- 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
+ this.searchDataDisplayName = result.Result.DataInfo[0].Name
+ this.searchDataDisplayId = result.Result.DataInfo[0].StoragePlaceId
+ console.log(this.searchDataDisplayName)
+ },
+ // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
+ setBounced (val) {
+ const pos = [val.Latitude, val.Longitude]
+ window.map.flyTo(pos, 11)
+ const t1 = setTimeout(async () => {
+ const dataValue = {
+ StoragePlaceId: this.searchDataDisplayId
+ }
+ // console.log(e.layer.options.totransferData.Name)
+ // 寮规鏍囬
+ const title = this.searchDataDisplayName
+ console.log(title)
+ // 鍩烘湰淇℃伅 tabs
+ const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
+ // 璇︾粏淇℃伅灞曠ず table
+ const resultDetailed = await mapApi.getSolidWasteDetail(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')
+ // this.setPanTo(e.latlng, 300)
+ }, 3000)
+ console.log(t1)
+ // clearTimeout(t1)
+ },
+
+ // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
+ setPanTo (pos, value) {
+ var position = pos
+ position = window.map.latLngToLayerPoint(position)
+ position.y += value
+ position = window.map.layerPointToLatLng(position)
+ window.map.flyTo(position)
+ },
+ // select鐨刼ption鐨勬暟鎹�夋嫨
+ handlePipelineType (val) {
+ this.solidWasteTypeOptions.forEach(item => {
+ if (val === item.value) {
+ this.handleSearch(item.value)
+ }
+ })
}
}
}
--
Gitblit v1.8.0