From bbce81a396e22743b1fbf0c54fed05ab79c99e72 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期六, 29 五月 2021 16:28:51 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 161 +++++++++++++++++++++++++++++------------------------
1 files changed, 87 insertions(+), 74 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index d0bffe7..33cb9b6 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -1,23 +1,28 @@
<template>
- <div class="full-screen">
- <!--<popup ref="popup" @callPopup="callPopup"></popup>-->
- <div id="map" ref="rootmap">
+ <div class="full-screen">
+ <!--<popup ref="popup" @callPopup="callPopup"></popup>-->
+ <div id="map" ref="rootmap">
+ </div>
+ <sgis-layer-controller></sgis-layer-controller>
+ <monitor-panel></monitor-panel>
+ <!-- <top-enterprise-panel></top-enterprise-panel>-->
+ <tool-box-panel ref="toolBox"></tool-box-panel>
+ <!-- <menu-special></menu-special>-->
+ <legend-panel></legend-panel>
+ <!-- <summary-sheets></summary-sheets>-->
+ <SummarySheet></SummarySheet>
+ <!-- <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>-->
+ <ReportIncident></ReportIncident>
+ <Emergency ref="Emergency"></Emergency>
+ <Message></Message>
+ <EventsReported></EventsReported>
+ <event-handling></event-handling>
</div>
- <sgis-layer-controller></sgis-layer-controller>
- <monitor-panel></monitor-panel>
- <!-- <top-enterprise-panel></top-enterprise-panel>-->
- <tool-box-panel ref="toolBox"></tool-box-panel>
- <!-- <menu-special></menu-special>-->
- <legend-panel></legend-panel>
-<!-- <summary-sheets></summary-sheets>-->
- <SummarySheet></SummarySheet>
- <!-- <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>
- </div>
</template>
<script>
@@ -27,20 +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 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,
@@ -50,7 +61,11 @@
MonitorPanel,
// summarySheets,
SummarySheet,
- PublicBounced
+ // PublicBounced,
+ Emergency,
+ Message,
+ ReportIncident,
+ EventsReported
},
data () {
return {
@@ -96,10 +111,6 @@
// this.AddGasHelper()
// this.ChangeWaterState()
-
- var eventHandler = new EventHandler()
- window.eventHandler = eventHandler
-
var layerFactory = new LayerFactory({
L: window.L,
map: this.map
@@ -107,6 +118,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)
@@ -121,59 +134,59 @@
</script>
<style lang="less">
-.flue-gas {
- position: fixed;
- top: 88px;
- left: 180px;
- z-index: 500;
-}
+ .flue-gas {
+ position: fixed;
+ top: 88px;
+ left: 180px;
+ z-index: 500;
+ }
-.solid-waste {
- position: absolute;
- top: 88px;
- left: 88px;
- z-index: 999;
-}
+ .solid-waste {
+ position: absolute;
+ top: 88px;
+ left: 88px;
+ z-index: 999;
+ }
-.full-screen {
- width: 100%;
- height: 100%;
- margin: 0;
- padding: 0;
- position: absolute;
+ .full-screen {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ position: absolute;
- #map {
- height: 100%;
- width: 100%;
- }
+ #map {
+ height: 100%;
+ width: 100%;
+ }
- .barline {
- //width: 100%;
- //height: 1px;
- //background-color: #0661AE;
- border-top: 1px solid #0661AE;
- }
+ .barline {
+ //width: 100%;
+ //height: 1px;
+ //background-color: #0661AE;
+ border-top: 1px solid #0661AE;
+ }
- #map-btn {
- position: fixed;
- top: 20px;
- left: 100px;
- z-index: 9999;
- }
+ #map-btn {
+ position: fixed;
+ top: 20px;
+ left: 100px;
+ z-index: 9999;
+ }
- .leaflet-custom-icon {
- background: white;
- }
+ .leaflet-custom-icon {
+ background: white;
+ }
- .leaflet-marker-icon {
- background: none;
- }
+ .leaflet-marker-icon {
+ background: none;
+ }
- #migic {
- width: 48px;
- height: 48px;
- margin: -18px -20px;
- z-index: 999;
- }
-}
+ #migic {
+ width: 48px;
+ height: 48px;
+ margin: -18px -20px;
+ z-index: 999;
+ }
+ }
</style>
--
Gitblit v1.8.0