From 468e07894ce1d60aaeec91440504a48a41d20410 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期四, 27 五月 2021 09:30:00 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 80 +++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 1d1c7a2..a03f2b8 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -32,9 +32,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
- <el-row>
- <el-button type="primary" small @click="dialogVisible = !dialogVisible">浜嬩欢涓婃姤</el-button>
- </el-row>
+ <el-button type="primary" small @click="dialogVisibleChange">浜嬩欢涓婃姤</el-button>
<div class="page_total">
<p>鍏辫
<span>{{total}}</span>
@@ -71,7 +69,8 @@
<div>
<h3>
<span @click="disposalfx">浠跺悕绉�:XXX浜嬩欢</span>
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="startAnalysis">
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
+ @click="startAnalysis">
<span>寮�濮嬪垎鏋�</span>
</el-button>
</h3>
@@ -85,16 +84,15 @@
<p>浜嬩欢绫诲瀷锛�<span>妯℃嫙绠＄嚎浜嬩欢</span>
<el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
@click="accordPopup()">
- <span>浜嬩欢绠＄悊</span>
+ <span>浜嬩欢澶勭疆</span>
</el-button>
</p>
</div>
</div>
</el-scrollbar>
-<!-- :show-close="false"-->
<div class="event-report">
<el-dialog
- custom-class="event-report-dialog"
+ custom-class="event-report"
title="浜嬩欢涓婃姤"
:visible.sync="dialogVisible"
:append-to-body="true"
@@ -102,26 +100,6 @@
v-dialogDragBottom
>
<EventsReported></EventsReported>
- </el-dialog>
- <el-dialog
- custom-class="event-report-dialog"
- title="閫夋嫨椤哄簭"
- :visible.sync="dialogVisible"
- :append-to-body="true"
- :modal="false"
- v-dialogDragBottom
- >
- <span>local閫夋嫨</span>
- </el-dialog>
- <el-dialog
- custom-class="event-report-dialog"
- title="鏂囦欢閫夋嫨"
- :visible.sync="dialogVisible"
- :append-to-body="true"
- :modal="false"
- v-dialogDragBottom
- >
- <span>file</span>
</el-dialog>
</div>
</div>
@@ -133,14 +111,13 @@
// import AjaxUtils from '@utils/AjaxUtils'
import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
+import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling'
import eventBus from '../../../../eventBus'
-
import EventsReported from '../../../../components/base-page/enterprise-emergency/EventsReported'
export default {
name: 'EventQuery',
components: {
- // DisposalEvent
EventsReported
},
data () {
@@ -150,10 +127,6 @@
list: [],
total: 0,
activeNum: -1,
- LayerEvent: {},
- LayerResources: {},
- // items: [LayerEvent, LayerResources],
- // subItems: LayerEntEmer.layers,
items: [],
subItems: [],
form: {
@@ -179,9 +152,22 @@
// this.wfsHelper = new WfsHelper()
},
methods: {
+ dialogVisibleChange () {
+ this.dialogVisible = !this.dialogVisible
+ },
// 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
- eventBus.$emit('disposal-analysis', true)
+ // eventBus.$emit('disposal-analysis', true)
+ window.$layer.open({
+ content: {
+ comp: EventHandling, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ // info: this.info
+ }
+ },
+ title: '浜嬩欢澶勭疆'
+ })
},
// 寮�濮嬪垎鏋�
startAnalysis () {
@@ -236,13 +222,25 @@
</script>
<style lang="less" scoped>
- .event-report {
- display: flex;
- }
- /*/deep/ .el-row {*/
- /* text-align: right;*/
+ /*.event-report {*/
+ /*/deep/ .el-dialog--center {*/
+ /* !*left: 2rem !important;*!*/
+ /* margin-left: 3rem !important;*/
+ /* margin-top: 0.33979rem !important;*/
+ /* !*bottom: 0 !important;*!*/
/*}*/
- /deep/ .el-dialog {
- width: 30%;
+
+ /deep/ .event-report {
+ /*margin-left: 3rem !important;*/
+ /*margin-top: 0.33979rem !important;*/
}
+
+ //}
+ /*.event-report {*/
+ /deep/ .el-dialog {
+ /*width: 30%;*/
+ width: 550px;
+ }
+
+ /*}*/
</style>
--
Gitblit v1.8.0