Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

wangqi

2021-03-31 dd8aebad69a2311e5f526a0c6bbce956dea77861

 src/components/BaseNav/PublicBounced/PublicBounced.vue

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

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

@@ -29,7 +30,7 @@
  name: 'PublicBounced',
  components: {
    GasTab,
    // PublicTable,
    PublicTable,
    // GasECharts,
    GasVideo
  },
@@ -85,16 +86,19 @@
  .public-bounced-content {
    margin: 15px auto;
    display: flex;
    align-items: center;
    //align-items: center;
    justify-content: space-around;
    padding: 10px;

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

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