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 | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index 0c379e1..5a88c59 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -42,7 +42,7 @@
<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)">
- <img class="state" :src="getImgSrc()" style="background: none"/>
+ <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>
@@ -53,7 +53,6 @@
</template>
<script>
-// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
@@ -79,8 +78,6 @@
list: [],
items: [LayerEmergencySource, LayerSurroundings],
subItems: LayerEmergencySource.layers || LayerSurroundings.layers,
- // subItems: [{ name: '鍏ㄩ儴璧勬簮' }, { name: '搴旀�ョ墿璧�' }, { name: '搴旀�ヨ溅杈�(鑸�)' }, { name: '搴旀�ラ槦浼�(鍚秷闃插崟浣�)' }],
- // subItemsT: [{ name: '鍏ㄩ儴鐜' }, { name: '鍖婚櫌', icon: 'sewers/鍖婚櫌.png' }, { name: '瀛︽牎' }, { name: '姘翠綋' }, { name: '鑷劧淇濇姢鍖�' }, { name: '鏁忔劅鐩爣' }],
WfsHelper: null
}
},
@@ -88,10 +85,10 @@
this.wfsHelper = new WfsHelper()
},
methods: {
- getImgSrc () {
- const icon = this.form.dataType.icon
- // console.log(this.form.dataType)
- 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 (val) {
// console.log(val)
@@ -105,8 +102,8 @@
}
if (this.form.pipelineType === '搴旀�ヨ祫婧�') {
this.subItems = LayerEmergencySource.layers
- } else {
- this.subItems = LayerSurroundings.layers // (this.form.pipelineType === '鍛ㄨ竟鐜')
+ } else if (this.form.pipelineType === '鍛ㄨ竟鐜') {
+ this.subItems = LayerSurroundings.layers
}
},
handleDataType (val) {
@@ -117,8 +114,10 @@
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 + '\'')
}
--
Gitblit v1.8.0