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

chenyabin

2021-05-13 ff1c7b9d724adedd8a7eefed931556d7e2db7a4c

 src/components/BaseNav/WasteWater/WasteWaterRealChart.vue

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