From bbce81a396e22743b1fbf0c54fed05ab79c99e72 Mon Sep 17 00:00:00 2001 From: 陈泽平 <chenzeping> Date: 星期六, 29 五月 2021 16:28:51 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue index 77b0263..860f6e1 100644 --- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue +++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue @@ -109,7 +109,7 @@ // 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 EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling' import eventBus from '../../../../eventBus' import EventsReported from '../../../base-page/enterprise-emergency/events-reported/EventsReported' @@ -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,20 +158,11 @@ // 鐐瑰嚮浜嬩欢绠$悊 accordPopup () { // eventBus.$emit('disposal-analysis', true) - window.$layer.open({ - content: { - comp: EventHandling, // 缁勪欢 - parent: this, // 鐖剁粍浠� - data: { // 浼犻�掔殑鍙傛暟 - // info: this.info - } - }, - title: '浜嬩欢澶勭疆' - }) + }, // 寮�濮嬪垎鏋� startAnalysis () { - eventBus.$emit('start-analysis', true) + eventBus.$emit('event-handling', {}) }, disposalfx () { window.$layer.open({ @@ -180,7 +173,7 @@ // info: this.info } }, - title: '浜嬩欢澶勭疆' + title: '浜嬩欢淇℃伅' }) }, // radio鏁版嵁閫夋嫨 -- Gitblit v1.8.0