From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 20 五月 2021 18:05:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index a4bfcc5..234f7e0 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -17,7 +17,7 @@
<!-- <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>-->
+ <ReportPopup></ReportPopup>
<Emergency ref="Emergency"></Emergency>
<Message></Message>
</div>
@@ -39,7 +39,7 @@
// // 鍏叡灞曠ず鏁版嵁
// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
-// import ReportPopup from '../components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup'
+import ReportPopup from '../components/panel/topicSearch/EnterpriseEmergency/ReportPopup'
import Emergency from '@components/emergency/index'
import MapManager from '../components/helpers/MapManager'
import Message from '@components/message/index'
@@ -58,8 +58,8 @@
SummarySheet,
// PublicBounced,
Emergency,
- Message
- // ReportPopup
+ Message,
+ ReportPopup
},
data () {
return {
--
Gitblit v1.8.0