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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

 src/components/BaseNav/PublicBounced/common/PublicChart.vue

@@ -54,22 +54,23 @@
  data () {
    return {
      currentTab: this.current(),
      active: '1'
      active: '0'
    }
  },
  // updated () {
  //   this.$refs.Echats.DrawEXHRealTimeDateChart()
  // },
  methods: {
    tabTaggle (taggleMenu, num) {
      this.currentTab = taggleMenu
      this.active = num
      // debugger
    },
    current (currentTab) {
      if (this.$attrs.value === 'feishui') {
        currentTab = 'EChartsHourWasteWater'
        currentTab = 'EChartsRealWasteWater'
      } else {
        currentTab = 'EChartsHour'
        currentTab = 'ECharts'
      }
      debugger
      return currentTab
    }
  }