From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 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 a468238..d8bc7be 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.pipecode"
- label="闄勫睘璁炬柦缂栧彿">
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
- prop="properties.measattribute"
- label="闄勫睘璁炬柦鍚嶇О">
- </el-table-column>
- <el-table-column
- show-overflow-tooltip
+ width="150"
prop="properties.code"
- label="闄勫睘璁炬柦鍚嶇О">
+ label="缂栧彿">
</el-table-column>
<el-table-column
show-overflow-tooltip
- prop="properties.datasource"
- label="闄勫睘璁炬柦绫诲瀷">
+ width="150"
+ prop="properties.name"
+ label="闄勫睘璁炬柦鍚嶇О">
</el-table-column>
- <el-table-column width="40" fixed="right" label="鎿嶄綔">
+ <el-table-column
+ width="150"
+ show-overflow-tooltip
+ prop="properties.type"
+ label="绫诲瀷">
+ </el-table-column>
+ <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>
@@ -174,8 +172,7 @@
// 闄勫睘璁炬柦鏌ヨ鍒楄〃鏁版嵁
tableDataAffFac: [],
// 瀹氫箟绫诲瀷鍒ゆ柇 if 鏄悳绱㈠埌鐨勬暟鎹彲浠ヨ繘琛岀绾块�夋嫨 else 鐐瑰嚮瀹氫綅閫夋嫨鐨勭绾夸笉鍙互杩涜閫夋嫨
- SectionAndAffFacTableJudge: false,
- locateJudgmentSearch: false
+ SectionAndAffFacTableJudge: false
}
},
mounted () {
@@ -206,7 +203,7 @@
console.log(AffFacSearch)
this.wfsHelper.clearFilter()
this.wfsHelper.setTypeName(['sewer:view_pipeline'])
- this.wfsHelper.addLike('code', AffFacSearch)
+ this.wfsHelper.addLike('pipecode', AffFacSearch)
// this.wfsHelper.addEquals('type', '\'' + AffFacSearch + '\'')
const resAffFac = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
console.log(resAffFac)
@@ -232,7 +229,7 @@
},
// 瀹氫綅鍔熻兘
localAdr (val) {
- console.log(val)
+ // console.log(val)
fitBounds(val)
highlight(val)
},
@@ -276,7 +273,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])
@@ -332,8 +329,10 @@
const size = window.map.getSize()
var point = window.map.latLngToContainerPoint(e.latlng, window.map.getZoom())
const wmsParams = Object.assign({
- LAYERS: 'pipeline_fs',
- QUERY_LAYERS: 'pipeline_fs',
+ LAYERS: 'sewer:view_pipeline',
+ QUERY_LAYERS: 'sewer:view_pipeline',
+ // LAYERS: 'pipeline_fs',
+ // QUERY_LAYERS: 'pipeline_fs',
WIDTH: size.x,
HEIGHT: size.y,
X: Math.round(point.x),
@@ -352,11 +351,10 @@
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])
}
- console.log(this.tableDataAffFac)
})
},
// 绠＄嚎鎼滅储
@@ -368,7 +366,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(), {})
@@ -379,14 +377,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