~xingchuan/SewerAndRainNetwork.git

			@@ -6,9 +6,10 @@
			</div>
			<div class="public-bounced-content">
			<div class="public-bounced-content-left">
			<GasTable></GasTable>
			<GasECharts></GasECharts>
			<!-- <GasTabs></GasTabs>-->
			<GasTab :displayContent="displayContent"></GasTab>
			<!-- <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,18 +20,18 @@

			<script>

			import '@/components/BaseNav/SolidWaste/directive'
			import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
			import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
			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 GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
			// import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'

			export default {
			name: 'PublicBounced',
			components: {
			// GasTabs,
			GasTable,
			GasECharts,
			GasTab,
			PublicTable,
			// GasECharts,
			GasVideo
			},
			data () {
			@@ -43,6 +44,7 @@
			setData (data) {
			this.displayContent = data
			this.flag = true
			// this.value = value
			},
			closePopup () {
			this.flag = false
			@@ -53,18 +55,15 @@

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

			.public-bounced-title {
			width: 100%;
			border: 1px #a4c0d8 solid;
			display: flex;
			align-items: center;
			@@ -85,23 +84,23 @@
			}

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

			.public-bounced-content-left {
			//flex: 1;
			width: 48%;
			height: 400px;
			flex: 3;
			height: 100%;
			margin-right: 10px;
			}

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

			}
			</style>