Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

wangqi

2021-04-09 270f4c72b8566400fe29f78099f5e206908ef501

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -14,6 +14,7 @@
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                        :value="value"
                        :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
                        :getQueryOnlineMonData="getQueryOnlineMonData"
                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
>
@@ -57,8 +58,8 @@
      value: '',
      getWasteGasDetails: [],
      getWasteWaterMonitoringDetails: [],
      getQueryOnlineMonData: []
      // getGasQueryOnlineMonData: []
      getQueryOnlineMonHourData: [],
      getQueryOnlineMonDateData: []
    }
  },
  methods: {
@@ -85,12 +86,15 @@
      this.flag = true
      this.value = value
    },
    setWaterData (dataWater, dataDetail, hourData, value) {
    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
      this.setWasteWaterdata = dataWater
      // console.log(data)
      this.getQueryOnlineMonData = hourData
      this.getWasteWaterMonitoringDetails = dataDetail // 明细表数据
      // console.log(dataDetail)
      this.getQueryOnlineMonHourData = hourData // 小时数据
      // console.log(drawData)
      this.getWasteWaterMonitoringDetails = dataDetail
      this.getQueryOnlineMonDateData = dateData // 日数据
      // console.log(dateData)
      this.displayContentTitle = dataWater.Name
      this.flag = true
      this.value = value