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

徐旺旺

2021-04-18 e25ff993695e7a4b394a5d1aa102f113dbe5316b

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -4,49 +4,45 @@
      <span>{{ displayContentTitle }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
    </div>
<!--    <div class="public-bounced-content">-->
<!--      <div class="public-bounced-content-left">-->
<!--        <public-tabs :setSolidWaste="displayContentTab" :value="value"-->
<!--                     :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
<!--        <div class="public-bounced-content-left-bottom">-->
<!--          <public-table v-if="value === 'gufei'"-->
<!--                        :displayContentTable="displayContentTable"></public-table>-->
<!--          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
<!--                        :value="value"-->
<!--                        :getQueryOnlineMonData="getQueryOnlineMonData"-->
<!--                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'-->
<!--                        :ManualData="ManualData"-->
<!--                        ref="PublicChart"-->
<!--          >-->
<!--          </public-chart>-->
<!--        </div>-->
<!--      </div>-->
<!--      <div class="public-bounced-content-right">-->
<!--        <public-video></public-video>-->
<!--      </div>-->
<!--    </div>-->
    <PublicSector></PublicSector>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <public-tabs :setSolidWaste="displayContentTab" :value="value"
                     :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
        <div class="public-bounced-content-left-bottom">
          <public-table v-if="value === 'gufei'"
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                        :value="value"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
                        :ManualData="ManualData"
                        ref="PublicChart"
          >
          </public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <public-video></public-video>
      </div>
    </div>
  </div>
</template>

<script>

import '@/utils/dragBoxes'
// import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
// import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
// import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
// import PublicChart from './common/PublicChart'

import PublicSector from '@components/BaseNav/PublicSector'
import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
import PublicChart from './common/PublicChart'

export default {
  name: 'PublicBounced',
  components: {
    PublicSector
    // PublicTabs,
    // PublicTable,
    // PublicChart,
    // PublicVideo
    PublicTabs,
    PublicTable,
    PublicChart,
    PublicVideo
  },
  data () {
    return {