~xingchuan/SewerAndRainNetwork.git

			@@ -17,7 +17,10 @@
			<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>
			<PublicBounced ref="PublicBounced"></PublicBounced>
			<!-- <SolidContent ref="SolidWastePopup"></SolidContent>-->
			<el-button type="primary" @click="AddGasHelper" class="flue-gas">废气</el-button>
			<popup-gas ref="FlueGas"></popup-gas>
			<public-bouncedounced ref="PublicBounced"></public-bouncedounced>
			</div>
			</template>

			@@ -38,8 +41,12 @@
			import Enterprise from '../components/table/enterprise'
			// 底图业务js逻辑
			import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
			// 公共展示数据
			import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
			// import SolidContent from '@components/SolidWaste/SolidContent'
			// 废气
			import AddGasHelper from '@components/flueGas/flueGas'
			import PopupGas from '@/components/flueGas/popup-gas'
			// // 公共展示数据
			// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'

			export default {
			name: 'MapTemplate',
			@@ -55,7 +62,9 @@
			LcServiceLayer,
			Popup,
			summarySheets,
			PublicBounced
			// SolidContent,
			PopupGas
			// PublicBounced
			},
			data () {
			return {
			@@ -78,6 +87,11 @@
			})
			},
			methods: {
			AddGasHelper () {
			const AddGas = new AddGasHelper({ map: this.map })
			AddGas.requestData()
			AddGas.SetPlueGasContent(this.config, this.$refs.FlueGas)
			},
			ChangeState () {
			const data = {
			companyId: 3900100145,
			@@ -89,9 +103,6 @@
			const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
			AddSolidWaste.requestData(data)
			AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
			},
			isShowHidden () {
			this.isShowBtn = !this.isShowBtn
			},
			saveMapStatus () {
			window.serviceLayerHelper = this.serviceLayerHelper
			@@ -118,6 +129,7 @@
			this.vectorLayerHelper.initVectorLayers(this.config)

			// this.ChangeState()
			// this.AddGasHelper()

			this.saveMapStatus()
			// this.setMapObj(this.mapObj)
			@@ -166,7 +178,12 @@
			</script>

			<style lang="less">

			.flue-gas {
			position:fixed;
			top: 88px;
			left: 180px;
			z-index: 500;
			}
			.solid-waste {
			position: absolute;
			top: 88px;