From e2bf4ab5fbcc29209d74101d99c0690d4ffbe234 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 21 五月 2021 17:14:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index 5df7689..5ec3213 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -47,40 +47,49 @@
<h5>{{changeAmount}}鍚嶇О:{{item.properties.name}}</h5>
<p>璐熻矗浜�:<span>{{item.properties.resperson}}</span></p>
<p>鐢佃瘽:<span>{{item.properties.telephone}}</span></p>
+ <p v-if="item.properties.address">鍦板潃:<span>{{item.properties.address}}</span></p>
+ <p v-else>鍦板潃:<span>{{item.properties.adminzonename}}</span></p>
</div>
</el-scrollbar>
</div>
</template>
<script>
+// wfs ajax
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
+// 鍥惧眰鎺у埗閫夋嫨鐨勬暟鎹�
import { LayerEmergencySource } from '../../../../conf/layers/LayerEmergencySource'
import { LayerSurroundings } from '../../../../conf/layers/LayerSurroundings'
-// import { pulseEffect } from '../../../../utils/utils'
-// import { locate, openPropsPopup } from '../../../helpers/LocateHelper'
-import { locate } from '../../../helpers/LocateHelper'
-// import { fitBounds, highlight, locate } from '../../../helpers/LocateHelper'
+// 寮曞叆鐨勬柟娉�
+import { pulseEffect } from '../../../../utils/utils'
+import { loadPointWfs, pointZoom } from '../../../helpers/LocateHelper'
export default {
name: 'ResourcesQuery',
data () {
return {
+ // form 琛ㄥ崟缁戝畾鏁版嵁
form: {
eventName: '',
pipelineType: LayerEmergencySource.name,
dataType: '',
keyword: '',
eventNameList: [
- { name: '閲戦櫟鐭冲寲' },
- { name: '鍗椾含鍖栧' }
+ { name: '鎵瓙鐭冲寲' },
+ { name: '浠緛鍖栫氦' }
]
},
+ // 鎼滅储鍒扮殑鏁版嵁缁戝畾鐨刟ctive鐨勬牱寮�
activeNum: -1,
+ // 鎼滅储鍒扮殑鏁版嵁杩涜瀛樺偍鐨刲ist
list: [],
+ // form琛ㄥ崟缁戝畾鐨勫浘灞傛暟鎹�
items: [LayerEmergencySource, LayerSurroundings],
subItems: LayerEmergencySource.layers || LayerSurroundings.layers,
+ // wfs
WfsHelper: null,
+ // 搴旀�� || 鍛ㄨ竟 鐨勫尯鍒嗙粦瀹氭暟鎹�
changeAmount: '璧勬簮'
}
},
@@ -88,11 +97,13 @@
this.wfsHelper = new WfsHelper()
},
methods: {
+ // 鎼滅储灞曠ず鍥剧墖鏍规嵁杩斿洖鍊煎睍绀�
getImgSrc (type) {
// console.log(type)
// const icon = this.form.dataType.icon
return 'assets/images/map/sewers/' + type + '.png'
},
+ // form 琛ㄥ崟閫夋嫨鏁版嵁鏁版嵁閫夋嫨鍒嗛厤
handlePipelineType (val) {
// console.log(val)
this.list = []
@@ -111,21 +122,23 @@
this.changeAmount = '鐜'
}
},
+ // 浜岀骇from琛ㄥ崟閫夋嫨鏁版嵁娓呯┖ 宸叉湁灞曠ず鏁版嵁
handleDataType (val) {
// console.log(val)
this.list = []
},
+ // 鐐瑰嚮鎼滅储浜嬩欢
async handleSearch () {
this.list = []
this.wfsHelper.clearFilter()
- // todo 鐜板湪浼佷笟搴旀�ヨ繕娌″尯鍒嗗紑绫诲瀷锛屽悗闈㈡敼
- // console.log(this.form.dataType)
- // this.wfsHelper.setTypeName([this.form.dataType.typeName])
- this.wfsHelper.setTypeName(['sewer:emergency'])
+ this.wfsHelper.setTypeName(['sewer:view_emergency'])
this.wfsHelper.setMaxFeatures(100)
+ // form琛ㄥ崟閫夋嫨鎼滅储
if (this.form.dataType) {
+ this.wfsHelper.addEquals('orgname', '\'' + this.form.eventName + '\'')
this.wfsHelper.addEquals('type', '\'' + this.form.dataType.name + '\'')
}
+ // 鎼滅储妗唊eyword
if (this.form.keyword) {
this.wfsHelper.addLike('name', this.form.keyword)
}
@@ -137,15 +150,15 @@
},
// 鏌ヨ瀹氫綅鍔熻兘
handleLocation (val, index) {
- console.log(val)
+ // console.log(val)
this.activeNum = index
- const config = this.form.dataType
- locate(val, config)
- // const positionArea = [val.properties.y, val.properties.x]
- // window.map.setView(positionArea, 17)
- // pulseEffect(positionArea)
- // fitBounds(val, this.form.dataType.code)
- // highlight(val, this.form.dataType)
+ const positionArea = [val.properties.y, val.properties.x]
+ window.map.setView(positionArea, 17)
+ pointZoom(positionArea, this.form.dataType.icon)
+ // 鍥剧墖
+ loadPointWfs(positionArea)
+ // 寮圭獥
+ pulseEffect(positionArea)
}
}
}
--
Gitblit v1.8.0