~xingchuan/SewerAndRainNetwork.git

			@@ -17,9 +17,8 @@
			<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>
			<SolidContent ref="SolidWastePopup"></SolidContent>
			<PublicBounced ref="PublicBounced"></PublicBounced>
			<el-button type="primary" @click="AddGasHelper" class="flue-gas">废气</el-button>
			<popup-gas ref="FlueGas"></popup-gas>
			<PublicBounced ref="PublicBounced"></PublicBounced>
			</div>
			</template>
			@@ -41,12 +40,14 @@
			import Enterprise from '../components/table/enterprise'
			// 底图业务js逻辑
			import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
			// import SolidContent from '@components/SolidWaste/SolidContent'
			// 废气
			import AddGasHelper from '@components/flueGas/flueGas'
			import PopupGas from '@/components/flueGas/popup-gas'
			// import PopupGas from '@/components/flueGas/popup-gas'
			// // 公共展示数据
			import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'

			// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
			export default {
			name: 'MapTemplate',
			components: {
			@@ -62,7 +63,7 @@
			Popup,
			summarySheets,
			// SolidContent,
			PopupGas,
			// PopupGas,
			PublicBounced
			},
			data () {
			@@ -87,9 +88,23 @@
			},
			methods: {
			AddGasHelper () {
			const data = {
			companyId: 3900100145,
			id: '',
			monType: 2,
			userCode: 'wenchun.deng',
			monDuration: '',
			epName: '',
			secdDeptId: '',
			contrLevel: '',
			dataStatus: '',
			dataFlag: '',
			runStatus: '',
			emissTypeId: ''
			}
			const AddGas = new AddGasHelper({ map: this.map })
			AddGas.requestData()
			AddGas.SetPlueGasContent(this.config, this.$refs.FlueGas)
			AddGas.requestData(data)
			AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
			},
			ChangeState () {
			const data = {
			@@ -178,11 +193,12 @@

			<style lang="less">
			.flue-gas {
			position:fixed;
			position: fixed;
			top: 88px;
			left: 180px;
			z-index: 500;
			}

			.solid-waste {
			position: absolute;
			top: 88px;