Merge remote-tracking branch 'origin/develop' into develop

徐旺旺

2021-03-29 6ab6b11a0ba0bc20c099b9f7b73e9d03fe7d5b8e

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -5,8 +5,14 @@
      <i class="el-icon-circle-close" @click="closePopup"></i>
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left"></div>
      <div class="public-bounced-content-right"></div>
      <div class="public-bounced-content-left">
        <GasTable></GasTable>
        <GasECharts></GasECharts>
<!--        <GasTabs></GasTabs>-->
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>
      </div>
    </div>
  </div>
</template>
@@ -14,9 +20,19 @@
<script>

import '@/components/BaseNav/SolidWaste/directive'
import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
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,
    GasVideo
  },
  data () {
    return {
      displayContent: [],
@@ -74,15 +90,15 @@
    display: flex;
    align-items: center;
    justify-content: space-around;

    .public-bounced-content-left {
      width: 48%;
      height: 400px;
      border: 1px red solid;
    }

    .public-bounced-content-right {
      width: 48%;
      height: 400px;
      border: 1px red solid;
    }
  }