Merge branch 'master' into dev-lhp

# Conflicts:
#	src/views/als/faultStatistics/echarts.vue

src/views/als/faultStatistics/echarts.vue

@@ -66,12 +66,9 @@ import { debounce } from '@/utils/index'
 import * as echarts from 'echarts'
 import CardEcharts from '@/components/CardEcharts/index.vue'
 export default {
-<<<<<<< HEAD
   name: 'FaultStatistics',
   components: { CardEcharts },
-=======
   name: 'FaultStatisticsEcharts',
->>>>>>> master
   data() {
     // 这里存放数据
     return {