From f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 14 五月 2021 11:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index fd06274..5a88c59 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -42,21 +42,23 @@
<el-scrollbar style="height:286.22px">
<div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
:class="activeNum===index?'hover':''" @click="handleLocation(item,index)">
- <!-- <i class="state"></i>-->
- <img class="state" :src="getImgSrc()" style="background: none"/>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
+ <img class="state" :src="getImgSrc(item.properties.type)" style="background: none"/>
+ <h3>璧勬簮绫诲瀷:{{item.properties.adminzonename}}</h3>
+ <h5>璧勬簮鍚嶇О:{{item.properties.type}}</h5>
+ <p>璐熻矗浜�:<span>{{item.properties.resperson}}</span></p>
+ <p>鐢佃瘽:<span>{{item.properties.telephone}}</span></p>
</div>
</el-scrollbar>
</div>
</template>
<script>
-// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
+
+// import { LayerEmergency } from '../../../../../conf/LayerEmergency'
+import { LayerEmergencySource } from '../../../../../conf/layers/LayerEmergencySource'
+import { LayerSurroundings } from '../../../../../conf/layers/LayerSurroundings'
export default {
name: 'ResourcesQuery',
@@ -64,7 +66,7 @@
return {
form: {
eventName: '',
- pipelineType: '璧勬簮绫诲瀷',
+ pipelineType: '搴旀�ヨ祫婧�',
dataType: '',
keyword: '',
eventNameList: [
@@ -74,10 +76,8 @@
},
activeNum: -1,
list: [],
- // items: [LayerEntEmer],
- items: [],
- // subItems: LayerEntEmer.layers,
- subItems: [],
+ items: [LayerEmergencySource, LayerSurroundings],
+ subItems: LayerEmergencySource.layers || LayerSurroundings.layers,
WfsHelper: null
}
},
@@ -85,22 +85,42 @@
this.wfsHelper = new WfsHelper()
},
methods: {
- getImgSrc () {
- const icon = this.form.dataType.icon
- return icon ? 'assets/images/map/' + icon : ''
+ getImgSrc (type) {
+ // console.log(type)
+ // const icon = this.form.dataType.icon
+ return 'assets/images/map/sewers/' + type + '.png'
},
- handlePipelineType () {
- console.log('item')
+ handlePipelineType (val) {
+ // console.log(val)
+ this.list = []
+ for (let i = 0; i < this.items.length; i++) {
+ const item = this.items[i].name
+ if (val === item.name) {
+ this.subItems = item.layers
+ return
+ }
+ }
+ if (this.form.pipelineType === '搴旀�ヨ祫婧�') {
+ this.subItems = LayerEmergencySource.layers
+ } else if (this.form.pipelineType === '鍛ㄨ竟鐜') {
+ this.subItems = LayerSurroundings.layers
+ }
},
- handleDataType () {
- console.log('item')
+ 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.setMaxFeatures(100)
+ if (this.form.dataType) {
+ this.wfsHelper.addEquals('type', '\'' + this.form.dataType.name + '\'')
+ }
if (this.form.keyword) {
this.wfsHelper.addLike('name', this.form.keyword)
}
@@ -110,16 +130,13 @@
}
},
handleLocation (val, index) {
- console.log(val)
this.activeNum = index
- // layer && layer.openPopup()
- // window.layerFactory.flyByFeature(val, this.form.dataType.code)
window.map.flyTo([val.properties.y, val.properties.x], 15)
}
}
}
</script>
-<style scoped>
+<style lang="less" scoped>
</style>
--
Gitblit v1.8.0