From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 8934696..e76118d 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -32,6 +32,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
+ <el-button type="primary" small @click="dialogVisibleChange">浜嬩欢涓婃姤</el-button>
<div class="page_total">
<p>鍏辫
<span>{{total}}</span>
@@ -68,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>
@@ -88,6 +90,21 @@
</div>
</div>
</el-scrollbar>
+ <div class="event-report">
+ <el-dialog
+ custom-class="el-dialog--center"
+ title="浜嬩欢涓婃姤"
+ :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDragBottom
+ >
+ <EventsReported></EventsReported>
+ </el-dialog>
+ </div>
+<!-- <Dialog ref="EReported" title="浜嬩欢涓婃姤2">-->
+<!-- <EventsReported></EventsReported>-->
+<!-- </Dialog>-->
</div>
</template>
@@ -98,22 +115,23 @@
import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
import eventBus from '../../../../eventBus'
+import EventsReported from '../../../../components/base-page/enterprise-emergency/EventsReported'
+
+// import Dialog from '../../../../views/popup/Dialog'
export default {
name: 'EventQuery',
components: {
- // DisposalEvent
+ // Dialog,
+ EventsReported
},
data () {
return {
+ dialogVisible: false,
reportIncident: false,
list: [],
total: 0,
activeNum: -1,
- LayerEvent: {},
- LayerResources: {},
- // items: [LayerEvent, LayerResources],
- // subItems: LayerEntEmer.layers,
items: [],
subItems: [],
form: {
@@ -139,6 +157,9 @@
// this.wfsHelper = new WfsHelper()
},
methods: {
+ dialogVisibleChange () {
+ this.dialogVisible = !this.dialogVisible
+ },
// 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
eventBus.$emit('disposal-analysis', true)
@@ -196,4 +217,18 @@
</script>
<style lang="less" scoped>
+ /*.event-report {*/
+ /deep/ .el-dialog--center {
+ /*left: 2rem !important;*/
+ margin-left: 2rem !important;
+ margin-top: 0.73979rem !important;
+ /*bottom: 0 !important;*/
+ }
+ //}
+ /*.event-report {*/
+ /deep/ .el-dialog {
+ /*width: 30%;*/
+ width: 550px;
+ }
+ /*}*/
</style>
--
Gitblit v1.8.0