From a312e0dd96d8f7e96fb3341f1a55561b12394405 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 12:29:48 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e1f0749..33cb9b6 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -20,6 +20,8 @@
<ReportIncident></ReportIncident>
<Emergency ref="Emergency"></Emergency>
<Message></Message>
+ <EventsReported></EventsReported>
+ <event-handling></event-handling>
</div>
</template>
@@ -39,14 +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,
@@ -59,7 +64,8 @@
// PublicBounced,
Emergency,
Message,
- ReportIncident
+ ReportIncident,
+ EventsReported
},
data () {
return {
--
Gitblit v1.8.0