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 | 89 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 37 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index e9ef1a5..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>
@@ -40,40 +40,22 @@
</div>
</el-form>
<el-scrollbar style="height:286.22px">
- <div class="environmental-risk-list">
- <!-- v-for="(item,index) in searchDataDisplay" :key="index" @click="setBounced(item)"-->
- <i class="state"></i>
- <div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
- </div>
- </div>
- <div class="environmental-risk-list">
- <i class="state"></i>
- <div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
- </div>
- </div>
- <div class="environmental-risk-list">
- <i class="state"></i>
- <div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
- </div>
+ <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"/>
+ <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 { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+import WfsHelper from '@components/helpers/WfsHelper'
+import AjaxUtils from '@utils/AjaxUtils'
export default {
name: 'ResourcesQuery',
@@ -89,23 +71,56 @@
{ name: '鍗椾含鍖栧' }
]
},
- items: [LayerEntEmer],
- subItems: LayerEntEmer.layers,
- searchDataDisplay: []
+ activeNum: -1,
+ list: [],
+ // items: [LayerEntEmer],
+ items: [{ name: '搴旀�ヨ祫婧�' }, { name: '鍛ㄨ竟鐜' }],
+ // subItems: LayerEntEmer.layers,
+ subItems: [{ name: '鍏ㄩ儴璧勬簮' }, { name: '搴旀�ョ墿璧�' }, { name: '搴旀�ヨ溅杈�(鑸�)' }, { name: '搴旀�ラ槦浼�(鍚秷闃插崟浣�)' }],
+ subItemsT: [{ name: '鍏ㄩ儴鐜' }, { name: '鍖婚櫌' }, { name: '瀛︽牎' }, { name: '姘翠綋' }, { name: '鑷劧淇濇姢鍖�' }, { name: '鏁忔劅鐩爣' }],
+ WfsHelper: null
}
},
+ mounted () {
+ this.wfsHelper = new WfsHelper()
+ },
methods: {
+ getImgSrc () {
+ const icon = this.form.dataType.icon
+ 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')
},
- handleSearch () {
- console.log('鏁版嵁鏌ヨ')
+ async handleSearch () {
+ this.list = []
+ this.wfsHelper.clearFilter()
+ // todo 鐜板湪浼佷笟搴旀�ヨ繕娌″尯鍒嗗紑绫诲瀷锛屽悗闈㈡敼
+ // this.wfsHelper.setTypeName([this.form.dataType.typeName])
+ this.wfsHelper.setTypeName(['sewer:emergency'])
+ if (this.form.keyword) {
+ this.wfsHelper.addLike('name', this.form.keyword)
+ }
+ const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
+ if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+ this.list = res.features
+ }
},
- setBounced (item) {
- console.log(item)
+ 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)
}
}
}
--
Gitblit v1.8.0