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

wangqi

2021-03-31 e0eb378045eb18117fcf0a1eac6dad57ce6f743b

 src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue

@@ -32,8 +32,9 @@
        },
        grid: {
          left: '3%',
          // right: '20%',
          // bottom: '3%',
          right: '1%',
          bottom: '3%',
          top: '10%',
          containLabel: true
        },
        toolbox: {
@@ -150,7 +151,7 @@

<style scoped lang="less">
    .main{
        background: #00fff6;
        background: rgba(255, 255, 255, 0.1);
    }
    #echarts{
        width: 600px;