潘钊 / bsth_control · Commits

Commit 29bbde89c0748bcb98951eb2585933307ec2aabd

Authored by 徐烜
2 parents bc9af968 e74b0785
build: skipped

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

Inline Side-by-side
Showing 1 changed file with 11 additions and 4 deletions
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
  View file @29bbde8
... ... @@ -407,7 +407,7 @@ var BaseFun = function() {
407 407 baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar3,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
408 408 dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);*/
409 409 var rsjar = baseF.tzsztest(cara,jar3,dataMap);
410   - return {'json':rsjar,'bxrcgs':bxrcgs};
  410 + // return {'json':rsjar,'bxrcgs':bxrcgs};
411 411 var resultJA = new Array();
412 412 for(var m = 0 ; m < cara.length; m++) {
413 413 // 获取路牌编号.
... ... @@ -902,7 +902,10 @@ var BaseFun = function() {
902 902 gfzjbc[gfzjbc.length-1].STOPTIME = parseInt((baseF.getDateTime(wgfbc[0].fcsj) - baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
903 903 }
904 904 }
905   - return gfzjbc.concat(wgfbc).concat(zgfbc);
  905 + var rsAy = gfzjbc.concat(wgfbc).concat(zgfbc);
  906 + rsAy.sort(function(a,b){return b.fcno-a.fcno});
  907 + rsAy[0].STOPTIME= 0;
  908 + return rsAy;
906 909 },
907 910  
908 911 addbc01 : function(gfzjbc,lastObj,dataMap) {
... ... @@ -946,8 +949,12 @@ var BaseFun = function() {
946 949 },
947 950  
948 951 issplice : function (kssj,dataMap,type,lpNo,cla){
949   - var tag = false;
950   - if(type=='五工二休' || lpNo <= Math.round(cla/2)) {
  952 + var tag = false,booleanTag = false ;
  953 + if(cla % 2 ==0)
  954 + booleanTag = lpNo <= Math.round(cla/2);
  955 + else
  956 + booleanTag = lpNo < Math.round(cla/2);
  957 + if(type=='五工二休' || booleanTag) {
951 958 if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) ||
952 959 ( dataMap.wgfsjd[0].st <= kssj && kssj <= dataMap.wgfsjd[0].ed))
953 960 tag = true;
... ...