From 097581b136c5889c71c07fb6f17d2f2885ce5a78 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 16:02:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index fd06274..f8df59b 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -30,7 +30,7 @@
v-for="item in subItems"
:key="item.code"
:label="item.name"
- :value="item">
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -42,12 +42,11 @@
<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>
+ <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>
@@ -75,9 +74,10 @@
activeNum: -1,
list: [],
// items: [LayerEntEmer],
- items: [],
+ items: [{ name: '搴旀�ヨ祫婧�' }, { name: '鍛ㄨ竟鐜' }],
// subItems: LayerEntEmer.layers,
- subItems: [],
+ subItems: [{ name: '鍏ㄩ儴璧勬簮' }, { name: '搴旀�ョ墿璧�' }, { name: '搴旀�ヨ溅杈�(鑸�)' }, { name: '搴旀�ラ槦浼�(鍚秷闃插崟浣�)' }],
+ subItemsT: [{ name: '鍏ㄩ儴鐜' }, { name: '鍖婚櫌' }, { name: '瀛︽牎' }, { name: '姘翠綋' }, { name: '鑷劧淇濇姢鍖�' }, { name: '鏁忔劅鐩爣' }],
WfsHelper: null
}
},
@@ -90,7 +90,13 @@
return icon ? 'assets/images/map/' + icon : ''
},
handlePipelineType () {
- console.log('item')
+ // console.log('item')
+ if (this.form.pipelineType === '搴旀�ヨ祫婧�') {
+ this.form.pipelineType = '璧勬簮绫诲瀷'
+ }
+ if (this.form.pipelineType === '鍛ㄨ竟鐜') {
+ this.subItems = this.subItemsT
+ }
},
handleDataType () {
console.log('item')
--
Gitblit v1.8.0