From e79998e0764d6d00b050363bdeda48519a1f0c31 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期五, 28 五月 2021 20:21:06 +0800
Subject: [PATCH] 企业应急-事件上报-位置定位修改
---
/dev/null | 139 ----------------------------------
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue | 6 +
src/components/base-page/enterprise-emergency/events-reported/ReportLocationSection.vue | 37 ++++----
src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue | 8 +
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 4
5 files changed, 30 insertions(+), 164 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 5184ed2..b94555a 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/EventsReported.vue
@@ -329,7 +329,7 @@
}
},
mounted () {
- eventBus.$on('section-search', (obj) => {
+ eventBus.$on('location-setChange', (obj) => {
if (obj) {
this.dialogLocation = false
}
@@ -338,7 +338,7 @@
methods: {
// 鎺ユ敹瀛愮粍浠朵紶閫掔殑鏁版嵁
getlocaltionClick (val) {
- console.log(val)
+ // console.log(val)
this.ruleForm.positionOf = val.latPos + '-' + val.longPos
this.dialogLocation = !this.dialogLocation
},
@@ -368,11 +368,13 @@
return false
}
})
- this.$refs[formName].resetFields()
+ // this.$refs[formName].resetFields()
+ eventBus.$emit('event-report-popup', false)
},
// form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
resetForm (formName) {
this.$refs[formName].resetFields()
+ eventBus.$emit('event-report-popup', false)
}
}
}
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportFile.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportFile.vue
deleted file mode 100644
index 3c8e317..0000000
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportFile.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
- <div class="report-file-box">
- <el-row style="margin: 5px 15px">
- <el-form ref="form" :model="form" label-width="80px">
- <el-col :span="12">
- <el-form-item label="绠＄嚎鍚嶇О">
- <el-input v-model="form.pipeName">
- <el-button style="padding-right:10px;" slot="suffix" type="text">
- <img src="../../../../../public/assets/images/map/emergency/search.png" alt="">
- </el-button>
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="绠℃缂栫爜">
- <el-input v-model="form.pipeCode">
- <el-button style="padding-right:10px;" slot="suffix" type="text">
- <img src="../../../../../public/assets/images/map/emergency/search.png" alt="">
- </el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-form>
- </el-row>
- <div v-for="(item,index) in folderList" :key="index">
- <div class="fold-box">
- <img :src="item.fold" alt="" @click="fileAccord(item)"/>
- <span @click="fileAccord(item)">{{ item.introduce }}</span>
- </div>
- <div v-for="(ite,ind) in item.items" :key="ind" v-show="item.fileCode" class="file">
- <div class="file-left">
- <img :src="ite.file" alt="" @click="codeAccord(ite)"/>
- <span @click="codeAccord(ite)">{{ite.introduce}}</span>
- </div>
- <div class="file-right">
- <span v-show="ite.fileCode">{{item.code}}</span>
- </div>
- </div>
- </div>
- </div>
-</template>
-
-<script>
-import eventBus from '../../../../eventBus'
-import foldPng from '../../../../../public/assets/images/map/emergency/fold.png'
-import filePng from '../../../../../public/assets/images/map/emergency/file.png'
-
-export default {
- name: 'ReportFile',
- data () {
- return {
- pipelineFile: false,
- form: {
- pipeName: '',
- pipeCode: ''
- },
- folderList: [
- {
- fold: foldPng,
- introduce: '鐢熶骇涓�鍖�',
- code: '400001',
- fileCode: false,
- items: [
- {
- file: filePng,
- introduce: '绠＄嚎A',
- code: '1000001',
- fileCode: false
- },
- {
- file: filePng,
- introduce: '绠＄嚎B',
- code: '2000002',
- fileCode: false
- }
- ]
- },
- {
- fold: foldPng,
- introduce: '鐢熶骇浜屽尯',
- code: '400002',
- fileCode: false,
- items: [
- {
- file: filePng,
- introduce: '绠＄嚎C',
- code: '3000003',
- fileCode: false
- },
- {
- file: filePng,
- introduce: '绠＄嚎D',
- code: '4000004',
- fileCode: false
- }
- ]
- }
- ]
- }
- },
- mounted () {
- eventBus.$on('pipelineFile-choose', (obj) => {
- // console.log(obj)
- this.pipelineFile = obj
- })
- },
- methods: {
- fileAccord (item) {
- item.fileCode = !item.fileCode
- },
- codeAccord (item) {
- item.fileCode = !item.fileCode
- }
- }
-}
-</script>
-
-<style lang="less" scoped>
-
- .file {
- display: flex;
- align-items: center;
- justify-content: space-evenly;
- }
-
- /deep/ .el-input__inner {
- border-radius: 5px;
- background: rgba(0, 16, 30, 0.5);
- border-color: @color;
- }
-
- /deep/ .el-form-item__label {
- color: @color;
- }
-
- /deep/ .el-radio__label {
- color: @color;
- }
-</style>
diff --git a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
index ba23015..71d6826 100644
--- a/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
+++ b/src/components/base-page/enterprise-emergency/events-reported/ReportLocationSearch.vue
@@ -13,6 +13,7 @@
import { reportLocationSearch } from '../../../../api/request'
import { pulseEffect } from '../../../../utils/utils'
+import eventBus from '../../../../eventBus'
export default {
name: 'ReportLocationSearch',
data () {
@@ -58,8 +59,9 @@
// 鐐瑰嚮纭鎸夐挳浜嬩欢
confirm () {
// 閫氳繃瀛愮粍浠跺悜鐖剁粍浠朵紶閫掓暟鎹�
- this.$emit('locationClick', this.LongLatPos)
- console.log('鎼滅储瀹氫綅')
+ // this.$emit('locationClick', this.LongLatPos)
+ eventBus.$emit('location-setChange', true)
+ // console.log('鎼滅储瀹氫綅')
}
}
}
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..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
+ width="150"
prop="properties.code"
- label="闄勫睘璁炬柦缂栧彿">
+ 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>
@@ -174,8 +172,7 @@
// 闄勫睘璁炬柦鏌ヨ鍒楄〃鏁版嵁
tableDataAffFac: [],
// 瀹氫箟绫诲瀷鍒ゆ柇 if 鏄悳绱㈠埌鐨勬暟鎹彲浠ヨ繘琛岀绾块�夋嫨 else 鐐瑰嚮瀹氫綅閫夋嫨鐨勭绾夸笉鍙互杩涜閫夋嫨
- SectionAndAffFacTableJudge: false,
- locateJudgmentSearch: false
+ SectionAndAffFacTableJudge: false
}
},
mounted () {
@@ -232,7 +229,7 @@
},
// 瀹氫綅鍔熻兘
localAdr (val) {
- console.log(val)
+ // console.log(val)
fitBounds(val)
highlight(val)
},
@@ -256,8 +253,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),
@@ -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])
@@ -334,6 +331,8 @@
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),
@@ -367,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(), {})
@@ -378,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 = ''
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 77b0263..8eb966e 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -121,7 +121,6 @@
data () {
return {
dialogVisible: false,
- reportIncident: false,
list: [],
total: 0,
activeNum: -1,
@@ -148,6 +147,9 @@
},
mounted () {
// this.wfsHelper = new WfsHelper()
+ eventBus.$on('event-report-popup', (obj) => {
+ this.dialogVisible = obj
+ })
},
methods: {
dialogVisibleChange () {
--
Gitblit v1.8.0