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 | 51 ++++++++++++++++++++++-----------------------------
1 files changed, 22 insertions(+), 29 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 0b57216..3d6c07b 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
@@ -111,30 +111,28 @@
:data="tableDataAffFac"
border
@row-click="affFacName"
- height="100"
- max-height="100"
+ height="120"
+ max-height="140"
style="width: 100%">
<el-table-column
show-overflow-tooltip
- prop="properties.code"
- label="闄勫睘璁炬柦缂栧彿">
+ width="150"
+ prop="properties.pipecode"
+ label="缂栧彿">
</el-table-column>
<el-table-column
show-overflow-tooltip
+ width="150"
prop="properties.name"
label="闄勫睘璁炬柦鍚嶇О">
</el-table-column>
- <!-- <el-table-column-->
- <!-- show-overflow-tooltip-->
- <!-- prop="properties.measattribute"-->
- <!-- label="闄勫睘璁炬柦鍚嶇О">-->
- <!-- </el-table-column>-->
<el-table-column
+ width="150"
show-overflow-tooltip
prop="properties.type"
- label="闄勫睘璁炬柦绫诲瀷">
+ label="绫诲瀷">
</el-table-column>
- <el-table-column width="40" fixed="right" label="鎿嶄綔">
+ <el-table-column width="90" fixed="right" label="鎿嶄綔">
<template slot-scope="scope">
<el-button @click="localAdr(scope.row)" type="text" size="small">瀹氫綅</el-button>
</template>
@@ -149,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'
@@ -174,8 +169,7 @@
// 闄勫睘璁炬柦鏌ヨ鍒楄〃鏁版嵁
tableDataAffFac: [],
// 瀹氫箟绫诲瀷鍒ゆ柇 if 鏄悳绱㈠埌鐨勬暟鎹彲浠ヨ繘琛岀绾块�夋嫨 else 鐐瑰嚮瀹氫綅閫夋嫨鐨勭绾夸笉鍙互杩涜閫夋嫨
- SectionAndAffFacTableJudge: false,
- locateJudgmentSearch: false
+ SectionAndAffFacTableJudge: false
}
},
mounted () {
@@ -211,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()
@@ -232,7 +222,7 @@
},
// 瀹氫綅鍔熻兘
localAdr (val) {
- console.log(val)
+ // console.log(val)
fitBounds(val)
highlight(val)
},
@@ -256,8 +246,8 @@
const size = window.map.getSize()
var point = window.map.latLngToContainerPoint(e.latlng, window.map.getZoom())
const wmsParams = Object.assign({
- LAYERS: 'sewer:pipeline',
- QUERY_LAYERS: 'sewer:pipeline',
+ LAYERS: 'pipeline_group',
+ QUERY_LAYERS: 'pipeline_group',
WIDTH: size.x,
HEIGHT: size.y,
X: Math.round(point.x),
@@ -287,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 = ''
},
@@ -334,6 +325,8 @@
const wmsParams = Object.assign({
LAYERS: 'sewer:view_pipeline',
QUERY_LAYERS: 'sewer:view_pipeline',
+ // LAYERS: 'sewer:pipeline_fs',
+ // QUERY_LAYERS: 'sewer:pipeline_fs',
WIDTH: size.x,
HEIGHT: size.y,
X: Math.round(point.x),
@@ -352,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])
}
@@ -367,7 +360,7 @@
this.wfsHelper.clearFilter()
this.wfsHelper.setTypeName(['sewer:pipeline'])
if (this.form.pipeName) {
- this.wfsHelper.addLike('pipename', this.form.pipeName)
+ this.wfsHelper.addLike('subchaname', this.form.pipeName)
}
// this.wfsHelper.addEquals('pipename', '\'' + this.form.pipeName + '\'')
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
@@ -378,14 +371,14 @@
this.tableList = res.features
}
this.wfsHelper = new WfsHelper()
- // this.form.pipeName = ''
+ this.form.pipeName = ''
this.form.sectionName = ''
this.form.affiliatedFacilities = ''
},
// 鐐瑰嚮纭
confirm () {
// console.log('鐐瑰嚮纭畾閫夋嫨瀹屾垚')
- eventBus.$emit('section-search', true)
+ eventBus.$emit('location-setChange', true)
this.form.pipeName = ''
this.form.sectionName = ''
this.form.affiliatedFacilities = ''
--
Gitblit v1.8.0