~xingchuan/SewerAndRainNetwork.git

			@@ -7,8 +7,9 @@
			<div class="public-bounced-content">
			<div class="public-bounced-content-left">
			<GasTab :displayContent="displayContent"></GasTab>
			<PublicTable v-if="value === 'gufei'"></PublicTable>
			<GasECharts v-else></GasECharts>
			<!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
			<PublicTable></PublicTable>
			<!-- <GasECharts v-else></GasECharts>-->
			</div>
			<div class="public-bounced-content-right">
			<GasVideo></GasVideo>
			@@ -19,10 +20,10 @@

			<script>

			import '@/components/BaseNav/SolidWaste/directive'
			import '@/components/BaseNav/SolidWaste/directive/dir'
			import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
			import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
			import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
			// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
			import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'

			export default {
			@@ -30,7 +31,7 @@
			components: {
			GasTab,
			PublicTable,
			GasECharts,
			// GasECharts,
			GasVideo
			},
			data () {
			@@ -40,10 +41,10 @@
			}
			},
			methods: {
			setData (data, value) {
			setData (data) {
			this.displayContent = data
			this.flag = true
			this.value = value
			// this.value = value
			},
			closePopup () {
			this.flag = false
			@@ -54,10 +55,11 @@

			<style lang="less" scoped>
			.public-bounced {
			width: 75%;
			z-index: 999;
			position: absolute;
			top: 50%;
			left: 50%;
			bottom: 5%;
			left: 15%;
			background-color: #002432;
			border: 1px #9fc5c8 solid;

			@@ -82,16 +84,23 @@
			}

			.public-bounced-content {
			margin: 15px auto;
			display: flex;
			align-items: center;
			//align-items: center;
			justify-content: space-around;
			padding: 10px;

			.public-bounced-content-left {
			flex: 3;
			height: 100%;
			margin-right: 10px;
			}

			.public-bounced-content-right {
			flex: 2;
			//width: 48%;
			height: 100%;
			}
			}

			}
			</style>