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

chenzeping

2021-03-31 300e019d85ab8d8a671a6b7773997e40fff56d58

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -7,10 +7,10 @@
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <GasTab :displayContent="displayContent"></GasTab>
        <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
        <GasECharts v-else></GasECharts>
        <!--        <PublicTable></PublicTable>-->
        <!--        <GasECharts></GasECharts>-->
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
          <GasECharts v-else></GasECharts>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>
@@ -95,16 +95,17 @@
  .public-bounced-content {
    margin: 15px auto;
    display: flex;
    //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;
      height: 100%;
    }
  }