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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -59,8 +59,9 @@
      ManualData: []
    }
  },
  beforeUpdate () {
    this.$refs.PublicChart.$refs.Echats.CreateChart()
  destoryed () {
    this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
    this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
  },
  methods: {
    closePopup () {
@@ -85,12 +86,10 @@
      this.flag = true
      this.value = value
    },
    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
    setWaterData (dataWater, detailData, hourData, dateData, value) {
      this.setWasteWaterdata = dataWater
      // console.log(data)
      this.getQueryOnlineMonData = hourData
      // console.log(drawData)
      this.getWasteWaterMonitoringDetails = dataDetail
      this.getWasteWaterMonitoringDetails = detailData
      this.displayContentTitle = dataWater.Name
      this.flag = true
      this.value = value