From 38fea8139670d34cedea336fbd1ba34fc92bcf02 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 22 四月 2021 21:34:59 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 32 ++++++--------------------------
1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 9c5005c..1d3e4d9 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -3,18 +3,14 @@
<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>
+ <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>
- <enterprise></enterprise>
+ <!-- <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>-->
@@ -28,8 +24,6 @@
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'
@@ -37,7 +31,7 @@
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 Enterprise from '../components/table/enterprise'
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
@@ -45,15 +39,13 @@
export default {
name: 'MapTemplate',
components: {
- Enterprise,
+ // Enterprise,
LegendPanel,
// MenuSpecial,
ToolBoxPanel,
// TopEnterprisePanel,
SgisLayerController,
MonitorPanel,
- LcBasemap,
- LcServiceLayer,
Popup,
summarySheets,
PublicBounced
@@ -98,16 +90,12 @@
L: window.L,
map: this.map
})
- layerFactory.init()
+ 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)
@@ -119,7 +107,6 @@
// this.setBasemapHelper(this.basemapHelper)
// this.setServiceLayerHelper(this.serviceLayerHelper)
// this.setVectorLayerHelper(this.vectorLayerHelper)
- this.addMarker()
},
onLayerClick () {
this.$refs.popup.setShow()
@@ -143,13 +130,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