From 71c663091d05b11c41f78d8e75cb8b3db63b9cbc Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期六, 29 五月 2021 16:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
index d8bc7be..3d6c07b 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
@@ -117,7 +117,7 @@
<el-table-column
show-overflow-tooltip
width="150"
- prop="properties.code"
+ prop="properties.pipecode"
label="缂栧彿">
</el-table-column>
<el-table-column
@@ -147,12 +147,9 @@
</template>
<script>
-
-// import { pulseEffect } from '../../../../utils/utils'
-// import mapApi from '../../../../api/mapApi'
+import { highlight, fitBounds } from '../../../helpers/LocateHelper'
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
-import { fitBounds, highlight } from '../../../../components/helpers/LocateHelper'
import eventBus from '../../../../eventBus'
import { WMS_URL } from '../../../../conf/Constants'
@@ -208,10 +205,6 @@
const resAffFac = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
console.log(resAffFac)
if (resAffFac instanceof Object && Object.prototype.hasOwnProperty.call(resAffFac, 'features')) {
- // console.log(resAffFac.features)
- // for (let i = 0; i < resAffFac.features.length; i++) {
- // console.log(resAffFac.features[i])
- // }
this.tableDataAffFac = resAffFac.features
}
this.wfsHelper = new WfsHelper()
@@ -273,7 +266,7 @@
EXCEPTIONS: 'application/vnd.ogc.se_inimage'
})
AjaxUtils.get4JsonDataByUrl(WMS_URL, wmsParams, (res) => {
- console.log(res)
+ // console.log(res)
for (let i = 0; i < res.data.features.length; i++) {
// console.log(res.data.features[i])
this.tableList.push(res.data.features[i])
@@ -284,12 +277,13 @@
// 闄勫睘璁炬柦
this.affFacData(e)
// })
+ window.map.off('click')
})
// 鏁版嵁 閲嶆柊鑾峰彇 杩涜缃┖
this.tableList = []
this.tableListSection = []
- this.form.pipeName = ''
this.tableDataAffFac = []
+ this.form.pipeName = ''
this.form.sectionName = ''
this.form.affiliatedFacilities = ''
},
@@ -331,8 +325,8 @@
const wmsParams = Object.assign({
LAYERS: 'sewer:view_pipeline',
QUERY_LAYERS: 'sewer:view_pipeline',
- // LAYERS: 'pipeline_fs',
- // QUERY_LAYERS: 'pipeline_fs',
+ // LAYERS: 'sewer:pipeline_fs',
+ // QUERY_LAYERS: 'sewer:pipeline_fs',
WIDTH: size.x,
HEIGHT: size.y,
X: Math.round(point.x),
@@ -351,7 +345,7 @@
EXCEPTIONS: 'application/vnd.ogc.se_inimage'
})
AjaxUtils.get4JsonDataByUrl(WMS_URL, wmsParams, (res) => {
- // console.log(res)
+ console.log(res)
for (let i = 0; i < res.data.features.length; i++) {
this.tableDataAffFac.push(res.data.features[i])
}
--
Gitblit v1.8.0