bsthlq <2519941818@qq.com>

李强
1 parent 5c10bae3
Showing 1 changed file with 38 additions and 39 deletions
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
@@ -325,7 +325,7 @@ var BaseFun = function() {
 			},
 			/**
-			 * @description : (TODO) 调整某班型下的各个路牌对应的班次以及工时、停站时间、是否分班.
+			 * @description : (TODO) 调整某班型下的各个路牌对应的班次以及工时、停站时间、是否分班. -- 这里我们也叫抽车
 			 * @param bxlpbc  班型下的各个路牌的所有班次数组.
 			 * @param map 表单参数信息 
 			 * @param dataMap  封装的 以上、下行方向成对存在的 一些参数数组 [下标0 -- 代表上行 ; 下标1 -- 代表下行].
@@ -385,8 +385,13 @@ var BaseFun = function() {
 			abstractBcByWorkTime : function(bxlpbc , map , dataMap , saa  , cara , bxrcObj , dgminpcs) {
 				var rsultA = new Array();
 				for(var a = 0 ; a < bxlpbc.length ; a++) {
+					/*if(a>0)
+						continue;*/
 					// 定义该版型下对应的路牌的班次数组、班次数组长度、该路牌上是否有首末班车。
-					var lpbc = bxlpbc[a].lpbc, lpbclen_ , isFlag = baseF.lpDownIsHaveFirstAndLastBc(lpbc , dataMap.smbcsjArr);
+					var lpbc = bxlpbc[a].lpbc, lpbclen_ = lpbc.length;
+					if(lpbclen_<=0)
+						continue;
+					var isFlag = baseF.lpDownIsHaveFirstAndLastBc(lpbc , dataMap.smbcsjArr);
 					// 定义当前路牌的初始工时、班型对应的标准工时
 					var initCountGs = bxlpbc[a].initCountGs , bzgs = bxlpbc[a].bzgs;
 					// 定义初始工时与日平均工时差值
@@ -395,17 +400,15 @@ var BaseFun = function() {
 					var deletebcNum = Math.ceil((initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj) , tcbcgzA = new Array();
 					// var deletebcNum = parseInt((initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj) , tcbcgzA = new Array();
 					if(bxrcObj.type == '五工二休') {
-						if(lpbclen_>0) {
-							// 定义晚高峰后能剔除多少班次数.
-							var wgfhtcbcNum = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfsjd[0].ed ) / (60000 *　saa[0].zzsj.dgzzsj));
-							// 定义时间段内剔除班次规则.
-							tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed ,  'deletebcNum' : wgfhtcbcNum},
-									 	 {'minsj': dataMap.zgfsjd[0].ed  , 'maxsj' : dataMap.wgfsjd[0].st , 'deletebcNum' : deletebcNum - wgfhtcbcNum});
-							// 逆序排序剔除.
-							lpbc.sort(function(r,s){return s.fcno-r.fcno});
-							// 剔除不在高峰时间段内的班次.
-							baseF.spliceBc02(lpbc , tcbcgzA , dataMap , 'desc' , true);
-						}
+						// 定义晚高峰后能剔除多少班次数.
+						var wgfhtcbcNum = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfsjd[0].ed ) / (60000 *　saa[0].zzsj.dgzzsj));
+						// 定义时间段内剔除班次规则.
+						tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed ,'order' : 'desc' ,  'deletebcNum' : wgfhtcbcNum},
+								 	 {'minsj': dataMap.zgfsjd[0].ed  , 'maxsj' : dataMap.wgfsjd[0].st ,  'order' : 'asc' , 'deletebcNum' : deletebcNum - wgfhtcbcNum});
+						// 逆序排序剔除.
+						// lpbc.sort(function(r,s){return s.fcno-r.fcno});
+						// 剔除不在高峰时间段内的班次.
+						baseF.spliceBc02(lpbc , tcbcgzA , dataMap , 'desc' , false);
 					}else {
 						/*console.log(bxlpbc[a].lpNo , initCountGs , bzgs , saa[0].zzsj.dgzzsj ,
 								initCountGs - bzgs , (initCountGs - bzgs) /saa[0].zzsj.dgzzsj ,
@@ -416,7 +419,7 @@ var BaseFun = function() {
 							// 为了满足工时的要求，在低谷断开一段时间.
 							if(dgminpcs>0 && dgminpcs <= bxrcObj.fpcls ) {
 								if( (a + 1) <= dgminpcs) {
-									var dgzjsj = baseF.getDateTime('12:30');
+									var dgzjsj = baseF.getDateTime('13:00');
 									/*var zgfyh = dataMap.zgfsjd[0].ed;
 									zgfyh.setMinutes(zgfyh.getMinutes()+ Math.min.apply(null, dataMap.dgxxsjArr));*/
 									if( a % 2 == 0) {
@@ -443,17 +446,17 @@ var BaseFun = function() {
 									baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);
 								}else {
 									// 按规则剔除班次.不分班.路牌班次不会断开.
-									baseF.isdk02(lpbc , dataMap , deletebcNum , false);
+									baseF.isdk02(lpbc , dataMap , saa , deletebcNum , false);
 								}
 							// 该班型下的路牌 不存在分班路牌.
 							}else if(dgminpcs == 0){
 								// 按规则剔除班次.不分班.路牌班次不会断开.
-								baseF.isdk02(lpbc , dataMap , deletebcNum , false);
+								baseF.isdk02(lpbc , dataMap , saa , deletebcNum , false);
 							}
 						// 双档 一个路牌两档劳动力
 						}else if(bxlpbc[a].keepOff==2) {
 							// 按规则剔除班次.分班.但是路牌班次不会断开.
-							baseF.isdk02(lpbc , dataMap , deletebcNum , true);
+							baseF.isdk02(lpbc , dataMap , saa , deletebcNum , true);
 						}
 					}
 					rsultA = rsultA.concat(lpbc);
