~xingchuan/SewerAndRainNetwork.git

			@@ -15,7 +15,6 @@
			<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>
			@@ -42,9 +41,9 @@
			import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
			import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
			import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
			// import PopupGas from '@/components/flueGas/popup-gas'
			// // 公共展示数据
			import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'

			export default {
			name: 'MapTemplate',
			components: {
			@@ -59,13 +58,10 @@
			LcServiceLayer,
			Popup,
			summarySheets,
			// SolidContent,
			// PopupGas,
			PublicBounced
			},
			data () {
			return {
			// isShowBtn: false,
			map: null,
			lcServiceLayerVisible: false,
			basemapHelper: {},
			@@ -134,9 +130,6 @@
			AddWasteWater.requestData(data)
			AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
			},
			// isShowHidden () {
			// this.isShowBtn = !this.isShowBtn
			// },
			saveMapStatus () {
			window.serviceLayerHelper = this.serviceLayerHelper
			this.$store.commit('setMapObj', this.map)
			@@ -151,12 +144,17 @@
			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()
			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.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)