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

chenyabin

2021-05-18 7f6291e80073c0c29f9d24bfdd3ac2602a059e70

 src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue

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

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