From 2242831b5484d32a4da5d29352d3a09dedddbdfd Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Wed, 9 Jan 2019 16:57:54 +0800
Subject: [PATCH] 进出场

---
 src/components/orderMessage/index.vue |  3 ++-
 src/components/weekAndDay/index.vue   |  4 ----
 src/components/weekAndDay/uDay.vue    | 33 +++++++++++++++++++++++++--------
 src/components/weekAndDay/uWeek.vue   | 32 +++++++++++++++++++++++---------
 4 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/src/components/orderMessage/index.vue b/src/components/orderMessage/index.vue
index 07a01ae..af3ca17 100644
--- a/src/components/orderMessage/index.vue
+++ b/src/components/orderMessage/index.vue
@@ -68,7 +68,6 @@
         orgIds: [10003,10005]
       }).then((response)=>{
         let  data = response.data.data
-        console.log(data)
         this.list = data;
         setInterval(this.scroll, 2000)
       }).catch((response)=>{
@@ -109,6 +108,7 @@
       line-height: 40px;
       font-size: 14px;
       li{
+        height: 40px;
         float: left;
         padding-left: 0;
         padding-left: 30px;
@@ -116,6 +116,7 @@
         background-position: 10px center;
         background-repeat: no-repeat;
         list-style: none;
+        overflow: hidden;
       }
       .orderNum{
         width: 80px;
diff --git a/src/components/weekAndDay/index.vue b/src/components/weekAndDay/index.vue
index 54d5dca..cc96ff4 100644
--- a/src/components/weekAndDay/index.vue
+++ b/src/components/weekAndDay/index.vue
@@ -124,10 +124,6 @@
             console.log("resize");
           }.bind(this));
         }
-      },
-      mounted() {
-        //this.createLine();
-
       }
     }
 </script>
diff --git a/src/components/weekAndDay/uDay.vue b/src/components/weekAndDay/uDay.vue
index de1d3fe..99134f3 100644
--- a/src/components/weekAndDay/uDay.vue
+++ b/src/components/weekAndDay/uDay.vue
@@ -25,21 +25,38 @@
        * 进出场折线图
        * */
       mounted() {
-        this.lineChart=this.createLine();
-        window.addEventListener('resize', function() {
-          this.lineChart.resize()
-        }.bind(this));
+
+        this.axios.post('urban/intelligence/orderPark/queryOrderParkNumForToday',{
+          orgIds: [10003,10005]
+        }).then((response)=>{
+          let  data = response.data.data
+          console.log(data)
+          let  xData=[],inNum=[],outNum=[]
+          for(let i=0;i<data.length;i++){
+            xData.push(data[i].queryDate)
+            inNum.push(data[i].inNum)
+            outNum.push(data[i].outNum)
+          }
+
+          this.lineChart=this.createLine(xData,inNum,outNum);
+          window.addEventListener('resize', function() {
+            this.lineChart.resize()
+          }.bind(this));
+        }).catch((response)=>{
+          console.log(response);
+        })
+
       },
       methods: {
-        createLine(){
+        createLine(xAxis_data,series_in,series_out){
           // 基于准备好的dom，初始化echarts实例
           let lineChart = echarts.init(document.querySelector('.lineChart'));
           let axisLineColor="#10377c";
           let axisLabelColor="#7c8799";
           let legend_data=['进场', '出场'];
-          let xAxis_data=['06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00'];
-          let series_in=[220, 182, 191, 134, 150, 120,100];
-          let series_out=[120, 82, 125, 145, 122, 191,150];
+          // let xAxis_data=['06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00'];
+          // let series_in=[220, 182, 191, 134, 150, 120,100];
+          // let series_out=[120, 82, 125, 145, 122, 191,150];
           const option={
             grid: {
               top: 13,left: 10,
diff --git a/src/components/weekAndDay/uWeek.vue b/src/components/weekAndDay/uWeek.vue
index d53fb71..407a1cc 100644
--- a/src/components/weekAndDay/uWeek.vue
+++ b/src/components/weekAndDay/uWeek.vue
@@ -23,25 +23,39 @@
         }
       },
       mounted() {
-        this.weekChart=this.createLine();
-        window.addEventListener('resize', function() {
-          this.weekChart.resize()
-        }.bind(this));
+        this.axios.post('urban/intelligence/orderPark/queryOrderParkNumForLastWeek',{
+          orgIds: [10003,10005]
+        }).then((response)=>{
+          let  data = response.data.data
+          let  xData=[],inNum=[],outNum=[]
+          for(let i=0;i<data.length;i++){
+            xData.push(data[i].queryDate)
+            inNum.push(data[i].inNum)
+            outNum.push(data[i].outNum)
+          }
+          this.weekChart=this.createLine(xData,inNum,outNum);
+          window.addEventListener('resize', function() {
+            this.weekChart.resize()
+          }.bind(this));
+        }).catch((response)=>{
+          console.log(response);
+        })
+
       },
       methods: {
-        createLine(){
+        createLine(xAxis_data,series_in,series_out){
           // 基于准备好的dom，初始化echarts实例
           let lineChart = echarts.init(document.querySelector('.weekChart'));
           let axisLineColor="#10377c";
           let axisLabelColor="#7c8799";
           let legend_data=['进场', '出场'];
-          let xAxis_data=['10/1', '10/2', '10/3', '10/4', '10/5', '10/6', '10/7'];
-          let series_in=[220, 182, 191, 134, 150, 120,100];
-          let series_out=[120, 82, 125, 145, 122, 191,150];
+          // let xAxis_data=['10/1', '10/2', '10/3', '10/4', '10/5', '10/6', '10/7'];
+          // let series_in=[220, 182, 191, 134, 150, 120,100];
+          // let series_out=[120, 82, 125, 145, 122, 191,150];
           const option={
             grid: {
               top: 13,left: 10,
-              right: 10,bottom: 20,
+              right: 20,bottom: 20,
               containLabel: true
             },
             tooltip: {
--
libgit2 0.21.4