From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/views/MapTemplate.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 7c44afe..cfd9a1c 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -20,6 +20,7 @@
<ReportIncident></ReportIncident>
<Emergency ref="Emergency"></Emergency>
<Message></Message>
+ <EventsReported></EventsReported>
</div>
</template>
@@ -37,12 +38,13 @@
import LegendPanel from '@components/panel/LegendPanel'
// import Enterprise from '../components/table/enterprise'
// // 鍏叡灞曠ず鏁版嵁
-// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+// import PublicBounced from '@components/base-page/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
-import ReportIncident from '../components/panel/topicSearch/EnterpriseEmergency/ReportIncident'
+import ReportIncident from '../components/base-page/enterprise-emergency/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'
export default {
name: 'MapTemplate',
@@ -59,7 +61,8 @@
// PublicBounced,
Emergency,
Message,
- ReportIncident
+ ReportIncident,
+ EventsReported
},
data () {
return {
--
Gitblit v1.8.0