From 6ebf06fa7ce4fccb3144a0c15773cb9e48276fd7 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 25 五月 2021 21:14:22 +0800
Subject: [PATCH] 事件上报页面修改
---
src/conf/layers/LayerHbss.js | 4
src/components/base-page/enterprise-emergency/PipelineFile.vue | 2
src/components/panel/topicSearch/sewers-select/analysis-choose/Tube.vue | 42 +++-------
public/assets/images/map/sewers/应急队伍.png | 0
public/assets/images/map/sewers/截流闸.png | 0
src/components/base-page/enterprise-emergency/PositionChange.vue | 111 ++++++++++++++++-----------
src/components/base-page/enterprise-emergency/ReportIncident.vue | 38 ++++++---
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 5
public/assets/images/map/sewers/溢流堰.png | 0
src/components/base-page/enterprise-emergency/DisposalEvent.vue | 15 ---
10 files changed, 111 insertions(+), 106 deletions(-)
diff --git "a/public/assets/images/map/sewers/\345\272\224\346\200\245\351\230\237\344\274\215.png" "b/public/assets/images/map/sewers/\345\272\224\346\200\245\351\230\237\344\274\215.png"
index f8e01e4..351cc4a 100644
--- "a/public/assets/images/map/sewers/\345\272\224\346\200\245\351\230\237\344\274\215.png"
+++ "b/public/assets/images/map/sewers/\345\272\224\346\200\245\351\230\237\344\274\215.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\346\210\252\346\265\201\351\227\270.png" "b/public/assets/images/map/sewers/\346\210\252\346\265\201\351\227\270.png"
new file mode 100644
index 0000000..9ea5aa8
--- /dev/null
+++ "b/public/assets/images/map/sewers/\346\210\252\346\265\201\351\227\270.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\346\272\242\346\265\201\345\240\260.png" "b/public/assets/images/map/sewers/\346\272\242\346\265\201\345\240\260.png"
new file mode 100644
index 0000000..42b0899
--- /dev/null
+++ "b/public/assets/images/map/sewers/\346\272\242\346\265\201\345\240\260.png"
Binary files differ
diff --git a/src/components/base-page/enterprise-emergency/DisposalEvent.vue b/src/components/base-page/enterprise-emergency/DisposalEvent.vue
index 8cbb9b1..0987e2b 100644
--- a/src/components/base-page/enterprise-emergency/DisposalEvent.vue
+++ b/src/components/base-page/enterprise-emergency/DisposalEvent.vue
@@ -54,7 +54,7 @@
</el-table>
<div class="event-management">
<el-button type="primary" size="mini" @click="ToManagement">浜嬩欢绠＄悊</el-button>
- <el-button size="mini" @click="close()">鍏抽棴</el-button>
+ <el-button size="mini">鍏抽棴</el-button>
</div>
</div>
</template>
@@ -113,19 +113,6 @@
// 浜嬩欢绠＄悊椤甸潰璺宠浆
ToManagement () {
eventBus.$emit('events-reported', true)
- },
- // 椤甸潰鍏抽棴
- close () {
- window.$layer.open({
- content: {
- comp: '',
- parent: this,
- data: { // 浼犻�掔殑鍙傛暟
- // info: this.info
- }
- },
- title: ''
- })
}
}
}
diff --git a/src/components/base-page/enterprise-emergency/PipelineFile.vue b/src/components/base-page/enterprise-emergency/PipelineFile.vue
index 6b81d24..f7e9f6c 100644
--- a/src/components/base-page/enterprise-emergency/PipelineFile.vue
+++ b/src/components/base-page/enterprise-emergency/PipelineFile.vue
@@ -1,6 +1,6 @@
<template>
<div class="pipeline-file map-background" v-show="pipelineFile">
- <el-row>
+ <el-row style="margin: 0 15px">
<el-form ref="form" :model="form" label-width="80px">
<el-col :span="12">
<el-form-item label="绠＄嚎鍚嶇О">
diff --git a/src/components/base-page/enterprise-emergency/PositionChange.vue b/src/components/base-page/enterprise-emergency/PositionChange.vue
index 87943b0..36af28a 100644
--- a/src/components/base-page/enterprise-emergency/PositionChange.vue
+++ b/src/components/base-page/enterprise-emergency/PositionChange.vue
@@ -8,38 +8,54 @@
</div>
</el-tab-pane>
<el-tab-pane label="绠℃瀹氫綅" name="second">
- <div class="line-pos">
- <div class="line-pos-form">
+ <div class="place">
+ <div class="place-top">
+ <div class="place-left">
<el-form :model="linePos" label-width="90px">
<el-form-item label="绠＄嚎鍚嶇О:">
<el-input v-model="linePos.lineName"></el-input>
</el-form-item>
<el-form-item label="闄勫睘璁炬柦:">
- <el-select v-model="linePos.affFac" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
+ <el-select v-model="linePos.affFac">
+ <el-option
+ v-for="item in linePos.affFacList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
</el-select>
</el-form-item>
</el-form>
- <el-button type="primary" size="mini">鎼滅储</el-button>
</div>
- <el-button type="primary" @click="confirm">纭</el-button>
+ <div class="place-right">
+ <el-button type="primary" size="small" @click="fileChoose">鎼滅储</el-button>
+ </div>
+ </div>
+ <div class="place-bottom">
+ <el-button type="primary" @click="confirm">纭</el-button>
+ </div>
</div>
</el-tab-pane>
<el-tab-pane label="缁忕含搴﹀畾浣�" name="third">
- <div class="latlng-location">
- <div class="latlng-location-chose">
- <el-form :model="LongLatPos" label-width="90px">
- <el-form-item label="缁忓害:">
- <el-input v-model="LongLatPos.longPos"></el-input>
- </el-form-item>
- <el-form-item label="绾害:">
- <el-input v-model="LongLatPos.latPos"></el-input>
- </el-form-item>
- </el-form>
- <el-button type="primary" size="mini">瀹氫綅</el-button>
+ <div class="place">
+ <div class="place-top">
+ <div class="place-left">
+ <el-form :model="LongLatPos" label-width="90px">
+ <el-form-item label="缁忓害:">
+ <el-input v-model="LongLatPos.longPos"></el-input>
+ </el-form-item>
+ <el-form-item label="绾害:">
+ <el-input v-model="LongLatPos.latPos"></el-input>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="place-right">
+ <el-button type="primary" size="small">鎼滅储</el-button>
+ </div>
</div>
- <el-button type="primary" @click="confirm">纭</el-button>
+ <div class="place-bottom">
+ <el-button type="primary" @click="confirm">纭</el-button>
+ </div>
</div>
</el-tab-pane>
</el-tabs>
@@ -65,9 +81,19 @@
// 绠℃瀹氫綅
linePos: {
lineName: '',
- affFac: ''
+ affFac: '',
+ affFacList: [
+ {
+ label: '闃�闂ˋ',
+ value: '1'
+ },
+ {
+ label: '闃�闂˙',
+ value: '2'
+ }
+ ]
},
- tabLabel: ''
+ fileChoChange: false
}
},
mounted () {
@@ -79,14 +105,11 @@
methods: {
// tab 鍒囨崲鐢ㄤ簬鍒ゆ柇
handleClick (tab) {
- // 鎺у埗绗笁灞傞〉闈� 绠＄嚎鍚嶇О/绠℃浠ｇ爜閫夋嫨椤甸潰
- if (tab.label === '绠℃瀹氫綅') {
- // 濡傛灉 鏄绾垮畾浣� 鏄剧ず涓夌骇闄勫睘妗� 杩涜閫夋嫨鏂囦欢鎿嶄綔
- eventBus.$emit('pipelineFile-choose', true)
- } else {
- // eles 涓嶈繘琛屾樉绀�
- eventBus.$emit('pipelineFile-choose', false)
- }
+ },
+ // 鐐瑰嚮鏂囦欢閫夋嫨 鏄剧ず绗笁绾ч〉闈� 杩涜绠＄嚎/娈甸�夋嫨
+ fileChoose () {
+ this.fileChoChange = !this.fileChoChange
+ eventBus.$emit('pipelineFile-choose', this.fileChoChange)
},
// 鐐瑰嚮纭鎸夐挳浜嬩欢
confirm () {
@@ -103,8 +126,9 @@
.side-box {
min-width: 1.94532rem;
- max-height: 1.343213rem;
+ max-width: 1.94532rem;
}
+
.click-location {
margin: 0 auto;
text-align: center;
@@ -119,28 +143,25 @@
}
}
- .line-pos {
- text-align: center;
- .el-input {
- width: 85%;
- }
- .line-pos-form {
- display: flex;
- }
- }
-
- .latlng-location {
+ .place {
text-align: center;
- .latlng-location-chose {
+ .place-top {
display: flex;
- align-content: center;
+ align-items: center;
justify-content: space-around;
+ .place-right {
+ .el-button {
+ margin: 15px;
+ }
+ }
}
- .el-input {
- width: 85%;
+ .place-bottom {
+ .el-button {
+ margin: 15px;
+ }
}
}
</style>
diff --git a/src/components/base-page/enterprise-emergency/ReportIncident.vue b/src/components/base-page/enterprise-emergency/ReportIncident.vue
index 1263a4c..85e6e8f 100644
--- a/src/components/base-page/enterprise-emergency/ReportIncident.vue
+++ b/src/components/base-page/enterprise-emergency/ReportIncident.vue
@@ -3,7 +3,7 @@
<div class="report-box map-background">
<div class="public-bounced-title panel-title">
<span>浜嬩欢涓婃姤</span>
- <i class="el-icon-close"></i>
+ <i class="el-icon-close" @click="circlePopup"></i>
</div>
<div class="form-popup">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="90px" class="search-form">
@@ -25,11 +25,8 @@
<!-- 浜嬩欢绛夌骇-->
<el-form-item label="浜嬩欢鍒嗙骇" prop="eventOfLevel">
<el-radio-group v-model="ruleForm.eventOfLevel">
-<!-- <el-radio v-for="(item,index) in ruleForm.eventOfLevelList" :label="item.value"-->
-<!-- :key="index">-->
-<!-- <span>{{ item.name }}</span>-->
-<!-- </el-radio>-->
- <el-col :span="8" v-for="(item,index) in ruleForm.eventOfLevelList" :key="index" :style="{margin:'5px 0'}">
+ <el-col :span="8" v-for="(item,index) in ruleForm.eventOfLevelList" :key="index"
+ :style="{margin:'5px 0'}">
<el-radio :label="item.value">
<span>{{ item.name }}</span>
</el-radio>
@@ -41,12 +38,12 @@
<el-col :span="12">
<el-form-item label="浜嬪彂鍗曚綅" prop="unit">
<el-select v-model="ruleForm.unit" placeholder="鍗曚綅,瑁呯疆閫夋嫨">
- <el-option
- v-for="item in ruleForm.unitList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-option
+ v-for="item in ruleForm.unitList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -123,7 +120,7 @@
</el-checkbox-group>
</el-form-item>
<!-- // 鎻忚堪 鎺ユ敹 灞曠ず銆侀殣钘�-->
- <div v-show="wayTo">
+ <div v-show="wayTo" class="way-to">
<el-form-item label="浜嬩欢鎻忚堪" prop="desc">
<el-input type="textarea" resize="none" v-model="ruleForm.desc"
placeholder="甯﹀嚭浜嬩欢绫诲瀷锛屼簨浠朵綅缃紝浜嬩欢鍗曚綅锛屼簨浠舵椂闂寸瓑瀛楁鑷姩鐢熶骇涓�閮ㄥ垎鎻忚堪">
@@ -376,6 +373,10 @@
})
this.eventsReported = false
},
+ // 鐐瑰嚮鍏抽棴 浜嬩欢涓婃姤
+ circlePopup () {
+ this.eventsReported = false
+ },
// form琛ㄥ崟鐨勫彇娑堟寜閽偣鍑讳簨浠� 閲嶇疆淇℃伅
resetForm (formName) {
this.$refs[formName].resetFields()
@@ -401,6 +402,12 @@
<style lang="less" scoped>
+ .way-to {
+ /deep/ .el-form-item__content {
+ display: flex;
+ }
+ }
+
/deep/ .form-popup {
margin: 0 15px;
}
@@ -415,6 +422,7 @@
.report-box {
min-width: 3.4674324rem;
max-width: 3.4674324rem;
+
.public-bounced-title {
display: flex;
align-items: center;
@@ -453,6 +461,10 @@
color: #00fff6 !important;
}
+ /deep/ .el-icon-time:before {
+ content: " ";
+ }
+
/deep/ input {
/*width: 145px;*/
border-radius: 0;
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 871474e..f8754f5 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -82,7 +82,6 @@
</div>
</div>
</el-scrollbar>
- <!-- <reportPopup></reportPopup>-->
</div>
</template>
@@ -97,7 +96,7 @@
export default {
name: 'EventQuery',
components: {
- // reportPopup
+ // DisposalEvent
},
data () {
return {
@@ -150,7 +149,7 @@
// info: this.info
}
},
- title: '澶勭疆浜嬩欢'
+ title: '浜嬩欢澶勭疆'
})
},
// radio鏁版嵁閫夋嫨
diff --git a/src/components/panel/topicSearch/sewers-select/analysis-choose/Tube.vue b/src/components/panel/topicSearch/sewers-select/analysis-choose/Tube.vue
index 9addf11..634c58a 100644
--- a/src/components/panel/topicSearch/sewers-select/analysis-choose/Tube.vue
+++ b/src/components/panel/topicSearch/sewers-select/analysis-choose/Tube.vue
@@ -34,7 +34,7 @@
label="缁堢偣缂栧彿"></el-table-column>
<el-table-column class-name="fixed-table" fixed="right" label="鎿嶄綔" width="40">
<template slot-scope="scope">
- <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button>
+ <el-button @click.once="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button>
</template>
</el-table-column>
</el-table>
@@ -73,13 +73,12 @@
})
},
methods: {
+ // 娓呴櫎鍔熻兘
handleClick () {
+ window.mapManager.clearHighlight()
this.clearLinkPipe()
- this.linkClear()
this.bgFm = []
this.bgPipeLine = []
- },
- linkClear () {
if (this.currentSelectStartLine != null) {
this.currentSelectStartLine.remove()
this.currentSelectStartLine = null
@@ -115,10 +114,14 @@
}
// 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
const res = await mapApi.findPipelineByClickPoint(param)
- console.log(res)
+ // console.log(res)
this.bgPipeLine = res.data
},
- // 娓呮鍒嗘瀽缁撴灉
+ // 鐖嗙 ===> 閫夋嫨绠℃
+ bgClick () {
+ this.selectPipeLine()
+ },
+ // 娓呴櫎缁撴灉
clearLinkPipe () {
if (this.linkPipeline.length > 0) {
this.linkPipeline.forEach((itm, idx) => {
@@ -131,10 +134,7 @@
this.currentSelectEndLine = null
}
},
- // 鐖嗙 ===> 閫夋嫨绠℃
- bgClick () {
- this.selectPipeLine()
- },
+ // 鐐瑰嚮閫夋嫨浜嬩欢
async bgSelect (e) {
// console.log('閫夋嫨鐖嗙绠℃')
// console.log(e)
@@ -175,17 +175,6 @@
}
res.data.reverse()
this.bgFm = res.data
- // console.log(res.data)
-
- this.bgPoint = res.data[0].startControlPoint
-
- // const point = JSON.parse(this.bgPoint.geomText)
- // const p = [point.coordinates[1], point.coordinates[0]]
- // this.bgMarker = this.createFlowMarker(p)
- // this.bgMarker = pulseEffect(p)
- // this.bgMarker.bindTooltip(this.bgPoint.pointnumbe)
- // this.bgMarker.addTo(window.map)
- // window.map.flyTo(p)
const linkPipe = []
res.data.forEach((itm, idx) => {
@@ -214,20 +203,17 @@
this.linkPipeline.push(line)
})
},
+ // 鐐瑰嚮瀹氫綅 鎵�鍦ㄨ鍒楄〃 鍔熻兘
bgFmClick (e) {
- // console.log('鐐瑰嚮褰卞搷鐨勯榾闂�')
- // console.log(e)
- // const point = [e.data[0][0], e.data[0][1]]
+ console.log(e)
+ // window.map.flyTo(point, 22)
const point = [e.startControlPoint.y, e.startControlPoint.x]
pulseEffect(point)
- // const marker = this.createFlowMarker(point)
- // marker.addTo(window.map)
- // window.map.flyTo(point, 17)
},
// 瀹氫綅鏂规硶浜嬩欢
linkResultSelect (e) {
// console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�')
- console.log(e)
+ // console.log(e)
const geom = JSON.parse(e.geomText)
if (this.currentSelectResultLine != null) {
this.currentSelectResultLine.remove()
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 7b19e8e..7910150 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -54,7 +54,7 @@
sname: '鎴祦闂�',
type: SERVICE_TYPE.WMS,
typeName: 'sewer:chokevalve',
- icon: 'sewers/.png',
+ icon: 'sewers/鎴祦闂�.png',
checked: false
},
{
@@ -64,7 +64,7 @@
minZoom: 16,
type: SERVICE_TYPE.WMS,
typeName: 'sewer:overflowweir',
- icon: 'sewers/.png',
+ icon: 'sewers/婧㈡祦鍫�.png',
checked: false
},
{
--
Gitblit v1.8.0