From e46c7f58112c13ed09b325bf164f0d2a440f1012 Mon Sep 17 00:00:00 2001 From: 徐旺旺 <11530253@qq.com> Date: 星期四, 13 五月 2021 16:13:17 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue | 98 ++++++------------------------------------------ 1 files changed, 13 insertions(+), 85 deletions(-) diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue index c57b245..873db6e 100644 --- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue +++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue @@ -43,7 +43,7 @@ <!-- <i class="state"></i>--> <img class="state" :src="getImgSrc()" style="background: none"/> <div> - <h3 @click="handleLocation()">浜嬩欢鍚嶇О:XXX浜嬩欢</h3> + <h3 @click="handleLocation(item,index)">浜嬩欢鍚嶇О:XXX浜嬩欢</h3> <h5> 浜嬩欢浜嬩欢:2021骞�3鏈�21鏃� <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">鍒犻櫎</el-button> @@ -52,8 +52,7 @@ 浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span> </p> <p>浜嬩欢绫诲瀷锛�<span>{{ item.properties.pipecode }}</span> - <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" - @click="btnAffiliatedFacilities()">浜嬩欢绠$悊 + <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">浜嬩欢绠$悊 </el-button> </p> </div> @@ -63,7 +62,7 @@ </template> <script> -import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer' +// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer' // import { LayerEvent } from '../../../../../conf/layers/LayerEvent' // import { LayerResources } from '../../../../../conf/layers/LayerResources' @@ -71,7 +70,6 @@ import WfsHelper from '@components/helpers/WfsHelper' import AjaxUtils from '@utils/AjaxUtils' -import { SERVICE_TYPE } from '../../../../../conf/Constants' export default { name: 'EventQuery', @@ -79,82 +77,12 @@ return { list: [], activeNum: -1, - LayerEvent: { - code: 'njhx', - name: '鍗椾含鍖栧', - checked: false, // 榛樿閫変腑鐘舵�� - layers: [ - { - code: 'sqjd', - name: '鍗椾含鍖栧浜嬪墠闃舵', - sname: '浜嬪墠闃舵', - checked: false, - minZoom: 16, - type: SERVICE_TYPE.WMS, - wmsLayers: 'sewer:Aemergency', - icon: 'sewers/绐ㄤ簳.png' - }, - { - code: 'spjd', - name: '鍗椾含鍖栧瀹℃壒闃舵', - sname: '瀹℃壒闃舵', - checked: false, - minZoom: 16, - type: '鍖婚櫌', - typeName: 'sewer:Aemergency', - // wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�', - icon: 'sewers/闆ㄧ瀛�.png' - }, - { - code: 'sjwj', - name: '鍗椾含鍖栧浜嬩欢瀹岀粨', - sname: '浜嬩欢瀹岀粨', - minZoom: 16, - type: SERVICE_TYPE.WMS, - typeName: 'sewer:firedike', - checked: false - } - ] - }, - LayerResources: { - code: 'jlsh', - name: '閲戦櫟鐭冲寲', - checked: false, // 榛樿閫変腑鐘舵�� - layers: [ - { - code: 'yj', - name: '浜嬪墠闃舵', - sname: '浜嬪墠闃舵', - checked: false, - minZoom: 16, - type: SERVICE_TYPE.WMS, - wmsLayers: 'sewer:Aemergency', - icon: 'sewers/绐ㄤ簳.png' - }, - { - code: 'ybz', - name: '瀹℃壒闃舵', - sname: '瀹℃壒闃舵', - checked: false, - minZoom: 16, - type: SERVICE_TYPE.WMS, - typeName: 'sewer:Aemergency', - // wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�', - icon: 'sewers/闆ㄧ瀛�.png' - }, - { - code: 'fht', - name: '浜嬩欢瀹岀粨', - sname: '浜嬩欢瀹岀粨', - minZoom: 16, - type: SERVICE_TYPE.WMS, - typeName: 'sewer:firedike', - checked: false - } - ] - }, - items: [this.LayerEvent, this.LayerResources], - subItems: LayerEntEmer.layers, + LayerEvent: {}, + LayerResources: {}, + // items: [LayerEvent, LayerResources], + items: [], + // subItems: LayerEntEmer.layers, + subItems: [], form: { pipelineType: '', dataType: '', @@ -186,7 +114,6 @@ this.list = [] }, handlePipelineType (val) { - console.log('鏁版嵁鏌ヨ') this.list = [] for (let i = 0; i < this.items.length; i++) { const item = this.items[i] @@ -201,20 +128,21 @@ this.wfsHelper.clearFilter() // todo 鐜板湪浼佷笟搴旀�ヨ繕娌″尯鍒嗗紑绫诲瀷锛屽悗闈㈡敼 // this.wfsHelper.setTypeName([this.form.dataType.typeName]) - // this.wfsHelper.setTypeName([this.form.dataType]) + this.wfsHelper.setTypeName(['sewer:emergency']) if (this.form.keyword) { this.wfsHelper.addLike('name', this.form.keyword) } const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {}) - this.list = res.features if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) { this.list = res.features } }, handleLocation (val, index) { + console.log(val) this.activeNum = index // layer && layer.openPopup() - window.layerFactory.flyByFeature(val, this.form.dataType.code) + // window.layerFactory.flyByFeature(val, this.form.dataType.code) + window.map.flyTo([val.properties.y, val.properties.x], 15) }, btnAffiliatedFacilities () { console.log('item') -- Gitblit v1.8.0