Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents bc9af968 e74b0785
Showing 1 changed file with 11 additions and 4 deletions
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
@@ -407,7 +407,7 @@ var BaseFun = function() {
 							baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar3,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
 									dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);*/
 				var rsjar = baseF.tzsztest(cara,jar3,dataMap);
-				return {'json':rsjar,'bxrcgs':bxrcgs};
+				// return {'json':rsjar,'bxrcgs':bxrcgs};
 				var resultJA = new Array();
 				for(var m = 0 ; m < cara.length; m++) {
 					// 获取路牌编号.
@@ -902,7 +902,10 @@ var BaseFun = function() {
 						gfzjbc[gfzjbc.length-1].STOPTIME  = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
 					}
 				}
-				return gfzjbc.concat(wgfbc).concat(zgfbc);
+				var rsAy = gfzjbc.concat(wgfbc).concat(zgfbc);
+				rsAy.sort(function(a,b){return b.fcno-a.fcno});
+				rsAy[0].STOPTIME= 0;
+				return rsAy;
 			},
 			addbc01 : function(gfzjbc,lastObj,dataMap) {
@@ -946,8 +949,12 @@ var BaseFun = function() {
 			},
 			issplice : function (kssj,dataMap,type,lpNo,cla){
-				var tag = false;
-				if(type=='五工二休' || lpNo <= Math.round(cla/2)) {
+				var tag = false,booleanTag = false ;
+				if(cla % 2 ==0) 
+					booleanTag = lpNo <= Math.round(cla/2); 
+				else
+					booleanTag = lpNo < Math.round(cla/2);
+				if(type=='五工二休' || booleanTag) {
 					if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) || 
 							( dataMap.wgfsjd[0].st <= kssj && kssj <=  dataMap.wgfsjd[0].ed))
 						tag = true;