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

src/views/echartPage/index.vue

@@ -77,6 +77,17 @@ const barOption = {
   ],
   series: [
     {
+        markPoint: {
+          data: [
+              {type: 'max', name: '最大值'},
+              {type: 'min', name: '最小值'}
+          ]
+      },
+      markLine: {
+          data: [
+              {type: 'average', name: '平均值'}
+          ]
+      },
       name: 'Email',
       type: 'line',
       stack: 'Total',
@@ -110,9 +121,9 @@ const hisOption = {
       }
     }
   },
-  legend: {
-    data: ['Email']
-  },
+  // legend: {
+  //   data: ['Email']
+  // },
   xAxis: {
     type: 'category',
     show: true,
@@ -333,11 +344,11 @@ export default {
     echrtstiele: {
       type: String,
       default: () => ''
-    }
+    },
   },
   data() {
     return {
-      inHourDataOption: this._.cloneDeep(hisOption),
+      inHourDataOption: this._.cloneDeep(barOption),
       listdata: [],
       page: 0, //当前table页面
     };