bsthlq <2519941818@qq.com>

李强
1 parent a0ec3eb5
Showing 3 changed files with 434 additions and 76 deletions
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
src/main/resources/static/pages/base/timesmodel/js/d3.relationshipgraph.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
@@ -332,6 +332,8 @@ var BaseFun = function() {
 				var rs = new Array(),bxrcgs= new Array();
 				// 遍历已分配好路牌的班型人次数组.	
 				for(var x = 0 ; x < bxrclist.length; x++) {
+					/*if(x>0)
+						continue;*/
 					// 定义当前班型人次下的路牌数组.
 					var cla = bxrclist[x].sslp;
 					var dsdnmb = bxrclist[x].rs/bxrclist[x].fpcls;
@@ -339,12 +341,13 @@ var BaseFun = function() {
 					var hoursV = bxrclist[x].hoursV*dsdnmb;
 					// 遍历路牌
 					for(var s = 0 ; s < cla.length; s++) {
+						/*if(s>1 || s==0)
+							continue;*/
 						//cla[s].lpName =  bxrclist[x].type;
 						// 获取路牌编号.
 						var lpNo = cla[s].lpNo;
 						// 定义路牌下的所有班次.
 						var lpbc = new Array();
-						bxrcgs.push({'lpNo':lpNo,'hoursV':hoursV,'type':bxrclist[x].type});
 						// 遍历班次数.
 						for(var i =0 ; i <jsonArray.length; i++) {
 							// 判断当期遍历的班次是否属于当前的路牌.
@@ -359,10 +362,20 @@ var BaseFun = function() {
 								cara[l].lpName = bxrclist[x].type + '_' + lpNo ;
 							}
 						}
+						var _obj = baseF.getsxAndxxbc(lpbc,dataMap);
+						baseF.tcbc(_obj.sxbc,dataMap.smbcsjArr[0].kssj,dataMap.smbcsjArr[0].jssj);// 剔除上行不在时间范围内的班次
+						baseF.tcbc(_obj.xxbc,dataMap.smbcsjArr[1].kssj,dataMap.smbcsjArr[1].jssj);// 剔除下行不在时间范围内的班次
+						var tcnofwlpbc = _obj.sxbc.concat(_obj.xxbc);
 						// 按照发车序号顺序排序.
-						lpbc.sort(function(a,b){return b.fcno-a.fcno});
+						tcnofwlpbc.sort(function(a,b){return b.fcno-a.fcno});
+						/*var gsv = 0 ;
+						for(var z = 0 ;z < tza.length;z++) {
+							gsv = gsv + tza[z].bcsj + tza[z].STOPTIME;
+						}*/
+						// parseFloat((gsv/60).toFixed(2))
+						bxrcgs.push({'lpNo':lpNo,'hoursV':hoursV,'type':bxrclist[x].type});
 						// 调整班次数.也就是说调整工时.
-						rs = rs.concat(baseF.tzlpgs01(lpbc,hoursV,map,dataMap,lpNo,saa,bxrclist[x].type,lpNo,cara.length));
+						rs = rs.concat(baseF.tzlpgs01(tcnofwlpbc,hoursV,map,dataMap,lpNo,saa,bxrclist[x].type,lpNo,cara.length));
 					}
 				}
 				var jar01 = baseF.tzsmbcsj01(
@@ -375,6 +388,26 @@ var BaseFun = function() {
 				var jar = baseF.tzsmbcsj01(
 						baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
 								dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
+				// return {'json':jar,'bxrcgs':bxrcgs};
+				for(var r = 0 ; r < bxrcgs.length; r++) {
+					var lpNo = bxrcgs[r].lpNo;
+					var gsv = 0 , bczs = 0;
+					for(var g = 0 ; g< jar.length; g++) {
+						if(jar[g].lpNo == lpNo) {
+							gsv = gsv + jar[g].bcsj + jar[g].STOPTIME;
+							bczs++;
+						}
+					}
+					bxrcgs[r].sjgsV = gsv;
+					bxrcgs[r].bczs = bczs;
+				}
+				var jar3 = baseF.dqbcsAndgs(bxrcgs,jar,dataMap,cara.length);
+				// return {'json':jar3,'bxrcgs':bxrcgs};
+				/*var jar4 =  baseF.tzsmbcsj01(
+							baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar3,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
+									dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);*/
+				var rsjar = baseF.tzsztest(cara,jar3,dataMap);
+				return {'json':rsjar,'bxrcgs':bxrcgs};
 				var resultJA = new Array();
 				for(var m = 0 ; m < cara.length; m++) {
 					// 获取路牌编号.
@@ -382,11 +415,11 @@ var BaseFun = function() {
 					// 定义路牌下的所有班次.
 					var lpbc_ = new Array();
 					// 遍历班次数.
-					for(var x =0 ; x <jar.length; x++) {
+					for(var x =0 ; x <rsjar.length; x++) {
 						// 判断当期遍历的班次是否属于当前的路牌.
-						if(jar[x].lpNo == lpNo_) {
-							delete jar[x].fcint;
-							lpbc_.push(jar[x]);
+						if(rsjar[x].lpNo == lpNo_) {
+							delete rsjar[x].fcint;
+							lpbc_.push(rsjar[x]);
 						}
 					}
 					// 按照发车序号顺序排序.
@@ -396,6 +429,222 @@ var BaseFun = function() {
 				return {'json':resultJA,'bxrcgs':bxrcgs};
 			},
+			dqbcsAndgs : function(bxrcgs,jar,dataMap,cla) {
+				var bxA = new Array(),rsA = new Array();
+				for(var b = 0 ;b <bxrcgs.length; b++) {
+					if(bxA.indexOf(bxrcgs[b].type)<0)
+						bxA.push(bxrcgs[b].type);
+				}
+				var maxXxsjA = [parseInt(dataMap.map.upTravelTime),parseInt(dataMap.map.downTravelTime)];
+				var v1 = Math.max.apply(null, maxXxsjA) *1.5;
+				for(var a = 0 ;a < bxA.length;a++) {
+					var type = bxA[a],bxszA = new Array();
+					for(var s = 0 ; s < bxrcgs.length; s++) {
+						if(type == bxrcgs[s].type)
+							bxszA.push({'szgs':bxrcgs[s].sjgsV,'szbc' : bxrcgs[s].bczs, 'lpNo':bxrcgs[s].lpNo,'type' :bxrcgs[s].type});
+					}
+					var lpA = new Array();
+					if(bxszA.length>1) {
+						/*bxszA.sort(function(c,d){return ((c.szbc - d.szbc) && (c.szgs - d.szgs))});*/
+						bxszA.sort(function(c,d){return d.szgs - c.szgs});
+						for(var t = 0 ;t < bxszA.length;t++) {
+							var lpN_ = bxszA[t].lpNo;
+							/*if(lpN_==bxszA[0].lpNo)
+								continue;*/
+							var dx = bxszA[t].szbc - bxszA[0].szbc;
+							var type_ =  bxszA[t].type;
+							lpA = baseF.getlpbcA(lpN_,jar);
+							lpA.sort(function(x,y){return y.fcno - x.fcno});
+							var tempTag = false;
+							var isyddygbc = !baseF.issmbcsjArr(lpA[lpA.length-1].fcsj,dataMap.smbcsjArr);
+							var isydzhygbc = !baseF.issmbcsjArr(lpA[0].fcsj,dataMap.smbcsjArr);
+							if(dx>0) {
+								for(var j = 0 ; j < dx ; j++) {
+									for(var k = 0 ; k<lpA.length;k++) {
+										// 得到当前路牌下的发车时间.
+										var dqbcfcsj = baseF.getDateTime(lpA[k].fcsj);
+										// 判断时间范围.
+										if(dataMap.zgfsjd[0].ed < dqbcfcsj && dqbcfcsj < dataMap.wgfsjd[0].st) {
+											lpA.splice(k,1);
+											break;
+										}
+									}
+								}
+								tempTag = true;
+							}else if(bxszA[t].szgs < bxszA[0].szgs) {
+								var gsdx =  bxszA[0].szgs - bxszA[t].szgs;
+								// console.log(gsdx + '---' +  lpN_);
+								if(gsdx<=v1) {
+									if(isyddygbc && isydzhygbc) {
+										var dygbcydx = 0,zhygbcydx = 0;
+										if(gsdx%2==0) {
+											dygbcydx = gsdx/2;
+											zhygbcydx = dygbcydx;
+										}else {
+											dygbcydx = gsdx%2;
+											zhygbcydx = gsdx - dygbcydx;
+										}
+										baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
+										baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
+									}else if(isyddygbc) {
+										baseF.dygbcUpd(lpA[lpA.length-1],gsdx);
+									}else if(isydzhygbc) {
+										baseF.zhygbcUpd(lpA[0],lpA[1],gsdx);
+									}
+								}else {
+									var isZerInt = baseF.istzsjZero(lpA,dataMap);
+									var vag = 0,avgdx = 0;
+									if(gsdx % isZerInt==0) {
+										vag = gsdx / isZerInt;
+									}else {
+										vag = parseInt(gsdx / isZerInt);
+										avgdx = gsdx - vag*isZerInt;
+										if(isyddygbc && isydzhygbc) {
+											var dygbcydx = 0,zhygbcydx = 0;
+											if(avgdx%2==0) {
+												dygbcydx = avgdx/2;
+												zhygbcydx = dygbcydx;
+											}else {
+												dygbcydx = avgdx%2;
+												zhygbcydx = avgdx - dygbcydx;
+											}
+											baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
+											baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
+										}else if(isyddygbc) {
+											baseF.dygbcUpd(lpA[lpA.length-1],avgdx);
+										}else if(isydzhygbc) {
+											baseF.zhygbcUpd(lpA[0],lpA[1],avgdx);
+										}
+									}
+									var qbbfbc = new Array();
+									for(var v = 1 ; v < lpA.length;v++) {
+										var ddsj =  baseF.getDateTime(lpA[v-1].fcsj);
+										if(baseF.getDateTime("13:00") <= baseF.getDateTime(lpA[v].fcsj)) {
+											if(lpA[v].STOPTIME > 0 && !baseF.issmbcsjArr(lpA[v].fcsj,dataMap.smbcsjArr) ) {
+												lpA[v].STOPTIME = lpA[v].STOPTIME + vag;
+												ddsj.setMinutes(ddsj.getMinutes() - lpA[v].STOPTIME);
+												lpA[v].ARRIVALTIME = baseF.getTimeStr(ddsj);
+												ddsj.setMinutes(ddsj.getMinutes() - lpA[v].bcsj);
+												lpA[v].fcsj = baseF.getTimeStr(ddsj);
+												
+											}
+										}else {
+											if(!baseF.issmbcsjArr(lpA[v].fcsj,dataMap.smbcsjArr)) {
+												qbbfbc.push(lpA[v]);
+											}
+										}
+									}
+									qbbfbc.sort(function(x,y){return x.fcno - y.fcno});
+									for(var q = 0 ; q < qbbfbc.length; q++) {
+										if(q<(qbbfbc.length-1))
+											qbbfbc[q].STOPTIME = qbbfbc[q].STOPTIME + vag;
+										if(q==0)
+											continue;
+										else {
+											var ddsj_ =  baseF.getDateTime(qbbfbc[q-1].ARRIVALTIME);
+											ddsj_.setMinutes(ddsj_.getMinutes() + qbbfbc[q-1].STOPTIME);
+											qbbfbc[q].fcsj = baseF.getTimeStr(ddsj_);
+											ddsj_.setMinutes(ddsj_.getMinutes() + qbbfbc[q].bcsj);
+											qbbfbc[q].ARRIVALTIME = baseF.getTimeStr(ddsj_);
+										}
+									}
+								}
+							}
+							var start = baseF.getDateTime(lpA[0].ARRIVALTIME);
+							var end =  baseF.getDateTime(lpA[lpA.length-1].fcsj);
+							var hourdx = start.getHours() - end.getHours();
+							var minuedx = hourdx* 60 + (start.getMinutes() - end.getMinutes()) + lpA[0].STOPTIME;
+							var dx = 0;
+							/*if(minuedx > bxszA[0].szgs && tempTag) {
+								dx = minuedx - bxszA[0].szgs;
+								console.log(dx);
+							}else */
+							if(minuedx < bxszA[0].szgs && tempTag) {
+								dx = bxszA[0].szgs - minuedx;
+								if(dx > v1 && isyddygbc && isydzhygbc) {
+									var dygbcydx = 0,zhygbcydx = 0;
+									if(dx%2==0) {
+										dygbcydx = dx/2;
+										zhygbcydx = dygbcydx;
+									}else {
+										dygbcydx = dx%2;
+										zhygbcydx = dx - dygbcydx;
+									}
+									baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
+									baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
+								}else {
+									if(isyddygbc && isydzhygbc) {
+										var dygbcydx = 0,zhygbcydx = 0;
+										if(dx%2==0) {
+											dygbcydx = dx/2;
+											zhygbcydx = dygbcydx;
+										}else {
+											dygbcydx = dx%2;
+											zhygbcydx = dx - dygbcydx;
+										}
+										baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
+										baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
+									}else if(isyddygbc) {
+										baseF.dygbcUpd(lpA[lpA.length-1],dx);
+									}else if(isydzhygbc) {
+										baseF.zhygbcUpd(lpA[0],lpA[1],dx);
+									}
+								}
+							}
+							rsA = rsA.concat(lpA);
+						}
+					
+					}else {
+						rsA = rsA.concat(baseF.getlpbcA(bxszA[0].lpNo,jar));
+					}
+				}
+				return rsA;
+			},
+			
+			istzsjZero : function(arr,dataMap) {
+				var rsint = 0; 
+				for(var r = 1 ; r<arr.length;r++) {
+					if(arr[r].STOPTIME>0 && !baseF.issmbcsjArr(arr[r].fcsj,dataMap.smbcsjArr)) {
+						rsint++;
+					}
+				}
+				return rsint;
+			},
+			
+			dygbcUpd : function(obj,dx) {
+				obj.STOPTIME = obj.STOPTIME + dx;
+				var dygbcfcsj =  baseF.getDateTime(obj.fcsj);
+				dygbcfcsj.setMinutes(dygbcfcsj.getMinutes() - dx);
+				obj.fcsj = baseF.getTimeStr(dygbcfcsj);
+			},
+			
+			zhygbcUpd: function(obj,xgOjb,dx) {
+				xgOjb.STOPTIME = xgOjb.STOPTIME + dx;
+				var zhygbcydx =  baseF.getDateTime(obj.fcsj);
+				zhygbcydx.setMinutes(zhygbcydx.getMinutes() + dx);
+				obj.fcsj = baseF.getTimeStr(zhygbcydx);
+				zhygbcydx.setMinutes(zhygbcydx.getMinutes() + obj.bcsj);
+				obj.ARRIVALTIME = baseF.getTimeStr(zhygbcydx);
+			},
+			
+			issmbcsjArr : function(str,arr) {
+				var tag = false;
+				for(var a = 0 ;a < arr.length;a++) {
+					if(str == arr[a].kssj || str == arr[a].jssj)
+						tag = true;
+				}
+				return tag;
+			},
+			
+			getlpbcA : function(lpN_,jar) {
+				var lpA = new Array();
+				for(var p = 0 ; p < jar.length; p++ ) {
+					if(jar[p].lpNo == lpN_)
+						lpA.push(jar[p]);
+				}
+				return lpA;
+			},
+			
 			tzsztest : function(cara,tempa,dataMap) {
 				var jsrs = new Array();
 				for(var t = 0 ; t < cara.length; t++) {
@@ -445,22 +694,32 @@ var BaseFun = function() {
 			},
 			tztzsjInit01 : function(ar,dataMap) {
+				var maxXxsjA = [parseInt(dataMap.map.upTravelTime),parseInt(dataMap.map.downTravelTime)];
+				var v1 = Math.max.apply(null, maxXxsjA) *1.5;
 				for(var r = 0 ; r< ar.length-1;r++) {
 					var sgbcfcsj = baseF.getDateTime(ar[r+1].fcsj),dqbcddsj = baseF.getDateTime(ar[r].ARRIVALTIME);
 					var dxmin = parseInt( (sgbcfcsj - dqbcddsj)/60000);
 					if(dxmin<0 || ar[r].STOPTIME<0) {
 						var cctag = baseF.dirDmToIndex(ar[r].xlDir);
 						dxmin =  ar[r].bcType == dataMap.bcTypeArr.cf ? 0 :  baseF.isgfsjd01(baseF.getDateTime(ar[r].fcsj),dataMap) ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
-						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
+						/*dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
 						ar[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
 						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + ar[r+1].bcsj);
-						ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
+						ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);*/
 						/*sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - dxmin);
 						ar[r].ARRIVALTIME = baseF.getTimeStr(sgbcfcsj);
 						sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - ar[r].bcsj);
 						ar[r].fcsj = baseF.getTimeStr(sgbcfcsj);*/
+					}else if(dxmin >= v1 && dxmin < 180) {
+						dxmin = v1;
+					}
+					if(ar[r].STOPTIME >0) {
+						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
+						ar[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
+						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + ar[r+1].bcsj);
+						ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
+						ar[r].STOPTIME =  dxmin >= 180 ? 0 : parseInt(dxmin);
 					}
-					ar[r].STOPTIME = dxmin>180 ? 0 : dxmin;
 				}
 			},
@@ -573,64 +832,122 @@ var BaseFun = function() {
 				var jczwsj = saa[0].lbsj*2 + dataMap.ccsjArr[baseF.dirDmToIndex(arr[0].xlDir)] + 
 							 dataMap.jcsjArr[baseF.dirDmToIndex(arr[arr.length-1].xlDir)];
 				// 定义路牌总工时.第一次切高峰之间和晚高峰之后的班次.
-				var lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
-				while(lpdqzgs>gs) {
-					for(var t = 0 ; t<arr.length;t++) {
-						// 得到当前路牌下的发车时间.
-						var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
-						// 判断时间范围.
-						if(!baseF.issplice(dqbcfcsj,dataMap,type,lpNo,cla)) {
-							arr.splice(t,1);
-							break;
+				var lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2)),tagboolean = true;
+				while(tagboolean) {
+					if(lpdqzgs>gs) {
+						var temp = true ; 
+						for(var t = 0 ; t<arr.length;t++) {
+							// 得到当前路牌下的发车时间.
+							var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
+							// 判断时间范围.
+							if(!baseF.issplice(dqbcfcsj,dataMap,type,lpNo,cla)) {
+								arr.splice(t,1);
+								temp = false;
+								break;
+							}
 						}
+						lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
+						if(temp)
+							tagboolean = false;
+					}else {
+						tagboolean = false;
 					}
-					lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
 				}
+				if(arr[0].xlDir == arr[arr.length-1].xlDir) {
+					baseF.addbc01(arr,arr[0],dataMap);
+				}
+				var gfzjst = null
 				for(var c = 0 ; c<arr.length;c++) {
 					var cfsjbc = baseF.getDateTime(arr[c].fcsj);
 					if(dataMap.gfzjsjd[0].st <= cfsjbc && cfsjbc <= dataMap.gfzjsjd[0].ed && arr[c].bcType == dataMap.bcTypeArr.cf )
 						gfzjst = baseF.getDateTime(arr[c].ARRIVALTIME);
 				}
-				gfzjst == null ? dataMap.gfzjsjd[0].st  : gfzjst;
+				gfzjst = gfzjst == null ? dataMap.gfzjsjd[0].st  : gfzjst;
 				var gfzjbc = new Array(),wgfbc = new Array(),zgfbc = new Array();
-				for(var a = 0 ; a<arr.length;a++) {
-					var tmkssj = baseF.getDateTime(arr[a].fcsj)
+				for(var x = 0 ; x<arr.length;x++) {
+					var tmkssj = baseF.getDateTime(arr[x].fcsj)
 					if(gfzjst <= tmkssj && tmkssj <= dataMap.gfzjsjd[0].ed)
-						gfzjbc.push(arr[a]);
+						gfzjbc.push(arr[x]);
 					else if(dataMap.wgfsjd[0].st <= tmkssj && tmkssj <= dataMap.wgfsjd[0].ed)
-						wgfbc.push(arr[a]);
+						wgfbc.push(arr[x]);
 					else
-						zgfbc.push(arr[a]);
+						zgfbc.push(arr[x]);
 				}
 				gfzjbc.sort(function(a,b){return a.fcno-b.fcno});
 				wgfbc.sort(function(a,b){return a.fcno-b.fcno});
-				if(gfzjbc[gfzjbc.length-1].xlDir == wgfbc[0].xlDir)
-					gfzjbc.splice(gfzjbc.length-1,1);
-				if(type!='五工二休') {
-					var gfzjst = null;
-					var dxmin = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
-					var addmin = parseInt(dxmin/gfzjbc.length);
-					for(var g = 0 ;g < gfzjbc.length;g++) {
-						if(gfzjbc[g].bcType != dataMap.bcTypeArr.cf)
-							gfzjbc[g].STOPTIME = gfzjbc[g].STOPTIME + addmin;
-						if(g==0) {
-							continue;
-						}else {
-							var tempd = baseF.getDateTime(gfzjbc[g-1].ARRIVALTIME);
-							tempd.setMinutes(tempd.getMinutes() + gfzjbc[g-1].STOPTIME);
-							gfzjbc[g].fcsj = baseF.getTimeStr(tempd);
-							tempd.setMinutes(tempd.getMinutes() + gfzjbc[g].bcsj);
-							gfzjbc[g].ARRIVALTIME =  baseF.getTimeStr(tempd);
+				if(gfzjbc.length>0 && wgfbc.length>0) {
+					if(gfzjbc[gfzjbc.length-1].xlDir == wgfbc[0].xlDir && dataMap.map.linePlayType == "0"){
+						// addbc
+						baseF.addbc01(gfzjbc,gfzjbc[gfzjbc.length-1],dataMap);
+					}
+					if(type!='五工二休') {
+						var dxmin = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
+						var addmin = parseInt(dxmin/gfzjbc.length);
+						var rsM = baseF.gettzsjbs(gfzjbc,addmin,dataMap);
+						if(rsM.tag) {
+							for(var g = 0 ;g < gfzjbc.length;g++) {
+								if(gfzjbc[g].bcType != dataMap.bcTypeArr.cf)
+									gfzjbc[g].STOPTIME = gfzjbc[g].STOPTIME + addmin;
+								if(g==0) {
+									continue;
+								}else {
+									var tempd = baseF.getDateTime(gfzjbc[g-1].ARRIVALTIME);
+									tempd.setMinutes(tempd.getMinutes() + gfzjbc[g-1].STOPTIME);
+									gfzjbc[g].fcsj = baseF.getTimeStr(tempd);
+									tempd.setMinutes(tempd.getMinutes() + gfzjbc[g].bcsj);
+									gfzjbc[g].ARRIVALTIME =  baseF.getTimeStr(tempd);
+								}
+							}
 						}
+						gfzjbc[gfzjbc.length-1].STOPTIME  = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
 					}
-					gfzjbc[gfzjbc.length-1].STOPTIME  = parseInt((baseF.getDateTime(wgfbc[0].fcsj)  -  baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
 				}
 				return gfzjbc.concat(wgfbc).concat(zgfbc);
 			},
+			addbc01 : function(gfzjbc,lastObj,dataMap) {
+				var kssj = new Date(),strArray = lastObj.ARRIVALTIME.split(':');
+				kssj.setHours(parseInt(strArray[0]));
+				kssj.setMinutes(parseInt(strArray[1]) + lastObj.STOPTIME);
+				var cctag = baseF.dirDmToIndex(lastObj.xlDir);
+				cctag = baseF.getfx(1,cctag);
+				var tzsj =  baseF.isgfsjd01(kssj,dataMap) ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
+				var _xxsj = baseF.getxssj(dataMap.zgfsjd,dataMap.wgfsjd,kssj,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag);// 获取行驶时间
+				// 定义班次序号
+				var xhNo = lastObj.fcno+1;
+				var carArray = {'lp':lastObj.lp,'lpNo':lastObj.lpNo,'lpName':lastObj.lpName,'lpType':lastObj.lpType};
+				var ags =  {'tcc_id':lastObj.tcc,'skbName':lastObj.ttinfo,'lineName':lastObj.xl+'_'};
+				gfzjbc.push(baseF.getbcObj( kssj,
+											_xxsj,
+											carArray,
+											'normal',
+											dataMap.dira[cctag],
+											xhNo++,
+											dataMap.pcxslcArr[cctag],
+											ags,0,
+											dataMap.qdzArr[cctag],
+											dataMap.zdzArr[cctag],
+											null,tzsj,0));
+			},
+			
+			gettzsjbs : function(array,bs,dataMap) {
+				var tag = true,dx = 0;
+				var tempA = new Array(),maxXxsjA = [parseInt(dataMap.map.upTravelTime),parseInt(dataMap.map.downTravelTime)];
+				for(var r = 0 ; r<array.length;r++) {
+					tempA.push(array[r].STOPTIME + bs);
+				}
+				var v1 = Math.max.apply(null, maxXxsjA) *1.5;
+				var v2 = Math.max.apply(null, tempA);
+				if( v2 > v1) {
+					tag = false;
+					dx = parseInt(v2 -v1);
+				}
+				return {tag:tag,dx:dx};	
+			},
+			
 			issplice : function (kssj,dataMap,type,lpNo,cla){
 				var tag = false;
-				if(type=='五工二休' || lpNo <Math.round(cla/2)) {
+				if(type=='五工二休' || lpNo <= Math.round(cla/2)) {
 					if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) || 
 							( dataMap.wgfsjd[0].st <= kssj && kssj <=  dataMap.wgfsjd[0].ed))
 						tag = true;
@@ -1152,12 +1469,12 @@ var BaseFun = function() {
 					while(kssj<=endTime) {
 						cctag = map.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
 						fxTagDm = 1;
-						var cfdd = baseF.getcfdd(map.cfdd,cctag);
+						/*var cfdd = baseF.getcfdd(map.cfdd,cctag);
 						if(kssj> new Date (baseF.getCFDate(10,30)) && 
 								kssj<new Date (baseF.getCFDate(11,30)) && $_cfn<1 && cfdd == cctag) {
 							$_cfn++;
 							rs.push(baseF.getbcObj(
-									kssj,dataMap.zwcArr[0],cara[c],dataMap.bcTypeArr.cf,
+									kssj,dataMap.zwcAr	r[0],cara[c],dataMap.bcTypeArr.cf,
 									dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0));// 午餐班次
 						}else if(kssj> new Date (baseF.getCFDate(18,30)) && 
 									kssj<new Date (baseF.getCFDate(19,30)) && $_cfw<1 && cfdd == cctag &&
@@ -1166,15 +1483,15 @@ var BaseFun = function() {
 							rs.push(baseF.getbcObj(
 									kssj,dataMap.zwcArr[1],cara[c],dataMap.bcTypeArr.cf,
 									dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0));// 晚餐班次
-						}
+						}*/
 						var tzsj =  baseF.isgfsjd01(kssj,dataMap) ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
 						// var tzsj =  dataMap.ztjxA[cctag];
 						var _xxsj = baseF.getxssj(dataMap.zgfsjd,dataMap.wgfsjd,kssj,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag);// 获取行驶时间
-						tzsj = baseF.isLastbc(kssj,endTime,tzsj,_xxsj)  ?  0 :　tzsj;
+						var xs_tzsj = baseF.isLastbc(kssj,endTime,tzsj,_xxsj)  ?  0 :　tzsj;
 						rs.push(baseF.getbcObj(
 								kssj,_xxsj,cara[c],dataMap.bcTypeArr.normal,
 								dataMap.dira[cctag],xhNo++,dataMap.pcxslcArr[cctag],map,0,
-								dataMap.qdzArr[cctag],dataMap.zdzArr[cctag],null,tzsj,0));// 正常班次
+								dataMap.qdzArr[cctag],dataMap.zdzArr[cctag],null,xs_tzsj,0));// 正常班次
 						kssj = new Date(kssj.setMinutes(kssj.getMinutes() + tzsj));
 					}
  				}
@@ -1336,8 +1653,8 @@ var BaseFun = function() {
 				var _obj = baseF.getsxAndxxbc(list);
 				baseF.tcbc(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj);// 剔除上行不在时间范围内的班次
 				baseF.tcbc(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj);// 剔除下行不在时间范围内的班次
-				baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
 				baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
+				baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
 				baseF.tzqtbc(_obj.sxbc,_obj.qt,sj,cl,zd,lbsj);
 				baseF.tzqtbc(_obj.xxbc,_obj.qt,sj,cl,zd,lbsj);
 				return _obj.sxbc.concat(_obj.xxbc).concat(_obj.qt);
@@ -1353,8 +1670,14 @@ var BaseFun = function() {
 				var _obj = baseF.getsxAndxxbc(list,dm);
 				baseF.tcbc(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj ,_obj.xxbc);// 剔除上行不在时间范围内的班次
 				baseF.tcbc(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 剔除下行不在时间范围内的班次
-				baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
-				baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
+				if(smbcsj[1].jssj < smbcsj[0].jssj ) {
+					baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
+					baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
+				}else {
+					baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
+					baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
+				}
+						
 				return _obj.sxbc.concat(_obj.xxbc).concat(_obj.qt);
 			},
 			tcbc : function(ar,kssj,jssj,ppar) {
@@ -947,11 +947,30 @@ var RelationshipGraph = function () {
     	key : 'statistics',
     	value : function statistics() {
     		var $_this = this,
-    			array = $_this.getSvgyAxisTransformY(),
-    			gdata = d3.selectAll('rect.data')[0],
-    			arrayTemp = new Array(),
-    			minValue = 0,timeNum;
+    			// array = $_this.getSvgyAxisTransformY(),
+    			array = $_this.configuration.taskTypes,
+    			tza = $_this.getDataArray();
     		for(var a=0;a<array.length;a++) {
+    			var lpNo = array[a].lpNo;
+    			var timeNum = 0 ,tempNum = 0;
+    			for(var z = 0 ;z < tza.length;z++) {
+    				if(tza[z].lpNo == lpNo) {
+    					timeNum = timeNum + tza[z].bcsj + tza[z].STOPTIME;
+    					tempNum ++;
+    				}
+				}
+    			var className = 'statis_container_' + lpNo;
+    			var textNodes = $("."+className).children("text");
+    			var hours = parseInt(timeNum/60);
+    			var mimus = timeNum%60, zgs =  hours +  (mimus==0? "": "." + mimus);
+    			var zgs = parseFloat((timeNum/60).toFixed(2));
+    			// var zgs = timeNum;
+    			$(textNodes[0]).text("总工时:" + zgs);
+    			$(textNodes[1]).text("总班次:"+(tempNum));
+    			// $_this.pptjbx($("."+className).children("rect")[2],zgs*1,lpNo,$_this);
+    		}
+    		/*for(var a=0;a<array.length;a++) {
+    			debugger;
     			var tempNum = 0,timeNum = 0,lpNo = '';
     			for(var g = 0 ; g <gdata.length;g++) {
     				var temp_i =  parseInt(d3.select(gdata[g]).attr('y'))-this.configuration.offsetY;
@@ -968,13 +987,14 @@ var RelationshipGraph = function () {
     			minValue = array[a];
     			var className = 'statis_container_' + array[a];
     			var textNodes = $("."+className).children("text");
-    			/*var hours = parseInt(timeNum/60);
-    			var mimus = timeNum%60,zgs =  hours +  (mimus==0? "": "." + mimus);*/
+    			var hours = parseInt(timeNum/60);
+    			var mimus = timeNum%60,zgs =  hours +  (mimus==0? "": "." + mimus);
     			var zgs = parseFloat((timeNum/60).toFixed(2));
+    			var zgs = timeNum;
     			$(textNodes[0]).text("总工时:" + zgs);
     			$(textNodes[1]).text("总班次:"+(tempNum));
     			$_this.pptjbx($("."+className).children("rect")[2],zgs*1,lpNo,$_this);
-    		}
+    		}*/
     	}
     }, {
@@ -1025,11 +1045,12 @@ var RelationshipGraph = function () {
     	value : function createStatistics() {
     		var svg = d3.select('.gantt-chart'),
     			_this = this,
-    			array = _this.getSvgyAxisTransformY();
+    			yAyxisA = _this.getSvgyAxisTransformY();
+    			array = _this.configuration.taskTypes;
     		var g_statis = svg.selectAll('.g_statis').data([1]).enter().append('g').classed({'g_statis':true}).attr("transform", "translate(" + _this.configuration.offsetX + ", " + _this.configuration.offsetY + ")");
         	for(var c = 0 ;c<array.length;c++) {
-        		var className = 'statis_container_' + array[c];
-        		var statis_container = g_statis.append('g').attr("class",className).attr("transform", "translate(" + 0 + ", " + array[c] + ")");
+        		var className = 'statis_container_' + array[c].lpNo;
+        		var statis_container = g_statis.append('g').attr("class",className).attr("transform", "translate(" + 0 + ", " + yAyxisA[c] + ")");
         		statis_container.append('rect').classed({'rect_shift':true})
         						.attr("x",-_this.configuration.offsetX)
         						.attr("y",9)
@@ -1527,7 +1548,8 @@ var RelationshipGraph = function () {
     	key : 'setIdValue',
     	value : function setIdValue(obj) {
     		// 设置id属性值. 由一个 常量字符串 + 班次数 + 常量字符串 + 发车序号 + 常量字符 + 对应的y轴值.
-        	return 'shift-rect-' + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent);
+        	// return 'shift-rect-' + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent);
+    		return 'shift-rect-' + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.lpName);
     	}
     }, {
     	/**
@@ -1615,7 +1637,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setRectParenNodeIdV',
     	value : function setRectParenNodeIdV(obj) {
-        	return 'parent_' + $_GlobalGraph.configuration.y(obj.parent) + '_' + obj.bcs + "_node_" + obj.fcno;
+        	// return 'parent_' + $_GlobalGraph.configuration.y(obj.parent) + '_' + obj.bcs + "_node_" + obj.fcno;
+    		return 'parent_' + $_GlobalGraph.configuration.y(obj.lpName) + '_' + obj.bcs + "_node_" + obj.fcno;
         }
     }, {
     	/**
@@ -1629,7 +1652,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setNextNodeIdV',
     	value : function setNextNodeIdV(obj) {
-        	return "shift-rect-" + (obj.bcs+1)  + '_' +  (obj.fcno+1) + '_' + $_GlobalGraph.configuration.y(obj.parent);
+        	// return "shift-rect-" + (obj.bcs+1)  + '_' +  (obj.fcno+1) + '_' + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-" + (obj.bcs+1)  + '_' +  (obj.fcno+1) + '_' + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -1643,7 +1667,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setLastNodeIdV',
     	value : function setLastNodeIdV(obj) {
-        	return "shift-rect-" + (obj.bcs-1)  + '_' + (obj.fcno-1)+ '_' + $_GlobalGraph.configuration.y(obj.parent);
+        	// return "shift-rect-" + (obj.bcs-1)  + '_' + (obj.fcno-1)+ '_' + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-" + (obj.bcs-1)  + '_' + (obj.fcno-1)+ '_' + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -1671,7 +1696,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText01IdV',
     	value : function setText01IdV(obj) {
-        	return "shift-rect-text01-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+        	// return "shift-rect-text01-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-text01-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -1755,7 +1781,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCircleIdV',
     	value : function setCircleIdV(obj) {
-     	   return "shift-rect-circle-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.parent);
+     	   // return "shift-rect-circle-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-circle-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.lpName);
          }
     }, {
     	/**
@@ -1833,7 +1860,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText02IdV',
     	value : function setText02IdV(obj) {
-           	return "shift-rect-text02-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+           	// return "shift-rect-text02-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+    		 return "shift-rect-text02-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -1873,7 +1901,9 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText03IdV',
     	value : function setText03IdV(obj) {
-        	return "shift-rect-text03-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.parent);
+        	/*return "shift-rect-text03-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.parent);*/
+    		return "shift-rect-text03-" +  obj.bcs + '_' + obj.fcno  + $_GlobalGraph.configuration.y(obj.lpName);
+        	
         }
     }, {
     	/**
@@ -1911,7 +1941,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText04IdV',
     	value : function (obj) {
-     	   return "shift-rect-text04-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+     	   /*return "shift-rect-text04-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);*/
+    		return "shift-rect-text04-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -2011,7 +2042,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCoverRectIdV',
     	value : function setCoverRectIdV(obj) {
-        	return "shift-rect-cover-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
+        	/*return "shift-rect-cover-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);*/
+    		return "shift-rect-cover-" +  obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	/**
@@ -2039,7 +2071,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCoverRectParentV',
     	value : function setCoverRectParentV(obj) {
-        	return "shift-rect-" + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent) + '-cover';
+        	//return "shift-rect-" + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent) + '-cover';
+    		return "shift-rect-" + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.lpName) + '-cover';
         }
     }, {
     	/**
@@ -2053,7 +2086,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCoverRectLastIdV',
     	value : function setCoverRectLastIdV(obj) {
-        	return "shift-rect-cover-" +  obj.bcs + '_' + (obj.fcno+1) + $_GlobalGraph.configuration.y(obj.parent);
+        	// return "shift-rect-cover-" +  obj.bcs + '_' + (obj.fcno+1) + $_GlobalGraph.configuration.y(obj.parent);
+    		return "shift-rect-cover-" +  obj.bcs + '_' + (obj.fcno+1) + $_GlobalGraph.configuration.y(obj.lpName);
         }
     }, {
     	key : 'mouseUpEvent',
@@ -388,7 +388,8 @@
 	 * @return 返回甘特图的参数配置信息.
 	 * */
 	function getGraphArgus(p) {
-		var VALUEKEYNAME = 'Worldwide Gross',MULTIPLE = Math.round(105/parseInt(p.stopAraay[0].sxsj)) >=4 ? Math.round(90/parseInt(p.stopAraay[0].sxsj)) : 3 ,
+		var MULTIPLE = Math.round(105/parseInt(p.stopAraay[0].sxsj)) >=4 ? Math.round(90/parseInt(p.stopAraay[0].sxsj)) :  Math.round(90/parseInt(p.stopAraay[0].sxsj)) *2;
+		var VALUEKEYNAME = 'Worldwide Gross' ,
 		 	DXHOURS = 24,MINUTE = 60,WIDTH = DXHOURS*MINUTE,MARGINLEFT = 380,HEIGHT = p.yAxisCarArray.length*60 + 240,
 		    MARGINBOTTOM = 240,OFFSETX = 90,OFFSETY = 180,OFFSETUPY = 120,OFFSETDOWNY = 60,
 		    STARTDATETIME = p.startDateTime ,ENDDATETIME = p.endDateTime ,TASKTYPES =p.yAxisCarArray ,TICKFORMAT ='%H:%M' ,SHOWTOOLTIPS = true;