潘钊 / bsth_control · Commits

Commit 1126883bf11e4c0e45f0bda83137bce253dd929e

Authored by 徐烜
1 parent 9c51ae05
build: skipped

Update

Inline Side-by-side
Showing 1 changed file with 11 additions and 11 deletions
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
  View file @1126883
... ... @@ -817,19 +817,19 @@ var BaseFun = function() {
817 817 var list = baseF.getBxRcListCollection(map.bxrc);
818 818 // 把班型分配到对应的具体路牌上.
819 819 baseF.bxAlloTotLp(list,cara);
820   - return {'json':markArray,'bxrcgs':null};
  820 + //return {'json':markArray,'bxrcgs':null};
821 821  
822 822  
823   - //// 第六步 抽车来满足工时.
824   - //var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
825   - //// return {'json':tempA,'bxrcgs':null};
826   - //// 第七步 确定吃饭时间.
827   - //baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
828   - //baseF.resizeByPitStopTime(cara , tempA , dataMap);
829   - //baseF.updfcno01(tempA,0);
830   - //// return {'json':tempA,'bxrcgs':null};
831   - //// 确定进出场、早晚例保时间.并返回班次数组集合
832   - //return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
  823 + // 第六步 抽车来满足工时.
  824 + var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
  825 + // return {'json':tempA,'bxrcgs':null};
  826 + // 第七步 确定吃饭时间.
  827 + baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
  828 + baseF.resizeByPitStopTime(cara , tempA , dataMap);
  829 + baseF.updfcno01(tempA,0);
  830 + // return {'json':tempA,'bxrcgs':null};
  831 + // 确定进出场、早晚例保时间.并返回班次数组集合
  832 + return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
833 833 },
834 834  
835 835 markeEatTime : function(list , markArray , cara , saa , dataMap ,map) {
... ...