Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin

# Conflicts:
#	src/views/sound/road/trend/index.vue
冲突解决

src/views/sound/road/trend/index.vue

@@ -148,7 +148,6 @@
               value: item,
             };
           });
-          // this.placeOptions.unshift({ label: '所有测点', value: '所有测点'})
         });
       },
       handleRegionLevelChange(value) {
@@ -229,13 +228,6 @@
           show: false
         }
 
-        // option.xAxis[0].splitLine = { show: false } //去除网格线
-        // option.xAxis[0].splitArea = { show: false } //保留网格区域
-        // option.xAxis[0].axisTick = { show: false } //隐藏刻度线
-        // let barArray = option.series.filter(item => item.type === 'bar')
-        // barArray.forEach(item=>{
-        //   item.barGap = '0%'
-        // })
         let lineArray = option.series.filter(item => item.type === 'line')
         lineArray.forEach((item,index) => {
           item.xAxisIndex = 1
@@ -244,11 +236,6 @@
           }
           item.data = item.data.map((x, i) => [(i + 1 / (option.legend.data.length + 1) * (index + 1 )) , x])
         })
-
-        // option.series[2].xAxisIndex = 1
-        // option.series[3].xAxisIndex = 1
-        // option.series[2].data = option.series[2].data.map((x, i) => [(0.25+i) , x])
-        //   option.series[3].data = option.series[3].data.map((x, i) => [(0.75+ i) , x])
         console.log('option', option);
         trendChart.setOption(option)
       }