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

chenyabin

2021-05-13 3ce565a201a426f92d5d13167164561ffea14671

 src/components/BaseNav/WasteWater/WasteWaterRealChart.vue

@@ -510,8 +510,7 @@
          }
        },
        grid: {
          top: '20%',
          left: '15%'
          top: '20%'
        },
        legend: {
          data: this.legendList