From 38bcd6306f20787e394347a34e50fcf80b265fc6 Mon Sep 17 00:00:00 2001 From: 陈泽平 <chenzeping> Date: 星期一, 31 五月 2021 14:53:35 +0800 Subject: [PATCH] 企业应急-事件上报-事发位置问题修改 --- src/views/MapTemplate.vue | 60 ++++++++++++++++++++++++++---------------------------------- 1 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue index 1b70723..56d30b8 100644 --- a/src/views/MapTemplate.vue +++ b/src/views/MapTemplate.vue @@ -1,6 +1,6 @@ <template> <div class="full-screen"> - <popup ref="popup" @callPopup="callPopup"></popup> + <!--<popup ref="popup" @callPopup="callPopup"></popup>--> <div id="map" ref="rootmap"> </div> <sgis-layer-controller></sgis-layer-controller> @@ -9,13 +9,11 @@ <tool-box-panel ref="toolBox"></tool-box-panel> <!-- <menu-special></menu-special>--> <legend-panel></legend-panel> - <summary-sheets></summary-sheets> - <!-- <enterprise></enterprise> --> - <!-- <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>--> - <!-- <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> + <!-- <summary-sheets></summary-sheets>--> + <SummarySheet></SummarySheet> + <Emergency ref="Emergency"></Emergency> + <Message></Message> + <event-handling></event-handling> </div> </template> @@ -26,19 +24,20 @@ import SgisLayerController from '@components/LayerController/LayerController' import MonitorPanel from '@components/panel/RightSearchPanel' // import TopEnterprisePanel from '@components/panel/TopEnterprisePanel' -import summarySheets from '@components/table/summarySheets.vue' +// import summarySheets from '@components/table/summarySheets.vue'SummarySheet +import SummarySheet from '@components/table/summarySheets' import ToolBoxPanel from '@components/panel/ToolBoxPanel' -import Popup from '@views/popup/Popup' -// import MenuSpecial from '@components/panel/MenuTopic' import LegendPanel from '@components/panel/LegendPanel' -// import Enterprise from '../components/table/enterprise' -// // 鍏叡灞曠ず鏁版嵁 -import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced' import LayerFactory from '@components/LayerController/service/LayerFactory' +import Emergency from '@components/emergency/index' +import MapManager from '../components/helpers/MapManager' +import Message from '@components/message/index' +import EventHandling from '../components/base-page/enterprise-emergency/event-handling/EventHandling' export default { name: 'MapTemplate', components: { + EventHandling, // Enterprise, LegendPanel, // MenuSpecial, @@ -46,9 +45,10 @@ // TopEnterprisePanel, SgisLayerController, MonitorPanel, - Popup, - summarySheets, - PublicBounced + // summarySheets, + SummarySheet, + Emergency, + Message }, data () { return { @@ -86,12 +86,6 @@ this.$refs.toolBox.map = this.map window.popupComp = this.$refs.popup - var layerFactory = new LayerFactory({ - L: window.L, - map: this.map - }) - layerFactory.init(this.$store.state.map.serviceLayers.LayerSewersLine) - window.layerFactory = layerFactory this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜 this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘 @@ -100,15 +94,20 @@ // this.AddGasHelper() // this.ChangeWaterState() - + var layerFactory = new LayerFactory({ + L: window.L, + map: this.map + }) + 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) // this.setServiceLayerHelper(this.serviceLayerHelper) // this.setVectorLayerHelper(this.vectorLayerHelper) - }, - onLayerClick () { - this.$refs.popup.setShow() }, callPopup (val) { console.log(val) @@ -129,13 +128,6 @@ position: absolute; top: 88px; left: 88px; - z-index: 999; -} - -.Waste-water { - position: absolute; - top: 88px; - left: 280px; z-index: 999; } -- Gitblit v1.8.0