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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

 src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue

@@ -811,7 +811,7 @@
          }
        }, { // 流量轴
          type: 'value',
          name: '流量(m3/h)',
          name: '废气流量(m3/h)',
          axisLabel: {
            formatter: '{value}',
            textStyle: {
@@ -1067,6 +1067,7 @@
      padding: 0;
      border-color:#00fff6;
      text-align: center;
      z-index: 9999;
      //padding-left:20px ;
      //padding: 0!important;
    }