Merge branch 'master' of http://120.26.64.82:10880/BFFE/dz2.1

src/views/echartPage/index.vue

@@ -314,10 +314,16 @@ export default {
       type: Array,
       default: () => []
     },
+    //图标名称
     echartname: {
       type: String,
       default: () => ''
-    }
+    },
+    //x轴列表
+    axlist: {
+      type: Array,
+      default: () => []
+    },
   },
   data() {
     return {
@@ -344,12 +350,13 @@ export default {
       //获取页面权限类型组件  pagetype 1模块  2页面  3按钮 4表格 5树形  6弹窗 
       const pageAuths = this.authArrs
       if (!pageAuths.length) return
+
     },
-    //处理数据1
+    //处理数据1模式
     processingdata (data) {
       let arr = []
       fieldname.forEach(res => {
-        arr.push(data[res])
+        arr.push(data[res.name])
       });
       let series = [
         {
@@ -388,12 +395,12 @@ export default {
       ]
       return series
     },
-    //处理数据2
+    //处理数据2模式
     processingdata1 (data) {
       let arr = []
       fieldname.forEach(res => {
         data.forEach(element => {
-          arr.push(element[res])
+          arr.push(element[res.name])
         });
       });
       let series = [
@@ -433,6 +440,28 @@ export default {
       ]
       return series
     },
+    //x轴数据
+    axisLinelist (data) {
+      let xAxis = {
+        type: 'category',
+        show: true,
+          // boundaryGap: false,
+          axisLine:{
+            lineStyle:{
+              color:'red',
+              width:2
+            }
+          },
+          splitLine: {  
+            show:false,   //X网格线
+            lineStyle:{   //x网格线
+              color: '#000000'
+            }
+          },
+        data: this.axlist ? this.axlist : data
+      }
+      return xAxis
+    }
   },
 };
 </script>