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

yangdelong

2021-04-07 7c3ff469d37be883d7634bb4261bc5d54c89d2a5

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -11,7 +11,10 @@
        <div class="public-bounced-content-left-bottom">
          <public-table v-if="value === 'gufei'"
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails" :getWasteWaterMonitoring="getWasteWaterMonitoring" ></public-chart>
                    <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                                  :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
                                  :getWasteWaterMonitoring="getWasteWaterMonitoring">
                    </public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">