From f8865d1c7f36c4ffa66002e0dd3a9d5e99e4fe6b Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 13:45:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue | 350 ++++++++++++++++++++++++++-------------------------------
1 files changed, 159 insertions(+), 191 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 16b9c4d..3e9cbff 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
@@ -1,6 +1,6 @@
<template>
<div class="ReportLocationSection">
- <el-form :model="form" label-width="90px">
+ <el-form :model="form" label-width="120px">
<el-row class="pipe-line-search">
<el-col :span="12">
<el-form-item label="绠＄嚎鍚嶇О:">
@@ -17,14 +17,21 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
+ <el-col :span="24">
<el-form-item label="绠℃缂栫爜:">
<el-input v-model="form.sectionName" disabled></el-input>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
- <el-form-item label="闄勫睘璁炬柦:">
+ <el-form-item label="闄勫睘璁炬柦鍚嶇О:">
<el-input v-model="form.affiliatedFacilities" disabled></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="闄勫睘璁炬柦缂栫爜:">
+ <el-input v-model="form.affiliatedFacilitiesCode" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -117,8 +124,8 @@
<el-table-column
show-overflow-tooltip
width="150"
- prop="properties.code"
- label="缂栧彿">
+ prop="properties.pipecode"
+ label="绠＄嚎缂栧彿">
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -130,7 +137,7 @@
width="150"
show-overflow-tooltip
prop="properties.type"
- label="绫诲瀷">
+ label="璁炬柦绫诲瀷">
</el-table-column>
<el-table-column width="90" fixed="right" label="鎿嶄綔">
<template slot-scope="scope">
@@ -141,18 +148,15 @@
</el-card>
</div>
<el-row style="text-align: right;margin: 10px">
- <el-button type="primary" @click="confirm">纭</el-button>
+ <el-button type="primary" @click="confirm" size="small">纭</el-button>
</el-row>
</div>
</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'
@@ -163,7 +167,8 @@
form: {
pipeName: '',
sectionName: '',
- affiliatedFacilities: ''
+ affiliatedFacilities: '',
+ affiliatedFacilitiesCode: ''
},
// 绠＄嚎鏌ヨ鏁版嵁鍒楄〃
tableList: [],
@@ -179,185 +184,6 @@
this.wfsHelper = new WfsHelper()
},
methods: {
- // 鐐瑰嚮绠＄嚎鍒楄〃 灞曠ず绠℃鍐呭 鍜岄檮灞炶鏂藉唴瀹�
- async sectionShowClick (val) {
- console.log(val)
- // 濡傛灉 SectionAndAffFacTableJudge === true 鏄悳绱㈡暟鎹粨鏋滅殑鍒楄〃 鍙互杩涜 绠℃ 闄勫睘璁炬柦浜や簰 鐐瑰嚮瀹氫綅鏌ヨ缁撴灉 涓嶈繘琛岀偣鍑讳氦浜�
- if (this.SectionAndAffFacTableJudge === true) {
- // 绠℃鏌ヨ
- const sectionNameSearch = val.properties.pipename
- this.tableListSection = []
- this.wfsHelper.clearFilter()
- this.wfsHelper.setTypeName(['sewer:pipesegment'])
- this.wfsHelper.addLike('pipename', sectionNameSearch)
- this.wfsHelper.addEquals('pipename', '\'' + sectionNameSearch + '\'')
- const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
- // console.log(res)
- if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
- this.tableListSection = res.features
- }
- this.wfsHelper = new WfsHelper()
- // 闄勫睘璁炬柦鏌ヨ
- this.tableDataAffFac = []
- const AffFacSearch = val.properties.pipecode
- console.log(AffFacSearch)
- this.wfsHelper.clearFilter()
- this.wfsHelper.setTypeName(['sewer:view_pipeline'])
- 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()
- }
- },
- // 鐐瑰嚮绠℃鍒楄〃 绠℃缂栫爜浼犻��
- sectionCode (val) {
- // console.log(val)
- this.form.sectionName = val.properties.pipecode
- },
- // 鐐瑰嚮闄勫睘璁炬柦鍒楄〃 绠℃缂栫爜浼犻��
- affFacName (val) {
- // console.log(val)
- this.form.affiliatedFacilities = val.properties.name
- },
- // 瀹氫綅鍔熻兘
- localAdr (val) {
- // console.log(val)
- fitBounds(val)
- highlight(val)
- },
- // 绠＄嚎 鐐瑰嚮瀹氫綅绠℃鐨勯�夋嫨鍔熻兘
- pipeClickLocation () {
- // 璁炬柦涓嶈繘琛� 绠＄嚎琛ㄦ牸鏁版嵁鐨勭偣鍑讳氦浜�
- this.SectionAndAffFacTableJudge = false
- window.mapManager.clickDialogSwitch = false
- // this.tableList = []
- // 鐐瑰嚮鑾峰彇鏁版嵁
- window.map.on('click', (e) => {
- // window.mapManager.loadWfsDatas(e.latlng).then((res) => {
- // console.log(res)
- // for (let i = 0; i < res.features.length; i++) {
- // this.tableList.push(res.features[i])
- // this.tableListSection.push(res.features[i])
- // this.tableDataAffFac.push(res.features[i])
- // }
- // })
- // return new Promise((resolve, reject) => {
- const size = window.map.getSize()
- var point = window.map.latLngToContainerPoint(e.latlng, window.map.getZoom())
- const wmsParams = Object.assign({
- LAYERS: 'pipeline_group',
- QUERY_LAYERS: 'pipeline_group',
- WIDTH: size.x,
- HEIGHT: size.y,
- X: Math.round(point.x),
- Y: Math.round(point.y),
- BBOX: window.map.getBounds().toBBoxString()
- }, {
- VERSION: '1.1.1',
- SERVICE: 'WMS',
- REQUEST: 'GetFeatureInfo',
- // bbox: bbox,
- FORMAT: 'image/png',
- INFO_FORMAT: 'application/json',
- TRANSPARENT: true,
- FEATURE_COUNT: 50,
- SRS: 'EPSG:4326',
- EXCEPTIONS: 'application/vnd.ogc.se_inimage'
- })
- AjaxUtils.get4JsonDataByUrl(WMS_URL, wmsParams, (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])
- }
- })
- // 绠℃
- this.sectionData(e)
- // 闄勫睘璁炬柦
- this.affFacData(e)
- // })
- window.map.off('click')
- })
- // 鏁版嵁 閲嶆柊鑾峰彇 杩涜缃┖
- this.tableList = []
- this.tableListSection = []
- this.form.pipeName = ''
- this.tableDataAffFac = []
- this.form.sectionName = ''
- this.form.affiliatedFacilities = ''
- },
- // 鐐瑰嚮瀹氫綅 鎿﹀绠℃
- sectionData (e) {
- const size = window.map.getSize()
- var point = window.map.latLngToContainerPoint(e.latlng, window.map.getZoom())
- const wmsParams = Object.assign({
- LAYERS: 'sewer:pipesegment',
- QUERY_LAYERS: 'sewer:pipesegment',
- WIDTH: size.x,
- HEIGHT: size.y,
- X: Math.round(point.x),
- Y: Math.round(point.y),
- BBOX: window.map.getBounds().toBBoxString()
- }, {
- VERSION: '1.1.1',
- SERVICE: 'WMS',
- REQUEST: 'GetFeatureInfo',
- // bbox: bbox,
- FORMAT: 'image/png',
- INFO_FORMAT: 'application/json',
- TRANSPARENT: true,
- FEATURE_COUNT: 50,
- SRS: 'EPSG:4326',
- EXCEPTIONS: 'application/vnd.ogc.se_inimage'
- })
- AjaxUtils.get4JsonDataByUrl(WMS_URL, wmsParams, (res) => {
- // console.log(res)
- for (let i = 0; i < res.data.features.length; i++) {
- this.tableListSection.push(res.data.features[i])
- }
- })
- },
- // 闄勫睘璁炬柦
- affFacData (e) {
- const size = window.map.getSize()
- var point = window.map.latLngToContainerPoint(e.latlng, window.map.getZoom())
- const wmsParams = Object.assign({
- 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),
- Y: Math.round(point.y),
- BBOX: window.map.getBounds().toBBoxString()
- }, {
- VERSION: '1.1.1',
- SERVICE: 'WMS',
- REQUEST: 'GetFeatureInfo',
- // bbox: bbox,
- FORMAT: 'image/png',
- INFO_FORMAT: 'application/json',
- TRANSPARENT: true,
- FEATURE_COUNT: 50,
- SRS: 'EPSG:4326',
- EXCEPTIONS: 'application/vnd.ogc.se_inimage'
- })
- AjaxUtils.get4JsonDataByUrl(WMS_URL, wmsParams, (res) => {
- // console.log(res)
- for (let i = 0; i < res.data.features.length; i++) {
- this.tableDataAffFac.push(res.data.features[i])
- }
- })
- },
// 绠＄嚎鎼滅储
async pipelineSearch () {
this.SectionAndAffFacTableJudge = true
@@ -378,9 +204,151 @@
this.tableList = res.features
}
this.wfsHelper = new WfsHelper()
+ // this.form.pipeName = ''
+ this.form.sectionName = ''
+ this.form.affiliatedFacilities = ''
+ this.form.affiliatedFacilitiesCode = ''
+ },
+ // 鐐瑰嚮绠＄嚎鍒楄〃 灞曠ず绠℃鍐呭 鍜岄檮灞炶鏂藉唴瀹�
+ sectionShowClick (val) {
+ // console.log(val)
+ // this.SectionAndAffFacTableJudge = true
+ if (this.SectionAndAffFacTableJudge === true) {
+ this.searchSection(val)
+ this.searchAffFacData(val)
+ }
+ },
+ // 绠℃鏌ヨ
+ async searchSection (val) {
+ const sectionNameSearch = val.properties.pipename
+ this.tableListSection = []
+ this.wfsHelper.clearFilter()
+ this.wfsHelper.setTypeName(['sewer:pipesegment'])
+ this.wfsHelper.addLike('pipename', sectionNameSearch)
+ this.wfsHelper.addEquals('pipename', '\'' + sectionNameSearch + '\'')
+ const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
+ // console.log(res)
+ if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+ this.tableListSection = res.features
+ }
+ },
+ // 闄勫睘璁炬柦鏌ヨ
+ async searchAffFacData (val) {
+ this.tableDataAffFac = []
+ const AffFacSearch = val.properties.pipecode
+ this.wfsHelper.clearFilter()
+ this.wfsHelper.setTypeName(['sewer:view_pipeline'])
+ 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')) {
+ this.tableDataAffFac = resAffFac.features
+ }
+ },
+ // 鎼滅储鐨勫叕鍏辨柟娉曚紭鍖�
+ async publicSearch (searchVal, searchKeyword, searchTypeName, tableListData) {
+ tableListData = []
+ this.wfsHelper = new WfsHelper()
+ this.wfsHelper.clearFilter()
+ this.wfsHelper.setTypeName(searchTypeName)
+ this.wfsHelper.addLike(searchKeyword, searchVal)
+ this.wfsHelper.addEquals(searchKeyword, '\'' + searchVal + '\'')
+ const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
+ // console.log(res)
+ if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+ tableListData = res.features
+ }
+ },
+ // 鐐瑰嚮绠℃鍒楄〃 绠℃缂栫爜浼犻��
+ sectionCode (val) {
+ // console.log(val)
+ this.form.sectionName = val.properties.pipesegcode
+ },
+ // 鐐瑰嚮闄勫睘璁炬柦鍒楄〃 绠℃缂栫爜浼犻��
+ affFacName (val) {
+ console.log(val)
+ this.form.affiliatedFacilities = val.properties.name
+ this.form.affiliatedFacilitiesCode = val.properties.code
+ },
+ // 瀹氫綅鍔熻兘
+ localAdr (val) {
+ // console.log(val)
+ fitBounds(val)
+ highlight(val)
+ },
+ // 绠＄嚎 鐐瑰嚮瀹氫綅绠℃鐨勯�夋嫨鍔熻兘
+ pipeClickLocation () {
+ // 璁炬柦涓嶈繘琛� 绠＄嚎琛ㄦ牸鏁版嵁鐨勭偣鍑讳氦浜�
+ this.SectionAndAffFacTableJudge = false
+ if (this.SectionAndAffFacTableJudge === false) {
+ // 鐐瑰嚮鑾峰彇鏁版嵁
+ window.map.on('click', (e) => {
+ this.SectionAndAffFacTableJudge = false
+ // 鐐瑰嚮鍦板浘鍏抽棴寮规
+ window.mapManager.clickDialogSwitch = false
+ // 绠＄嚎鐐瑰嚮鏁版嵁
+ this.pipeData(e)
+ // 绠℃鐐瑰嚮鏁版嵁
+ this.sectionData(e)
+ // 闄勫睘璁炬柦鏁版嵁
+ this.affFacData(e)
+ // 鍏抽棴鐐瑰嚮浜嬩欢
+ window.map.off('click')
+ })
+ }
+ // 鏁版嵁 閲嶆柊鑾峰彇 杩涜缃┖
this.form.pipeName = ''
this.form.sectionName = ''
this.form.affiliatedFacilities = ''
+ this.form.affiliatedFacilitiesCode = ''
+ this.tableList = []
+ this.tableListSection = []
+ this.tableDataAffFac = []
+ },
+ // 鐐瑰嚮瀹氫綅鍖哄煙 鎼滃绠＄嚎鏁版嵁
+ pipeData (e) {
+ this.publicWay(e, 'sewer:pipeline', 'sewer:pipeline', this.tableList)
+ },
+ // 鐐瑰嚮瀹氫綅鍖哄煙 鎼滃绠℃鏁版嵁
+ sectionData (e) {
+ this.publicWay(e, 'sewer:pipesegment', 'sewer:pipesegment', this.tableListSection)
+ },
+ // 鐐瑰嚮瀹氫綅鍖哄煙 鎼滃闄勫睘璁炬柦鏁版嵁
+ affFacData (e) {
+ this.publicWay(e, 'sewer:view_pipeline', 'sewer:view_pipeline', this.tableDataAffFac, 'pipecode <> \'\'')
+ },
+ // 鐐瑰嚮鎸夐挳瀹氫綅 鐨勫叕鍏变簨浠�
+ publicWay (e, layer, queryLayer, dataList, cqlfilter) {
+ const defaultWmsParams = {
+ VERSION: '1.1.1',
+ SERVICE: 'WMS',
+ REQUEST: 'GetFeatureInfo',
+ FORMAT: 'image/png',
+ INFO_FORMAT: 'application/json',
+ TRANSPARENT: true,
+ FEATURE_COUNT: 50,
+ SRS: 'EPSG:4326',
+ cql_filter: cqlfilter,
+ EXCEPTIONS: 'application/vnd.ogc.se_inimage'
+ }
+ const size = window.map.getSize()
+ const point = window.map.latLngToContainerPoint(e.latlng, window.map.getZoom())
+ const wmsParams = Object.assign({
+ LAYERS: layer,
+ QUERY_LAYERS: queryLayer,
+ WIDTH: size.x,
+ HEIGHT: size.y,
+ X: Math.round(point.x),
+ Y: Math.round(point.y),
+ BBOX: window.map.getBounds().toBBoxString()
+ }, defaultWmsParams)
+ AjaxUtils.get4JsonDataByUrl(WMS_URL, wmsParams, (res) => {
+ // console.log(res)
+ for (let i = 0; i < res.data.features.length; i++) {
+ dataList.push(res.data.features[i])
+ }
+ })
},
// 鐐瑰嚮纭
confirm () {
--
Gitblit v1.8.0