bsthlq <2519941818@qq.com>

李强
1 parent 1c423f4d
Showing 1 changed file with 18 additions and 18 deletions
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
@@ -414,7 +414,7 @@ var BaseFun = function() {
 							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},);
+									 	 {'minsj': dataMap.zgfsjd[0].ed  , 'maxsj' : dataMap.wgfsjd[0].st , 'deletebcNum' : deletebcNum - wgfhtcbcNum});
 							// 逆序排序剔除.
 							lpbc.sort(function(r,s){return s.fcno-r.fcno});
 							// 剔除不在高峰时间段内的班次.
@@ -431,30 +431,29 @@ var BaseFun = function() {
 							if(dgminpcs>0 && dgminpcs <= bxrcObj.fpcls ) {
 								if( (a + 1) <= dgminpcs) {
 									var dgzjsj = baseF.getDateTime('12:30');
+									/*var zgfyh = dataMap.zgfsjd[0].ed;
+									zgfyh.setMinutes(zgfyh.getMinutes()+ Math.min.apply(null, dataMap.dgxxsjArr));*/
 									if( a % 2 == 0) {
 										// 定义早高峰结束 ~ 12:30 剔除规则.如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
 										var swmaxtcbcNum = parseInt(( dgzjsj - dataMap.zgfsjd[0].ed) / (60000 *　saa[0].zzsj.dgzzsj));
-										if(initdx < 240) {
-											tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
+										if(deletebcNum < swmaxtcbcNum) {
+											// tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
+											tcbcgzA.push({'minsj':  dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
 										}else { 
-											tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc'   , 'deletebcNum' : swmaxtcbcNum},
+											tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed, 'maxsj' : dgzjsj , 'order' : 'asc'   , 'deletebcNum' : swmaxtcbcNum},
 														 {'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed, 'order' : 'desc' , 'deletebcNum' : deletebcNum - swmaxtcbcNum});
 										}
-										// 顺序排序
-										// lpbc.sort(function(x,y){return x.fcno-y.fcno});
+										// tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
 									}else {
 										// 定义12:30 ~ 晚高峰开始以前剔除规则. 如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
 										var xwmaxtcbcNum = parseInt(( dataMap.wgfsjd[0].st - dgzjsj) / (60000 *　saa[0].zzsj.dgzzsj));
-										if(initdx < 210) {
+										if(deletebcNum < xwmaxtcbcNum) {
 											tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc',  'deletebcNum' : deletebcNum});
 										}else {
-											
 											tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum - xwmaxtcbcNum},
-														 {'minsj': dgzjsj  , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum},);
+														 {'minsj': dgzjsj  , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum});
 										}
-										// 逆序排序.
-										// lpbc.sort(function(m,n){return n.fcno-m.fcno});
-										// order = 'desc';
+										// tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc',  'deletebcNum' : deletebcNum});
 									}
 									// 按规则剔除班次.并且分班.路牌班次断开.
 									baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);
@@ -489,12 +488,12 @@ var BaseFun = function() {
 						wgfhtcbcNum  = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfzhsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj))
 						tcbcgzA = new Array();
 					if( wgfhtcbcNum  >= deletebcNum) {
-						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum},);
+						tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st  , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc',  'deletebcNum' : deletebcNum});
 					}else if(zgfzqtcbcNum >= deletebcNum){
-						tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum},);
+						tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st  , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum});
 					}else if(deletebcNum >= (zgfzqtcbcNum + wgfhtcbcNum)){
 						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});
 					baseF.spliceBc02(lpbc ,  tcbcgzA , dataMap , isfb);
@@ -655,9 +654,10 @@ var BaseFun = function() {
 				var ttsmbA =  baseF.tzsmbcsj01(tempA,dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
 				baseF.jhfcjx02(ttsmbA,dataMap);
-				return {'json':ttsmbA,'bxrcgs':null};
-				// var rsjar = baseF.tzsztest02(cara,ttsmbA,dataMap);
-				// return {'json':rsjar,'bxrcgs':null};
+				//return {'json':baseF.addjcclcbc01(cara,ttsmbA,dataMap,saa,map),'bxrcgs':null};
+				//return {'json':ttsmbA,'bxrcgs':null};
+				var rsjar = baseF.tzsztest02(cara,ttsmbA,dataMap);
+				return {'json':rsjar,'bxrcgs':null};
 				return {'json':baseF.addjcclcbc01(cara,rsjar,dataMap,saa,map),'bxrcgs':null};
 			},