From 0039429882f8434000a0f61d6995324f1589633a Mon Sep 17 00:00:00 2001 From: seatonwan9 <seatonwan9@163.com> Date: 星期日, 30 五月 2021 13:36:06 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue index 8eb966e..c1b30ae 100644 --- a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue +++ b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue @@ -66,7 +66,7 @@ <i class="state"></i> <div> <h3> - <span @click="disposalfx">浠跺悕绉�:XXX浜嬩欢</span> + <span @click="disposalfx">浜嬩欢鍚嶇О:XXX浜嬩欢</span> <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="startAnalysis"> <span>寮�濮嬪垎鏋�</span> @@ -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' @@ -158,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({ @@ -182,7 +173,7 @@ // info: this.info } }, - title: '浜嬩欢澶勭疆' + title: '浜嬩欢淇℃伅' }) }, // radio鏁版嵁閫夋嫨 -- Gitblit v1.8.0