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

chenyabin

2021-04-13 3c93d885a3bc6a84079cc347bb30888d5fb98f11

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -15,6 +15,7 @@
                        :value="value"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
                        :ManualData="ManualData"
                        ref="PublicChart"
          >
          </public-chart>
@@ -54,7 +55,8 @@
      value: '',
      getWasteGasDetails: [],
      getWasteWaterMonitoringDetails: [],
      getQueryOnlineMonData: []
      getQueryOnlineMonData: [],
      ManualData: []
      // getGasQueryOnlineMonData: []
    }
  },
@@ -79,10 +81,11 @@
      this.flag = true
      this.value = value
    },
    setGasData (data, dataDetails, GasHourData, value) {
    setGasData (data, dataDetails, GasHourData, ManualData, value) {
      this.setWasteGasdata = data
      this.getWasteGasDetails = dataDetails
      this.getQueryOnlineMonData = GasHourData
      this.ManualData = ManualData
      console.log(this.getQueryOnlineMonData)
      this.displayContentTitle = data.Name
      this.flag = true