From 4831b33deba0e637006f75e911c014226ade3409 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Wed, 12 Dec 2018 18:22:02 +0800
Subject: [PATCH] 进出场

---
 src/components/lineChart.vue | 19 +++++++++----------
 src/views/outsection.vue     | 19 +++++++++----------
 src/views/vehiclesection.vue | 17 +++++++++--------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/components/lineChart.vue b/src/components/lineChart.vue
index 44deb80..1cdd5c7 100644
--- a/src/components/lineChart.vue
+++ b/src/components/lineChart.vue
@@ -4,7 +4,6 @@
 
 <script>
 import echarts from 'echarts'
-
 import {debounce} from '../utils/debounce'
 
 export default {
@@ -33,8 +32,7 @@ export default {
   },
   data() {
     return {
-      chart: null,
-      sidebarElm: null
+      chart: null
     }
   },
   watch: {
@@ -43,6 +41,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.chartData)
     this.initChart()
     if (this.autoResize) {
       this.__resizeHandler = debounce(() => {
@@ -65,14 +64,14 @@ export default {
     this.chart = null
   },
   methods: {
-    setOptions({xData, yData} = {}) {
+    setOptions({xData, yData, legendData} = {}) {
       this.chart.setOption({
         tooltip: {
           trigger: 'axis'
         },
         color:['#FFB130','#01AEFE'],
         legend: {
-          data:['出场','入场'],
+          data:legendData,
           bottom:'2%',
           textStyle: {
             color: '#59AAF7'
@@ -103,7 +102,7 @@ export default {
           splitLine: {
             show: false
           },
-          data: ['周一','周二','周三','周四','周五','周六','周日']
+          data: xData
         },
         yAxis: {
           type: 'value',
@@ -128,17 +127,17 @@ export default {
         },
         series: [
           {
-            name:'出场',
+            name:legendData[0],
             type:'line',
-            data:[120, 132, 101, 134, 90, 230, 210],
+            data:yData.indata,
             lineStyle: {
               color: '#FFB130'
             }
           },
           {
-            name:'入场',
+            name:legendData[1],
             type:'line',
-            data:[220, 182, 191, 234, 290, 330, 310],
+            data:yData.outdata,
             lineStyle: {
               color: '#08B9FC'
             }
diff --git a/src/views/outsection.vue b/src/views/outsection.vue
index 42c6bb1..75a19f4 100644
--- a/src/views/outsection.vue
+++ b/src/views/outsection.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <titlesection title="周出场统计"></titlesection>
-    <lineChart class="flexfm inout-wrap">
+    <lineChart :chart-data="lineChartData" class="flexfm inout-wrap" >
     </lineChart>
   </div>
 </template>
@@ -11,14 +11,6 @@ import titlesection from '../components/titlesection'
 import {fetchList} from '../api/api'
 import lineChart from '../components/lineChart'
 
-const lineChartData = {
-  newVisitis: {
-    yData: [100, 120, 161],
-    xData: ['正常', '异常', '故障']
-  }
-}
-
-
 export default {
   name: 'outsection',
   components: {
@@ -27,7 +19,14 @@ export default {
   },
   data() {
     return {
-      lineChartData: lineChartData.newVisitis,
+      lineChartData: {
+        xData: ['周一','周二','周三','周四','周五','周六','周日'],
+        yData: {
+          indata:[120, 132, 101, 134, 90, 230, 210],
+          outdata:[220, 182, 191, 234, 290, 330, 310],
+        },
+        legendData: ['出场','进场']
+      },
       dzNum: '23454',
       ydpNum: '4454'
     }
diff --git a/src/views/vehiclesection.vue b/src/views/vehiclesection.vue
index 467a6da..844e76e 100644
--- a/src/views/vehiclesection.vue
+++ b/src/views/vehiclesection.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <titlesection title="今日车流量"></titlesection>
-    <lineChart class="flexfm inout-wrap">
+    <lineChart :chart-data="lineChartData" class="flexfm inout-wrap" >
     </lineChart>
   </div>
 </template>
@@ -11,12 +11,6 @@ import titlesection from '../components/titlesection'
 import {fetchList} from '../api/api'
 import lineChart from '../components/lineChart'
 
-const lineChartData = {
-  newVisitis: {
-    yData: [100, 120, 161],
-    xData: ['正常', '异常', '故障']
-  }
-}
 
 
 export default {
@@ -27,7 +21,14 @@ export default {
   },
   data() {
     return {
-      lineChartData: lineChartData.newVisitis,
+      lineChartData: {
+        xData: ['周一','周二','周三','周四','周五','周六','周日'],
+        yData: {
+          indata:[120, 132, 101, 134, 90, 230, 210],
+          outdata:[220, 182, 191, 234, 290, 330, 310],
+        },
+        legendData: ['出场1','进场']
+      },
       dzNum: '23454',
       ydpNum: '4454'
     }
--
libgit2 0.21.4