From 5d3cafca01c6ad878d51533b955b530e12f9d99a Mon Sep 17 00:00:00 2001 From: XingChuan <m17600301067@163.com> Date: 星期一, 31 五月 2021 11:38:44 +0800 Subject: [PATCH] 风险源弹框UI优化 --- src/views/MapTemplate.vue | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue index 67a6523..33cb9b6 100644 --- a/src/views/MapTemplate.vue +++ b/src/views/MapTemplate.vue @@ -17,8 +17,11 @@ <!-- <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> + <event-handling></event-handling> </div> </template> @@ -29,23 +32,26 @@ 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 SummarySheet from '@components/table/SummarySheet' +// import summarySheets from '@components/table/summarySheets.vue'SummarySheet +import SummarySheet from '@components/table/summarySheets' import ToolBoxPanel from '@components/panel/ToolBoxPanel' // 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 PublicBounced from '@components/base-page/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 ReportIncident from '../components/base-page/enterprise-emergency/discard/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/events-reported/EventsReported' +import EventHandling from '@components/base-page/enterprise-emergency/event-handling/EventHandling' export default { name: 'MapTemplate', components: { + EventHandling, // Enterprise, LegendPanel, // MenuSpecial, @@ -56,8 +62,10 @@ // summarySheets, SummarySheet, // PublicBounced, - Emergency - // ReportPopup + Emergency, + Message, + ReportIncident, + EventsReported }, data () { return { @@ -103,10 +111,6 @@ // this.AddGasHelper() // this.ChangeWaterState() - - var eventHandler = new EventHandler() - window.eventHandler = eventHandler - var layerFactory = new LayerFactory({ L: window.L, map: this.map @@ -115,6 +119,7 @@ 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