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

沈斌

2018-02-28 e86e4f95fcca349107237f8f4161b9c91e279af1

 src/app/routes/report/report.component.ts

@@ -37,7 +37,7 @@
      left: 'left'
    },
    toolbox: {
      show: false,
      show: true,
      feature: {
        dataZoom: {
          yAxisIndex: 'none'