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

chenzeping

2021-03-31 20fcd1d8d35824e8ffa81596e537957566e1fa0d

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -11,11 +11,6 @@
          <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
          <GasECharts v-else></GasECharts>
        </div>
<!--        <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
        <GasECharts></GasECharts>
<!--        <GasTabs></GasTabs>-->
        <!--        <PublicTable></PublicTable>-->
<!--                <GasECharts></GasECharts>-->
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>