From dabe6f1b9544223604ce533edfa1710c415a8121 Mon Sep 17 00:00:00 2001
From: 陈泽平 <qibolin02429@126.com>
Date: 星期五, 14 五月 2021 16:26:05 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork 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 23d4259..ad0d425 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -16,8 +16,9 @@
<!-- <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>-->
<!-- <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>
+<!-- <PublicBounced ref="PublicBounced"></PublicBounced>-->
<!-- <ReportPopup></ReportPopup>-->
+ <Emergency ref="Emergency"></Emergency>
</div>
</template>
@@ -35,10 +36,11 @@
import LegendPanel from '@components/panel/LegendPanel'
// import Enterprise from '../components/table/enterprise'
// // 鍏叡灞曠ず鏁版嵁
-import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
import EventHandler from '../components/LayerController/event/EventHandler'
// import ReportPopup from '../components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup'
+import Emergency from '@components/emergency/index'
export default {
name: 'MapTemplate',
@@ -52,7 +54,8 @@
MonitorPanel,
// summarySheets,
SummarySheet,
- PublicBounced
+ // PublicBounced,
+ Emergency
// ReportPopup
},
data () {
--
Gitblit v1.8.0