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

chenyabin

2021-05-14 de32f49313e2c7534009758193c41be61517f1d5

 src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue

@@ -96,7 +96,7 @@
  methods: {
    // 点击查询功能
    querySearch () {

      this.draw24Chart()
    },
    // 初始化数据请求
    async draw24Chart () {