From 8eebe7cdf3865d37e8d21b5078c9721207a38b6d Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期六, 29 五月 2021 16:28:13 +0800
Subject: [PATCH] 企业应急-事件上报-管段定位修改
---
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue | 160 +++++++++++++++++++++++++++++-----------------------
src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue | 6 --
2 files changed, 89 insertions(+), 77 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue b/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
index 0c6335b..85d1972 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
@@ -336,12 +336,6 @@
})
},
methods: {
- // // 鎺ユ敹瀛愮粍浠朵紶閫掔殑鏁版嵁
- // getlocaltionClick (val) {
- // // console.log(val)
- // this.ruleForm.positionOf = val.latPos + '-' + val.longPos
- // this.dialogLocation = !this.dialogLocation
- // },
// 娑堟伅鎺ㄩ�� 閫夋嫨鎺ㄩ�佺殑瀵硅薄
infoChange () {
if (this.ruleForm.beingPushed.indexOf('鐭俊鎺ㄩ��') > -1 || this.ruleForm.beingPushed.indexOf('鎵嬫満搴旂敤鎺ㄩ��') > -1) {
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 3d6c07b..7498287 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue
@@ -118,7 +118,7 @@
show-overflow-tooltip
width="150"
prop="properties.pipecode"
- label="缂栧彿">
+ label="绠＄嚎缂栧彿">
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -130,7 +130,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">
@@ -176,6 +176,30 @@
this.wfsHelper = new WfsHelper()
},
methods: {
+ // 绠＄嚎鎼滅储
+ async pipelineSearch () {
+ this.SectionAndAffFacTableJudge = true
+ this.tableList = []
+ this.tableListSection = []
+ this.tableDataAffFac = []
+ this.wfsHelper.clearFilter()
+ this.wfsHelper.setTypeName(['sewer:pipeline'])
+ if (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(), {})
+ // console.log(res)
+ if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+ this.total = res.totalFeatures
+ // console.log(res.features)
+ this.tableList = res.features
+ }
+ this.wfsHelper = new WfsHelper()
+ this.form.pipeName = ''
+ this.form.sectionName = ''
+ this.form.affiliatedFacilities = ''
+ },
// 鐐瑰嚮绠＄嚎鍒楄〃 灞曠ず绠℃鍐呭 鍜岄檮灞炶鏂藉唴瀹�
async sectionShowClick (val) {
console.log(val)
@@ -205,6 +229,10 @@
const resAffFac = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
console.log(resAffFac)
if (resAffFac instanceof Object && Object.prototype.hasOwnProperty.call(resAffFac, 'features')) {
+ // for (let i = 0; i < resAffFac.features.length; i++) {
+ // // console.log(resAffFac.features[i])
+ // this.tableDataAffFac.push(resAffFac.features[i].properties)
+ // }
this.tableDataAffFac = resAffFac.features
}
this.wfsHelper = new WfsHelper()
@@ -230,54 +258,68 @@
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])
+ // window.mapManager.clickDialogSwitch = false
+ window.mapManager.loadWfsDatas(e.latlng).then((res) => {
+ for (let i = 0; i < res.features.length; i++) {
+ console.log(res.features[i])
+ const ids = res.features[i].id.split('.')
+ // console.log(ids[0])
+ if (ids[0] === 'pipeline') {
+ this.tableList.push(res.features[i])
+ } else if (ids[0] === 'pipesegment') {
+ this.tableListSection.push(res.features[i])
+ } else {
+ this.tableDataAffFac.push(res.features[i])
+ // const obj = {
+ // properties: {
+ // pipecode: res.features[i].properties.code,
+ // name: res.features[i].properties.companyname,
+ // type: res.features[i].properties.mediumtype
+ // }
+ // }
+ // console.log(obj)
+ // this.tableDataAffFac.push(obj)
+ // console.log(this.tableDataAffFac)
+ }
}
})
- // 绠℃
- this.sectionData(e)
- // 闄勫睘璁炬柦
- this.affFacData(e)
- // })
window.map.off('click')
+ // 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)
})
// 鏁版嵁 閲嶆柊鑾峰彇 杩涜缃┖
this.tableList = []
@@ -318,15 +360,15 @@
}
})
},
- // 闄勫睘璁炬柦
+ // 鐐瑰嚮瀹氫綅 鎿﹀闄勫睘璁炬柦
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: 'sewer:pipeline_fs',
- // QUERY_LAYERS: 'sewer:pipeline_fs',
+ // LAYERS: 'pipeline_fs',
+ // QUERY_LAYERS: 'pipeline_fs',
WIDTH: size.x,
HEIGHT: size.y,
X: Math.round(point.x),
@@ -350,30 +392,6 @@
this.tableDataAffFac.push(res.data.features[i])
}
})
- },
- // 绠＄嚎鎼滅储
- async pipelineSearch () {
- this.SectionAndAffFacTableJudge = true
- this.tableList = []
- this.tableListSection = []
- this.tableDataAffFac = []
- this.wfsHelper.clearFilter()
- this.wfsHelper.setTypeName(['sewer:pipeline'])
- if (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(), {})
- // console.log(res)
- if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
- this.total = res.totalFeatures
- // console.log(res.features)
- this.tableList = res.features
- }
- this.wfsHelper = new WfsHelper()
- this.form.pipeName = ''
- this.form.sectionName = ''
- this.form.affiliatedFacilities = ''
},
// 鐐瑰嚮纭
confirm () {
--
Gitblit v1.8.0