From 63436d545b7e8be49dd23c0e0dcb2a42dcd4f4d4 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期六, 29 五月 2021 10:21:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index 8eb966e..cbe1309 100644
--- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
@@ -108,7 +108,7 @@
 // import WfsHelper from '@components/helpers/WfsHelper'
 // import AjaxUtils from '@utils/AjaxUtils'
 
-import DisposalEvent from '../../../base-page/enterprise-emergency/DisposalEvent'
+// 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 '../../../base-page/enterprise-emergency/events-reported/EventsReported'
@@ -158,6 +158,11 @@
     // 鐐瑰嚮浜嬩欢绠$悊
     accordPopup () {
       // eventBus.$emit('disposal-analysis', true)
+
+    },
+    // 寮�濮嬪垎鏋�
+    startAnalysis () {
+      // eventBus.$emit('start-analysis', true)
       window.$layer.open({
         content: {
           comp: EventHandling, // 缁勪欢
@@ -169,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