@@ -480,20 +483,28 @@ var BaseFun = function() {
 			 * 
 			 * 
 			 */
-			isdk02 : function(lpbc , dataMap , deletebcNum , isfb) {
-				if(deletebcNum > 0) {
-					var zgfzqtcbcNum = parseInt((  dataMap.zgfzqsjd[0].ed - dataMap.zgfzqsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj)),
-						wgfhtcbcNum  = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfzhsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj))
-						tcbcgzA = new Array();
-					if( wgfhtcbcNum  >= deletebcNum) {
+			isdk02 : function(lpbc , dataMap , saa , deletebcNum ,  isfb) {
+				if(lpbc.length > 0 && deletebcNum > 0) {
+					lpbc.sort(function(r,s){return r.fcint-s.fcint});
+					var tcbcgzA = new Array();
+					debugger;
+					if(lpbc[0].fcsj == dataMap.smbcsjArr[0].kssj || lpbc[0].fcsj == dataMap.smbcsjArr[1].kssj) {
 						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum});
-					}else if(zgfzqtcbcNum >= deletebcNum){
+					}else if(lpbc[lpbc.length-1].fcsj == dataMap.smbcsjArr[0].jssj || lpbc[0].fcsj == dataMap.smbcsjArr[1].jssj) {
 						tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum});
-					}else if(deletebcNum >= (zgfzqtcbcNum + wgfhtcbcNum)){
+					}else {
+						var zgfzqtcbcNum = parseInt((  dataMap.zgfzqsjd[0].ed - dataMap.zgfzqsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj)),
+							wgfhtcbcNum  = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfzhsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj));
 						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : wgfhtcbcNum},
-									 {'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed ,  'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum});
+							 	 	 {'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed ,  'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum});
 					}
-					// lpbc.sort(function(m,n){return n.fcno-m.fcno});
+					/*if( wgfhtcbcNum  >= deletebcNum) {
+						
+					}else if(zgfzqtcbcNum >= deletebcNum){
+						
+					}else if(deletebcNum >= (zgfzqtcbcNum + wgfhtcbcNum)){
+						
+					}*/
 					baseF.spliceBc02(lpbc ,  tcbcgzA , dataMap , isfb);
 				}
 			},
@@ -699,21 +710,9 @@ var BaseFun = function() {
 				var list = baseF.getBxRcListCollection(map.bxrc);
 				// 把班型分配到对应的具体路牌上.
 				baseF.bxAlloTotLp(list,cara);
-				
 				// 第六步 抽车来满足工时.
 				var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
-				
 				return {'json':baseF.addjcclcbc01(cara,tempA,dataMap,saa,map),'bxrcgs':null};
-				// return {'json':baseF.addjcclcbc01(cara,tempA,dataMap,saa,map),'bxrcgs':null};
-				// return {'json':tempA,'bxrcgs':null};
-				
-				
-				
-				// return {'json':tempA,'bxrcgs':null};
-				// return {'json':baseF.addjcclcbc01(cara,ttsmbA,dataMap,saa,map),'bxrcgs':null};
-				// return {'json':ttsmbA,'bxrcgs':null};
-				// return {'json':rsjar,'bxrcgs':null};
-				// return {'json':baseF.addjcclcbc01(cara,rsjar,dataMap,saa,map),'bxrcgs':null};
 			},
 			/**