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

chenyabin

2021-04-07 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -6,15 +6,16 @@
    </div>
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <PublicTabs :displayContentTab="displayContentTab" :value="value"
                    :setWasteGasdata="setWasteGasdata"></PublicTabs>
        <public-tabs :displayContentTab="displayContentTab" :value="value"
                     :setWasteGasdata="setWasteGasdata"></public-tabs>
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
          <PublicChart v-else></PublicChart>
          <public-table v-if="value === 'gufei'"
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else></public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <PublicVideo></PublicVideo>
        <public-video></public-video>
      </div>
    </div>
  </div>
@@ -43,11 +44,14 @@
      displayContentTab: '',
      displayContentTable: '',
      flag: false,
      value: ''
      value: '',
      getWasteGasDetails: []
    }
  },
  methods: {
    setData (dataBasic, dataDetailed, value) {
      this.flag = true
      this.value = value
      dataBasic.forEach(item => {
        this.displayContentTitle = item.StoragePlaceName
      })
@@ -56,8 +60,10 @@
      this.flag = true
      this.value = value
    },
    setGasData (data, value) {
    setGasData (data, dataDetails, value) {
      this.setWasteGasdata = data
      this.getWasteGasDetails = dataDetails
      // console.log(dataDetails)
      this.displayContentTitle = data.Name
      this.flag = true
      this.value = value