From 3772c31b2ea52e950724de46b1b2d2d3ef3f4bc1 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期一, 24 五月 2021 16:29:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue | 51 ++++++++++++++++++---------------------------------
1 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
index fb1eb41..afe3279 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
@@ -77,30 +77,31 @@
</div>
</div>
</el-scrollbar>
+<!-- <reportPopup></reportPopup>-->
</div>
</template>
<script>
-// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
-// import { LayerEvent } from '../../../../../conf/layers/LayerEvent'
-// import { LayerResources } from '../../../../../conf/layers/LayerResources'
-import ReportPopup from './ReportPopup'
-
-import WfsHelper from '@components/helpers/WfsHelper'
-import AjaxUtils from '@utils/AjaxUtils'
+// import WfsHelper from '@components/helpers/WfsHelper'
+// import AjaxUtils from '@utils/AjaxUtils'
+import ReportIncident from './ReportIncident'
export default {
name: 'EventQuery',
+ components: {
+ // reportPopup
+ },
data () {
return {
+ reportIncident: false,
list: [],
activeNum: -1,
LayerEvent: {},
LayerResources: {},
// items: [LayerEvent, LayerResources],
- items: [],
// subItems: LayerEntEmer.layers,
+ items: [],
subItems: [],
form: {
pipelineType: '',
@@ -122,21 +123,20 @@
}
},
mounted () {
- this.wfsHelper = new WfsHelper()
+ // this.wfsHelper = new WfsHelper()
},
methods: {
// 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
- console.log('item')
window.$layer.open({
content: {
- content: ReportPopup, // 缁勪欢
+ comp: ReportIncident, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
- // storagePlaceId: e.layer.options.totransferData.StoragePlaceId
+ // info: this.info
}
- }
- // title: 'title' // 鏍囬
+ },
+ title: '涓婃姤浜嬩欢'
})
},
// radio鏁版嵁閫夋嫨
@@ -165,26 +165,11 @@
},
// 鏁版嵁鎼滅储浜嬩欢
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
- }
+ 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)
+ // 鎼滅储鐨勬暟鎹� de 鐐瑰嚮浜嬩欢
+ handleLocation () {
+ console.log('val')
}
}
}
--
Gitblit v1.8.0