From 6fdf72287c433eb9e9bafbb258de3c1a759b060b Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 15:41:05 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 73 +++++++++++++++---------------------
1 files changed, 30 insertions(+), 43 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 8649d6b..76793a7 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -15,13 +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>
@@ -45,27 +43,12 @@
<script>
import mapApi from '@/api/mapApi'
-import WfsHelper from '@components/helpers/WfsHelper'
export default {
name: 'SolidWasteSearch',
props: ['title'],
data () {
return {
- levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: '1'
- },
- {
- name: '姝ｅ父',
- value: '2'
- },
- {
- name: '棰勮',
- value: '3'
- }
- ],
judgeVisible: true,
solidWasteTypeOptions: [{
value: '1',
@@ -132,45 +115,49 @@
key: 'length'
}]
}],
- radio: '1',
form: {
keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
// 鏁版嵁鐨勪紶閫�
- transferData: ''
+ transferData: 1
},
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
// 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
searchDataDisplay: []
}
},
methods: {
- setBounced (val) {
- console.log(val)
- const bound = this.L.geoJSON([val], {}).getBounds()
- // var layer = window.layerFactory.flyByLayerId(val.id, bound)
- window.map.flyToBounds(bound)
- // layer && layer.openPopup()
+ // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
+ async handleSearch (data) {
+ // console.log(this.form.keyword)
+ const result = await mapApi.getSolidWaste(data)
+ console.log(result)
+ this.searchDataDisplay = result.Result.DataInfo
},
+ // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
+ setBounced (val) {
+ const pos = [val.Latitude, val.Longitude]
+ window.map.flyTo(pos, 11)
+ },
+ // 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.Result
- var wfsHelper = new WfsHelper()
- wfsHelper.addTypeName('鍥哄簾')
- wfsHelper.addLike('name', this.form.keyword)
- const res = await mapApi.getSolidWaste(wfsHelper.getUrl(), {})
- console.log(res)
- // if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
- this.searchDataDisplay = res.Result.Result
- // }
}
}
}
--
Gitblit v1.8.0