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

chenyabin

2021-04-07 7966904bb2c464e0a5c134e1d0df0d1e04a747f7

 src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue

@@ -37,10 +37,14 @@
    }
  },
  mounted () {
    this.tableData = this.$attrs.getWasteGasDetails
    // console.log(this.$attrs.getWasteGasDetails)
    this.tableData = this.$attrs.getWasteWaterMonitoringDetails
    console.log(this.$attrs.getWasteWaterMonitoringDetails)
    console.log('value')
    if (this.$attrs.getWasteGasDetails) {
      this.tableData = this.$attrs.getWasteGasDetails
      console.log(this.$attrs.getWasteGasDetails)
    } else if (this.$attrs.getWasteWaterMonitoringDetails) {
      this.tableData = this.$attrs.getWasteWaterMonitoringDetails
      console.log(this.$attrs.getWasteWaterMonitoringDetails)
    }
  }
}