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

chenyabin

2021-05-13 097581b136c5889c71c07fb6f17d2f2885ce5a78

 src/components/BaseNav/WasteWater/WasteWaterRealChart.vue

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