From c56e506fd34c58209240e97fc29043639fae5d19 Mon Sep 17 00:00:00 2001 From: ChenZeping <chenzeping> Date: 星期四, 29 四月 2021 15:13:21 +0800 Subject: [PATCH] 统计表,指标,预报警表格弹框公共修改,管线分析功能 --- src/views/MapTemplate.vue | 175 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 101 insertions(+), 74 deletions(-) diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue index ab4cb1e..10ad517 100644 --- a/src/views/MapTemplate.vue +++ b/src/views/MapTemplate.vue @@ -1,18 +1,23 @@ <template> - <div class="full-screen"> - <popup ref="popup" @callPopup="callPopup"></popup> - <div id="map" ref="rootmap"> - </div> - <sgis-layer-controller :preset="'warningPreset'"> - <lc-basemap></lc-basemap> - <!-- <div class="barline"></div>--> - <lc-service-layer class="barline" v-if="lcServiceLayerVisible"></lc-service-layer> - </sgis-layer-controller> - <monitor-panel></monitor-panel> -<!-- <top-enterprise-panel></top-enterprise-panel>--> - <tool-box-panel></tool-box-panel> - <menu-special></menu-special> + <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> + </div> </template> <script> @@ -20,25 +25,33 @@ import Sgis from '@src/Sgis' // import mapConfig from '@/conf/MapConfig' import SgisLayerController from '@components/LayerController/LayerController' -import LcBasemap from '@components/LayerController/modules/LcBaseMap' -import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer' 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 ToolBoxPanel from '@components/panel/ToolBoxPanel' import Popup from '@views/popup/Popup' -import MenuSpecial from '@components/panel/MenuTopic' +// 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' export default { name: 'MapTemplate', components: { - MenuSpecial, + // Enterprise, + LegendPanel, + // MenuSpecial, ToolBoxPanel, // TopEnterprisePanel, SgisLayerController, MonitorPanel, - LcBasemap, - LcServiceLayer, - Popup + Popup, + // summarySheets, + SummarySheet, + PublicBounced }, data () { return { @@ -46,7 +59,8 @@ lcServiceLayerVisible: false, basemapHelper: {}, serviceLayerHelper: {}, - vectorLayerHelper: {} + vectorLayerHelper: {}, + toolBoxVisible: false } }, computed: { @@ -72,52 +86,30 @@ init () { const mapcontainer = this.$refs.rootmap this.map = Sgis.initMap(mapcontainer) + 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) + layerFactory.initEvent(this.$store.state.map.serviceLayers.LayerSewersLine) + window.layerFactory = layerFactory this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜 this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘 - - this.serviceLayerHelper = Sgis.initTileLayersHelper(this.map) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵� - console.log(this.$refs.popup.$el) - this.serviceLayerHelper.initServiceLayers(this.config, this.$refs.popup) - this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵� this.vectorLayerHelper.initVectorLayers(this.config) + + // this.AddGasHelper() + // this.ChangeWaterState() this.saveMapStatus() // this.setMapObj(this.mapObj) // this.setBasemapHelper(this.basemapHelper) // this.setServiceLayerHelper(this.serviceLayerHelper) // this.setVectorLayerHelper(this.vectorLayerHelper) - this.addMarker() - }, - addMarker () { - const L = this.L - var icon = new L.Icon({ - iconUrl: 'assets/images/map/marker-icon.png', - shadowUrl: 'assets/images/map/marker-shadow.png', - iconSize: [25, 41], - iconAnchor: [12, 41], - popupAnchor: [1, -34], - shadowSize: [41, 41] - }) - var marker = L.marker([32.2221, 118.7843], { - icon: icon - }).addTo(this.map) - .bindPopup(() => this.$refs.popup.$el, { - className: 's-map-popup', - minWidth: 300, - closeButton: false, - autoClose: false - }) - .bindTooltip('瀛椾綋鍏夋檿鏁堟灉t.', { - // permanent : true, - offset: [0, 0], // 鍋忕Щ - direction: 'right', // 鏀剧疆浣嶇疆 - // sticky:true,//鏄惁鏍囪鍦ㄧ偣涓婇潰 - className: 'anim-tooltip'// CSS鎺у埗 - }) - - marker.on('popupopen', this.onLayerClick) }, onLayerClick () { this.$refs.popup.setShow() @@ -130,24 +122,59 @@ </script> <style lang="less"> +.flue-gas { + position: fixed; + top: 88px; + left: 180px; + z-index: 500; +} - .full-screen { - width: 100%; - height: 100%; - margin: 0; - padding: 0; - position: absolute; +.solid-waste { + position: absolute; + top: 88px; + left: 88px; + z-index: 999; +} - #map { - height: 100%; - width: 100%; - } +.full-screen { + width: 100%; + height: 100%; + margin: 0; + padding: 0; + position: absolute; - .barline { - //width: 100%; - //height: 1px; - //background-color: #0661AE; - border-top: 1px solid #0661AE; - } - } -</style>> + #map { + height: 100%; + width: 100%; + } + + .barline { + //width: 100%; + //height: 1px; + //background-color: #0661AE; + border-top: 1px solid #0661AE; + } + + #map-btn { + position: fixed; + top: 20px; + left: 100px; + z-index: 9999; + } + + .leaflet-custom-icon { + background: white; + } + + .leaflet-marker-icon { + background: none; + } + + #migic { + width: 48px; + height: 48px; + margin: -18px -20px; + z-index: 999; + } +} +</style> -- Gitblit v1.8.0