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

chenyabin

2021-04-07 cd80929f0ae8882a98cfe3936b2a96bded1c12d8

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

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