From 5c53bdda6b8e88c8c4018e2c99a89d2cb710fcca Mon Sep 17 00:00:00 2001
From: yyy2015 <2456700983@qq.com>
Date: Wed, 6 Sep 2017 00:31:58 +0800
Subject: [PATCH] fix default show

---
 StatDisplay/src/components/charts/selectorForm.js       | 2 +-
 StatDisplay/src/models/activeness/activenessInfo.js     | 8 ++++++--
 StatDisplay/src/models/customerFlow/customerFlowInfo.js | 8 ++++++--
 StatDisplay/src/models/inStoreHour/inStoreHourInfo.js   | 8 ++++++--
 StatDisplay/src/models/newOld/newOldInfo.js             | 8 ++++++--
 StatDisplay/src/models/visitCircle/visitCircleInfo.js   | 8 ++++++--
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/StatDisplay/src/components/charts/selectorForm.js b/StatDisplay/src/components/charts/selectorForm.js
index cb7c90d..9debc86 100644
--- a/StatDisplay/src/components/charts/selectorForm.js
+++ b/StatDisplay/src/components/charts/selectorForm.js
@@ -125,7 +125,7 @@ const SelectorForm = ({
           className={styles['form-item']}
         >
           {getFieldDecorator('threshold',{
-            initialValue: 'HOUR'
+            initialValue: 'DAY'
           })(
             <Select>
               <Option value = "HOUR">小时</Option>
diff --git a/StatDisplay/src/models/activeness/activenessInfo.js b/StatDisplay/src/models/activeness/activenessInfo.js
index 3075af5..a05531f 100644
--- a/StatDisplay/src/models/activeness/activenessInfo.js
+++ b/StatDisplay/src/models/activeness/activenessInfo.js
@@ -23,13 +23,17 @@ export default {
       history.listen(location => {
         const matchFlow = pathToRegexp('/activeness').exec(location.pathname);
         if(matchFlow) {
+          const currentDate = new Date();
+          const currentHour = parseInt(currentDate.valueOf()/(1000*60*60));//距离现在最近的整点对应的小时数
+          const beforeHour = currentHour-5*24;//获取距离最近整点前5天的数据
+          console.log("currentHour :"+currentHour+";beforehour:"+beforeHour);
           dispatch({
             type: 'getHourData',
-            payload: {probeId:"1s12sz",startHour:40000,startRange:5,threshold:"HOUR"}
+            payload: {probeId:"1s12sz",startHour:beforeHour,startRange:5,threshold:"DAY"}
           });
           dispatch({
             type: 'getDetail',
-            payload: {hour:415300,probeId:"1s12sz"}
+            payload: {hour:currentHour,probeId:"1s12sz"}
           });
           dispatch({
             type: 'getProbeOptions',
diff --git a/StatDisplay/src/models/customerFlow/customerFlowInfo.js b/StatDisplay/src/models/customerFlow/customerFlowInfo.js
index a8ae329..c7bde1e 100644
--- a/StatDisplay/src/models/customerFlow/customerFlowInfo.js
+++ b/StatDisplay/src/models/customerFlow/customerFlowInfo.js
@@ -27,13 +27,17 @@ export default {
       history.listen(location => {
         const matchFlow = pathToRegexp('/customerFlow').exec(location.pathname);
         if(matchFlow) {
+          const currentDate = new Date();
+          const currentHour = parseInt(currentDate.valueOf()/(1000*60*60));//距离现在最近的整点对应的小时数
+          const beforeHour = currentHour-5*24;//获取距离最近整点前5天的数据
+          console.log("currentHour :"+currentHour+";beforehour:"+beforeHour);
           dispatch({
             type: 'getFlow',
-            payload: {probeId:"1s12sz",startHour:414897,startRange:5,threshold:"HOUR"}
+            payload: {probeId:"1s12sz",startHour:beforeHour,startRange:5,threshold:"DAY"}
           });
           dispatch({
             type: 'getDetail',
-            payload: {hour:415357,probeId:"1s12sz"}
+            payload: {hour:currentHour,probeId:"1s12sz"}
           });
           dispatch({
             type: 'getProbeOptions',
diff --git a/StatDisplay/src/models/inStoreHour/inStoreHourInfo.js b/StatDisplay/src/models/inStoreHour/inStoreHourInfo.js
index 61d148f..86abe04 100644
--- a/StatDisplay/src/models/inStoreHour/inStoreHourInfo.js
+++ b/StatDisplay/src/models/inStoreHour/inStoreHourInfo.js
@@ -21,13 +21,17 @@ export default {
       history.listen(location => {
         const matchFlow = pathToRegexp('/inStoreHour').exec(location.pathname);
         if(matchFlow) {
+          const currentDate = new Date();
+          const currentHour = parseInt(currentDate.valueOf()/(1000*60*60));//距离现在最近的整点对应的小时数
+          const beforeHour = currentHour-5*24;//获取距离最近整点前5天的数据
+          console.log("currentHour :"+currentHour);
           dispatch({
             type: 'getHourData',
-            payload: {probeId:"1s12sz",startHour:40000,startRange:5,threshold:"HOUR"}
+            payload: {probeId:"1s12sz",startHour:beforeHour,startRange:5,threshold:"DAY"}
           });
           dispatch({
             type: 'getDetail',
-            payload: {hour:415300,probeId:"1s12sz"}
+            payload: {hour:currentHour,probeId:"1s12sz"}
           });
           dispatch({
             type: 'getProbeOptions',
diff --git a/StatDisplay/src/models/newOld/newOldInfo.js b/StatDisplay/src/models/newOld/newOldInfo.js
index 5a9256f..98c7cdf 100644
--- a/StatDisplay/src/models/newOld/newOldInfo.js
+++ b/StatDisplay/src/models/newOld/newOldInfo.js
@@ -21,17 +21,21 @@ export default {
       history.listen(location => {
         const matchFlow = pathToRegexp('/newAndOld').exec(location.pathname);
         if(matchFlow) {
+          const currentDate = new Date();
+          const currentHour = parseInt(currentDate.valueOf()/(1000*60*60));//距离现在最近的整点对应的小时数
+          const beforeHour = currentHour-5*24;//获取距离最近整点前5天的数据
+          console.log("currentHour :"+currentHour);
           dispatch({
             type: 'getProbeOptions',
             payload: {page:0, size: 10}
           });
           dispatch({
             type: 'getHourData',
-            payload: {probeId: '1s12sz', startHour:40000, startRange:5, threshold:"HOUR"}
+            payload: {probeId: '1s12sz', startHour:beforeHour, startRange:5, threshold:"DAY"}
           });
           dispatch({
             type: 'getDetail',
-            payload: {hour:415300,probeId:"1s12sz"}
+            payload: {hour:currentHour,probeId:"1s12sz"}
           });
         }
       })
diff --git a/StatDisplay/src/models/visitCircle/visitCircleInfo.js b/StatDisplay/src/models/visitCircle/visitCircleInfo.js
index 80e61cf..ba48454 100644
--- a/StatDisplay/src/models/visitCircle/visitCircleInfo.js
+++ b/StatDisplay/src/models/visitCircle/visitCircleInfo.js
@@ -21,13 +21,17 @@ export default {
       history.listen(location => {
         const matchFlow = pathToRegexp('/visitCircle').exec(location.pathname);
         if(matchFlow) {
+          const currentDate = new Date();
+          const currentHour = parseInt(currentDate.valueOf()/(1000*60*60));//距离现在最近的整点对应的小时数
+          const beforeHour = currentHour-5*24;//获取距离最近整点前5天的数据
+          console.log("currentHour :"+currentHour);
           dispatch({
             type: 'getHourData',
-            payload: {probeId:"1s12sz",startHour:40000,startRange:5,threshold:"HOUR"}
+            payload: {probeId:"1s12sz",startHour:beforeHour,startRange:5,threshold:"DAY"}
           });
           dispatch({
             type: 'getDetail',
-            payload: {hour:415300,probeId:"1s12sz"}
+            payload: {hour:currentHour,probeId:"1s12sz"}
           });
           dispatch({
             type: 'getProbeOptions',