From c42c548a635e7086f6cffc132625c5c7902b63b5 Mon Sep 17 00:00:00 2001 From: 陈泽平 <chenzeping> Date: 星期六, 29 五月 2021 11:12:48 +0800 Subject: [PATCH] 企业应急-事件上报-定位修改 --- src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue | 56 ++++++++++++++++++++++++-------------------------------- 1 files changed, 24 insertions(+), 32 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 3b46417..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 + width="150" prop="properties.pipecode" - label="闄勫睘璁炬柦缂栧彿"> + label="缂栧彿"> </el-table-column> <el-table-column show-overflow-tooltip - prop="properties.measattribute" + width="150" + prop="properties.name" label="闄勫睘璁炬柦鍚嶇О"> </el-table-column> <el-table-column + width="150" show-overflow-tooltip - prop="properties.code" - label="闄勫睘璁炬柦鍚嶇О"> + prop="properties.type" + label="绫诲瀷"> </el-table-column> - <el-table-column - show-overflow-tooltip - prop="properties.datasource" - 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 () { @@ -202,19 +196,15 @@ this.wfsHelper = new WfsHelper() // 闄勫睘璁炬柦鏌ヨ this.tableDataAffFac = [] - const AffFacSearch = val.properties.mediumtype + const AffFacSearch = val.properties.pipecode console.log(AffFacSearch) this.wfsHelper.clearFilter() this.wfsHelper.setTypeName(['sewer:view_pipeline']) - this.wfsHelper.addLike('type', AffFacSearch) + this.wfsHelper.addLike('pipecode', AffFacSearch) // this.wfsHelper.addEquals('type', '\'' + AffFacSearch + '\'') 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) }, @@ -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 = '' }, @@ -332,8 +323,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: 'sewer:pipeline_fs', + // QUERY_LAYERS: 'sewer:pipeline_fs', WIDTH: size.x, HEIGHT: size.y, X: Math.round(point.x), @@ -356,7 +349,6 @@ for (let i = 0; i < res.data.features.length; i++) { this.tableDataAffFac.push(res.data.features[i]) } - console.log(this.tableDataAffFac) }) }, // 绠$嚎鎼滅储 @@ -368,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(), {}) @@ -379,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