From 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 12:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/views/MapTemplate.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index cfd9a1c..33cb9b6 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -21,6 +21,7 @@
<Emergency ref="Emergency"></Emergency>
<Message></Message>
<EventsReported></EventsReported>
+ <event-handling></event-handling>
</div>
</template>
@@ -40,15 +41,17 @@
// // 鍏叡灞曠ず鏁版嵁
// import PublicBounced from '@components/base-page/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
-import ReportIncident from '../components/base-page/enterprise-emergency/ReportIncident'
+import ReportIncident from '../components/base-page/enterprise-emergency/discard/ReportIncident'
import Emergency from '@components/emergency/index'
import MapManager from '../components/helpers/MapManager'
import Message from '@components/message/index'
import EventsReported from '../components/base-page/enterprise-emergency/events-reported/EventsReported'
+import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling'
export default {
name: 'MapTemplate',
components: {
+ EventHandling,
// Enterprise,
LegendPanel,
// MenuSpecial,
--
Gitblit v1.8.0