Merge branch 'master' of http://123.207.147.179:8888/node_server/motorCity

# Conflicts:
#	src/data/interface/interfaceService.ts

src/data/interface/interfaceService.ts

@@ -80,8 +80,9 @@ async function getTestLicense() {
     测试牌照分布.forEach( item => {
         let {enterprise, cnt} = item;
         let imgItem = `http://${getImageIp()}:${systemConfig.port}/img/${enterprise}.png`;
-        测试牌照分布data[imgItem] = cnt + "辆";
-        测试牌照数 += parseInt(cnt);
+        let count = parseInt(cnt);
+        测试牌照分布data[imgItem] = count + "辆";
+        测试牌照数 += count;
     })
 
 
@@ -136,27 +137,35 @@ export async function getDetachmentRatio() {
 //初始化测试时长分布
 export async function getTestDurationDistribution() {
     let requestParam = {index:19, et:moment().format("YYMMDD")};
+    let yesterdayParam = {index:19, et:moment().subtract(1, 'days').format("YYMMDD")};
+    let dayBefore = {index:19, et:moment().subtract(2, 'days').format("YYMMDD")};
     let result:any = await get(appConfig.rightView, requestParam);
+    let yesterdayResult:any = await get(appConfig.rightView, yesterdayParam);
+    let resultResult:any = await get(appConfig.rightView, dayBefore);
     let 企业时长数据 = [];
     let 月时长数据 = [];
     let 总测试时长:any = {};
+    let 昨日总测试时长:any = {};
+    let 前天总测试时长:any = {};
     if (result && result.success && result.result) {
         月时长数据 = result.result[2].result;
         企业时长数据 = result.result[1].result;
-        总测试时长 = result.result[0].result[0]
+        总测试时长 = result.result[0].result[0];
+        昨日总测试时长 = yesterdayResult.result[0].result[0];
+        前天总测试时长 = resultResult.result[0].result[0];
     } else {
         throw new SysError(SYSTEMERRORENUM.获取第三方接口数据失败, appConfig.rightView , requestParam);
     }
    
-    return {企业时长数据, 月时长数据, 总测试时长};
+    return {企业时长数据, 月时长数据, 总测试时长, 昨日总测试时长, 前天总测试时长};
 }
 
 
 export async function getCsgkData() {
-    let {总测试时长, 月时长数据} = await getTestDurationDistribution();
+    let {总测试时长, 月时长数据, 昨日总测试时长, 前天总测试时长} = await getTestDurationDistribution();
     let {测试牌照分布data, 测试牌照数, 测试企业数} = await getTestLicense();
 
-    月时长数据.sort((a, b) => { return parseInt(b.time) - parseInt(a.time) });
+    // 月时长数据.sort((a, b) => { return parseInt(b.time) - parseInt(a.time) });
 
     let 测试总里程 = 0;
     let 功能测试总里程 = 0;
@@ -170,9 +179,12 @@ export async function getCsgkData() {
     let nowDate = moment().format('DD');
     let lastDate = moment().subtract(1, 'days').format('DD');
 
-    let thisMonthsTestTimeData = 月时长数据[0] || {autoDurationTotal:0, durationTotal:0};
-    let avgAutoTime = Math.ceil( (thisMonthsTestTimeData.autoDurationTotal/new Date().getDate() )*10)/10;
-    let testTime = Math.ceil( (thisMonthsTestTimeData.durationTotal/new Date().getDate() ) *10 )/10;
+    // let thisMonthsTestTimeData = 总测试时长[0] || {autoDurationTotal:0, durationTotal:0};
+    // let avgAutoTime = Math.ceil( (thisMonthsTestTimeData.autoDurationTotal/new Date().getDate() )*10)/10;
+    // let testTime = Math.ceil( (thisMonthsTestTimeData.durationTotal/new Date().getDate() ) *10 )/10;
+
+    let testTime = Math.ceil(昨日总测试时长.durationTotal - 前天总测试时长.durationTotal);
+    let avgAutoTime = Math.ceil(昨日总测试时长.autoDurationTotal - 前天总测试时长.autoDurationTotal);
 
     let 今日数据 = {"在线车辆数": ""}