From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 77b0263..8df379d 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 () {
@@ -156,6 +158,11 @@
// 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
// eventBus.$emit('disposal-analysis', true)
+
+ },
+ // 寮�濮嬪垎鏋�
+ startAnalysis () {
+ // eventBus.$emit('start-analysis', true)
window.$layer.open({
content: {
comp: EventHandling, // 缁勪欢
@@ -167,21 +174,17 @@
title: '浜嬩欢澶勭疆'
})
},
- // 寮�濮嬪垎鏋�
- startAnalysis () {
- eventBus.$emit('start-analysis', true)
- },
disposalfx () {
- window.$layer.open({
- content: {
- comp: DisposalEvent, // 缁勪欢
- parent: this, // 鐖剁粍浠�
- data: { // 浼犻�掔殑鍙傛暟
- // info: this.info
- }
- },
- title: '浜嬩欢澶勭疆'
- })
+ // window.$layer.open({
+ // content: {
+ // comp: DisposalEvent, // 缁勪欢
+ // parent: this, // 鐖剁粍浠�
+ // data: { // 浼犻�掔殑鍙傛暟
+ // // info: this.info
+ // }
+ // },
+ // title: '浜嬩欢澶勭疆'
+ // })
},
// radio鏁版嵁閫夋嫨
redioChange (item) {
--
Gitblit v1.8.0