潘钊 / bsth_control · Commits

Commit 931d141fc4d61226508475e6e9cfd01549620226

Authored by 李强
1 parent 1c423f4d
build: skipped

bsthlq <2519941818@qq.com>

Inline Side-by-side
Showing 1 changed file with 18 additions and 18 deletions
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
  View file @931d141
... ... @@ -414,7 +414,7 @@ var BaseFun = function() {
414 414 var wgfhtcbcNum = parseInt(( dataMap.wgfzhsjd[0].ed - dataMap.wgfsjd[0].ed ) / (60000 *　saa[0].zzsj.dgzzsj));
415 415 // 定义时间段内剔除班次规则.
416 416 tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'deletebcNum' : wgfhtcbcNum},
417   - {'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dataMap.wgfsjd[0].st , 'deletebcNum' : deletebcNum - wgfhtcbcNum},);
  417 + {'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dataMap.wgfsjd[0].st , 'deletebcNum' : deletebcNum - wgfhtcbcNum});
418 418 // 逆序排序剔除.
419 419 lpbc.sort(function(r,s){return s.fcno-r.fcno});
420 420 // 剔除不在高峰时间段内的班次.
... ... @@ -431,30 +431,29 @@ var BaseFun = function() {
431 431 if(dgminpcs>0 && dgminpcs <= bxrcObj.fpcls ) {
432 432 if( (a + 1) <= dgminpcs) {
433 433 var dgzjsj = baseF.getDateTime('12:30');
  434 + /*var zgfyh = dataMap.zgfsjd[0].ed;
  435 + zgfyh.setMinutes(zgfyh.getMinutes()+ Math.min.apply(null, dataMap.dgxxsjArr));*/
434 436 if( a % 2 == 0) {
435 437 // 定义早高峰结束 ~ 12:30 剔除规则.如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
436 438 var swmaxtcbcNum = parseInt(( dgzjsj - dataMap.zgfsjd[0].ed) / (60000 *　saa[0].zzsj.dgzzsj));
437   - if(initdx < 240) {
438   - tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
  439 + if(deletebcNum < swmaxtcbcNum) {
  440 + // tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
  441 + tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
439 442 }else {
440   - tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : swmaxtcbcNum},
  443 + tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed, 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : swmaxtcbcNum},
441 444 {'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed, 'order' : 'desc' , 'deletebcNum' : deletebcNum - swmaxtcbcNum});
442 445 }
443   - // 顺序排序
444   - // lpbc.sort(function(x,y){return x.fcno-y.fcno});
  446 + // tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
445 447 }else {
446 448 // 定义12:30 ~ 晚高峰开始以前剔除规则. 如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
447 449 var xwmaxtcbcNum = parseInt(( dataMap.wgfsjd[0].st - dgzjsj) / (60000 *　saa[0].zzsj.dgzzsj));
448   - if(initdx < 210) {
  450 + if(deletebcNum < xwmaxtcbcNum) {
449 451 tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : deletebcNum});
450 452 }else {
451   -
452 453 tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : deletebcNum - xwmaxtcbcNum},
453   - {'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum},);
  454 + {'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum});
454 455 }
455   - // 逆序排序.
456   - // lpbc.sort(function(m,n){return n.fcno-m.fcno});
457   - // order = 'desc';
  456 + // tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : deletebcNum});
458 457 }
459 458 // 按规则剔除班次.并且分班.路牌班次断开.
460 459 baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);
... ... @@ -489,12 +488,12 @@ var BaseFun = function() {
489 488 wgfhtcbcNum = parseInt(( dataMap.wgfzhsjd[0].ed - dataMap.wgfzhsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj))
490 489 tcbcgzA = new Array();
491 490 if( wgfhtcbcNum >= deletebcNum) {
492   - tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : deletebcNum},);
  491 + tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : deletebcNum});
493 492 }else if(zgfzqtcbcNum >= deletebcNum){
494   - tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum},);
  493 + tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum});
495 494 }else if(deletebcNum >= (zgfzqtcbcNum + wgfhtcbcNum)){
496 495 tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : wgfhtcbcNum},
497   - {'minsj': dataMap.zgfzqsjd[0].st , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum},);
  496 + {'minsj': dataMap.zgfzqsjd[0].st , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum});
498 497 }
499 498 // lpbc.sort(function(m,n){return n.fcno-m.fcno});
500 499 baseF.spliceBc02(lpbc , tcbcgzA , dataMap , isfb);
... ... @@ -655,9 +654,10 @@ var BaseFun = function() {
655 654 var ttsmbA = baseF.tzsmbcsj01(tempA,dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
656 655  
657 656 baseF.jhfcjx02(ttsmbA,dataMap);
658   - return {'json':ttsmbA,'bxrcgs':null};
659   - // var rsjar = baseF.tzsztest02(cara,ttsmbA,dataMap);
660   - // return {'json':rsjar,'bxrcgs':null};
  657 + //return {'json':baseF.addjcclcbc01(cara,ttsmbA,dataMap,saa,map),'bxrcgs':null};
  658 + //return {'json':ttsmbA,'bxrcgs':null};
  659 + var rsjar = baseF.tzsztest02(cara,ttsmbA,dataMap);
  660 + return {'json':rsjar,'bxrcgs':null};
661 661 return {'json':baseF.addjcclcbc01(cara,rsjar,dataMap,saa,map),'bxrcgs':null};
662 662 },
663 663  
... ...