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

chenyabin

2021-05-18 7f6291e80073c0c29f9d24bfdd3ac2602a059e70

 src/components/BaseNav/WasteGas/WasteGasRealChart.vue

@@ -497,8 +497,8 @@
          }
        },
        grid: {
          top: '20%',
          bottom: '15%'
          top: '40px',
          bottom: '30px'
        },
        legend: {
          data: legend