From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue b/src/components/panel/topicSearch/enterprise-emergency/EventQuery.vue
index cbe1309..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>
@@ -108,8 +108,8 @@
// import WfsHelper from '@components/helpers/WfsHelper'
// 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 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'
@@ -162,29 +162,19 @@
},
// 寮�濮嬪垎鏋�
startAnalysis () {
- // eventBus.$emit('start-analysis', true)
+ eventBus.$emit('event-handling', {})
+ },
+ disposalfx () {
window.$layer.open({
content: {
- comp: EventHandling, // 缁勪欢
+ comp: DisposalEvent, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
// info: this.info
}
},
- title: '浜嬩欢澶勭疆'
+ title: '浜嬩欢淇℃伅'
})
- },
- disposalfx () {
- // window.$layer.open({
- // content: {
- // comp: DisposalEvent, // 缁勪欢
- // parent: this, // 鐖剁粍浠�
- // data: { // 浼犻�掔殑鍙傛暟
- // // info: this.info
- // }
- // },
- // title: '浜嬩欢澶勭疆'
- // })
},
// radio鏁版嵁閫夋嫨
redioChange (item) {
--
Gitblit v1.8.0