From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/views/MapTemplate.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 234f7e0..d5d363d 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -17,9 +17,10 @@
<!-- <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
<!-- <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
<!-- <PublicBounced ref="PublicBounced"></PublicBounced>-->
- <ReportPopup></ReportPopup>
+ <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 ReportPopup from '../components/panel/topicSearch/EnterpriseEmergency/ReportPopup'
+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/EventsReported'
export default {
name: 'MapTemplate',
@@ -59,7 +61,8 @@
// PublicBounced,
Emergency,
Message,
- ReportPopup
+ ReportIncident,
+ EventsReported
},
data () {
return {
--
Gitblit v1.8.0