From 9f5456f88b8397ffbab1ad80331aaa834c15d882 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期一, 17 五月 2021 17:19:52 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 2b070d3..e568cfc 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -16,7 +16,7 @@
<!-- <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>
@@ -36,11 +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'
+import MapManager from '../components/helpers/MapManager'
export default {
name: 'MapTemplate',
@@ -54,7 +54,7 @@
MonitorPanel,
// summarySheets,
SummarySheet,
- PublicBounced,
+ // PublicBounced,
Emergency
// ReportPopup
},
@@ -102,10 +102,6 @@
// this.AddGasHelper()
// this.ChangeWaterState()
-
- var eventHandler = new EventHandler()
- window.eventHandler = eventHandler
-
var layerFactory = new LayerFactory({
L: window.L,
map: this.map
@@ -113,6 +109,8 @@
layerFactory.init(this.$store.state.map.serviceLayers.LayerSewersLine)
layerFactory.initEvent(this.$store.state.map.serviceLayers.LayerSewersLine)
window.layerFactory = layerFactory
+ window.mapManager = new MapManager()
+ window.mapManager.mapClickListener()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
// this.setBasemapHelper(this.basemapHelper)
--
Gitblit v1.8.0