bsthlq <2519941818@qq.com>

李强
1 parent 919ec200
Showing 4 changed files with 94 additions and 40 deletions
src/main/resources/static/pages/base/timesmodel/bctz.html
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
@@ -100,15 +100,16 @@ $(&#39;#tzbc_mobal&#39;).on(&#39;tzbcMobal.show&#39;, function(e,obj,cardata,bf){
 		submitHandler : function(f) {
 			// 1、 获取表单内容,并序列化
 			var params = form.serializeJSON();
+			var dataMap = obj.configuration.dataMap;
 			// 2、 调整路牌对应的班次总数
 			updFormParams(params);
 			// 3、调整班次.并重新给定班次序号和发车序号.再确定首末班车时间.最后渲染数据
-			obj.data(bf.tzsmbcsj(bf.setbcsAndfcno(tzbcDate()),
+			obj.data(bf.tzsmbcsj01(bf.setbcsAndfcno(tzbcDate()),
 					obj.configuration.dataMap.smbcsjArr,
 					obj.configuration.dataMap.ccsjArr,
 					obj.configuration.dataMap.cclcArr,
 					obj.configuration.dataMap.qdzArr,
-					obj.configuration.dataMap.lbsj));
+					obj.configuration.dataMap.lbsj,dataMap));
 			// 3、记录早操.并保存历史班次数据
 			obj.addHistory();
 			// 5、隐藏错误提示
@@ -232,7 +233,6 @@ $(&#39;#tzbc_mobal&#39;).on(&#39;tzbcMobal.show&#39;, function(e,obj,cardata,bf){
 	 * @return
 	 */
 	 function jsjclc(st,ar,pa,sjstr,fcno_,tempS,fxdm) {
-		 console.log('{' + tempS +  '......}')
 		 // 1、修改进出场班次.
 		 for(var p = 0;p<pa.length;p++) {
 			// A）、如果当前班次的发车时间等于 在没有调整班次总数之前的最后一个班次的到达时间,则这个班次是在没有调整班次之前的那个进场班次
@@ -408,8 +408,11 @@ var BaseFun = function() {
 							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();
+				return {'json':baseF.addjcclcbc01(cara,rsjar,dataMap,saa,map),'bxrcgs':bxrcgs};
+			},
+			
+			addjcclcbc01 : function(cara,rsjar,dataMap,saa,map) {
+				var resultJA = new Array(),bcs = 0;
 				for(var m = 0 ; m < cara.length; m++) {
 					// 获取路牌编号.
 					var lpNo_ = cara[m].lpNo;
@@ -423,11 +426,63 @@ var BaseFun = function() {
 							lpbc_.push(rsjar[x]);
 						}
 					}
+					baseF.addcfbc01(lpbc_,dataMap,map);
 					// 按照发车序号顺序排序.
 					lpbc_.sort(function(a,b){return a.fcno-b.fcno});
-					resultJA = resultJA.concat(baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map));
+					var tt = baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map);
+					bcs = baseF.updfcno01(tt,bcs);
+					// debugger;
+					resultJA = resultJA.concat(tt);
+				}
+				return resultJA;
+			},
+			
+			updfcno01 : function(bcArr,bcs) {
+				for(var i =0; i < bcArr.length;i++) {
+					bcArr[i].fcint = baseF.getDateTime(bcArr[i].fcsj).getTime();
+				}
+				bcArr.sort(function(a,b){return a.fcint-b.fcint});
+				for(var t = 0 ; t <bcArr.length;t++) {
+					bcs++;
+					bcArr[t].bcs = bcs;
+					bcArr[t].fcno = t+1;
+					delete bcArr[t].fcint;
 				}
-				return {'json':resultJA,'bxrcgs':bxrcgs};
+				return bcs;
+			},
+			
+			addcfbc01 : function(lpbcar,dataMap,map) {
+				var gs = 0 ,sicftag = true;
+				for(var g = 0 ; g <lpbcar.length;g++ ) {
+					gs = gs + lpbcar[g].bcsj + lpbcar[g].STOPTIME;
+					if(lpbcar[g].STOPTIME==0 && g!=0 && g!=(lpbcar.length-1)) {
+						lpbcar[g].isfb = 1;
+						sicftag = false;
+					}
+				}
+				/*if(sicftag) {
+					for(var j = 0 ; j <lpbcar.length;j ++ ) {
+						var kssj =  baseF.getDateTime(lpbcar[j].fcsj);
+						var tzsj =  lpbcar[j].STOPTIME;
+						var cctag = baseF.dirDmToIndex(lpbcar[j].xlDir);
+						var cfdd = baseF.getcfdd(map.cfdd,cctag);
+						if(kssj> new Date (baseF.getCFDate(10,30)) && 
+								kssj<new Date (baseF.getCFDate(11,30))  && cfdd == cctag) {
+							console.log(tzsj,lpbcar[j].fcsj);
+							rs.push(baseF.getbcObj(
+									kssj,dataMap.zwcArr[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))  && cfdd == cctag ) {
+							console.log(tzsj,lpbcar[j].fcsj);
+							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)); 
+							
+						}
+					}
+				}*/
 			},
 			dqbcsAndgs : function(bxrcgs,jar,dataMap,cla) {
@@ -806,7 +861,25 @@ var BaseFun = function() {
 								dqbcfcsj,dataMap.ccsjArr[fxdm],car,dataMap.bcTypeArr.out,
 								dataMap.dira[fxdm],2,dataMap.cclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 出场班次
 						fcno ++;
-					}else if(b==bc.length-1){
+					}/*else if(b > 0 && b < bc.length-1){
+						var jcbckssj =  baseF.getDateTime(bc[b].ARRIVALTIME)
+						var ccbckssj = baseF.getDateTime(bc[b+1].fcsj)
+						var dx = parseInt((ccbckssj - jcbckssj)/60000);
+						if(bc[b].STOPTIME==0) {
+							 // bc[b].STOPTIME = 0;
+							//console.log(bc[b].fcno);
+							var fcno_ =  bc[b].fcno + 2;
+							stas = true;
+							// console.log(bc[b],bc[b+1],b);
+							result.push(baseF.getbcObj(
+									jcbckssj,dataMap.jcsjArr[fxdm],car,dataMap.bcTypeArr.in_,
+									dataMap.dira[fxdm],fcno_++,dataMap.jclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 进场班次
+							var ccfx = baseF.dirDmToIndex(bc[b+1].xlDir);
+							result.push(baseF.getbcObj(
+									ccbckssj,dataMap.ccsjArr[ccfx],car,dataMap.bcTypeArr.out,
+									dataMap.dira[ccfx],fcno_++,dataMap.cclcArr[ccfx],gatps,0,dataMap.qdzArr[ccfx],null,null,0,0));// 出场班次
+						}
+					}*/else if(b==bc.length-1){
 						var fcno_ =  dxfno + 2;
 						var qdbcddsj = baseF.getDateTime(bc[b].ARRIVALTIME);
 						result.push(baseF.getbcObj(
@@ -1596,32 +1669,7 @@ var BaseFun = function() {
 			            {'type':'无工休',  'hoursV':5.43,  'minueV':'5:43'}];
 			},
 			setbcsAndfcno : function(listA) {
-				/*var array = new Array();
-				var len = listA.length;
-				for(var i =0;i<len;i++) {
-					if(array.indexOf(listA[i].lpNo)<0)
-						array.push(listA[i].lpNo);
-				}
-				array.sort(baseF.compare);
-				console.log(array);
-				var sortGattArray = new Array();
-				for(var k =0;k<array.length;k++) {
-					var index = array[k];
-					var temp = new Array();
-					for(var x=0;x<listA.length;x++) {
-						if(index==listA[x].lpNo)
-							temp.push(listA[x]);
-					}
-					var lpbc = baseF.sortDirArray(temp);
-					for(var p = 0 ;p<lpbc.length;p++) {
-						lpbc[p].fcno = (p+1);
-					}
-					sortGattArray = sortGattArray.concat(lpbc);
-				}
-				for(var b = 0 ; b <sortGattArray.length;b++) {
-					sortGattArray[b].bcs = (b+1);
-				}
-				return sortGattArray;*/
+				 
 				var array = new Array();
 				var len = listA.length;
 				for(var i =0;i<len;i++) {
@@ -732,7 +732,7 @@ var RelationshipGraph = function () {
         		yAxisYArray.splice(0,yAxisYArray.length);
         	for(var t = 0;t<this.configuration.taskTypes.length;t++) {
         		yAxisYArray.push({
-        			y:y(this.configuration.taskTypes[t].lpNo)+this.configuration.offsetY,
+        			y:y(this.configuration.taskTypes[t].lpName)+this.configuration.offsetY,
         			carname:this.configuration.taskTypes[t].lpName,
         			lpA : this.configuration.taskTypes[t]});
         	}
@@ -2475,9 +2475,11 @@ var RelationshipGraph = function () {
     		for(var s = 0 ; s < len ; s++) {
     			var rectNodesAttr = RelationshipGraph.getContextNodeAndData(d3.select(shiftRectA[s]).attr('id'));
     			if(rectNodesAttr.dqbcData.STOPTIME<0) {
-    				var nextTzsjDx = $_GlobalGraph.configuration.dataMap.minztjx - rectNodesAttr.dqbcData.STOPTIME;
+    				// var nextTzsjDx = $_GlobalGraph.configuration.dataMap.minztjx - rectNodesAttr.dqbcData.STOPTIME;
+    				var nextTzsjDx = 0 - rectNodesAttr.dqbcData.STOPTIME;
     				// 修改遍历的当前元素数据的停站时间为最小停站时间.
-    				rectNodesAttr.dqbcData.STOPTIME =  $_GlobalGraph.configuration.dataMap.minztjx;
+    				// rectNodesAttr.dqbcData.STOPTIME =  $_GlobalGraph.configuration.dataMap.minztjx;
+    				rectNodesAttr.dqbcData.STOPTIME =  0;
     				// 修改遍历的当前元素数据的文本展示停站时间
     				for(var t = 0 ; t < rectNodesAttr.dqbctextNodes.length ; t++) {
     					if(d3.select(rectNodesAttr.dqbctextNodes[t]).attr('text-type')=='gap') 
@@ -2500,6 +2502,7 @@ var RelationshipGraph = function () {
     				 * 修改下个班次的元素坐标属性值
     				 * 
     				 * */
+    				
     				rectNodesAttr.nextbcNode.attr('x',$_x);
     				var rectCover = d3.select(d3.selectAll('rect[parent-node='+ rectNodesAttr.nextbcNodeId + '-cover' +']')[0][0]);
     				rectCover.attr('x',$_x);
@@ -2995,7 +2998,7 @@ var RelationshipGraph = function () {
 			nowDate.setMinutes(parseInt(tm.min)+d.bcsj);// 10.3.1、设置分钟.
 			// 9.1.4、修改当前班次的到达时间.
 			d.ARRIVALTIME  =  BaseFun.getTimeStr(nowDate);
-			d.STOPTIME = parseInt((BaseFun.getDateTime(nodeContext.nextData.fcsj) -  BaseFun.getDateTime(d.ARRIVALTIME))/ 60000);
+			d.STOPTIME = d.isfb ==1 ? 0 : parseInt((BaseFun.getDateTime(nodeContext.nextData.fcsj) -  BaseFun.getDateTime(d.ARRIVALTIME))/ 60000);
     		/**
     		 * 9.2、修改元素沿X轴方向的X坐标属性值. 
     		 * 
@@ -3016,6 +3019,8 @@ var RelationshipGraph = function () {
     		}
     		/****************************************** update 当前的班次数据以及相关元素对象属性值. END ************************************/
+    		//console.log(nodeContext);
+    		//debugger;
     		// 10、计算与上个班次的停站时间.
 			var dxMinues =  parseInt((BaseFun.getDateTime(d.fcsj) - BaseFun.getDateTime(nodeContext.lastData.ARRIVALTIME)) / 60000);
@@ -3162,7 +3167,8 @@ var RelationshipGraph = function () {
     			 **/
         		var _obj = RelationshipGraph.getContextNodeAndData(d3.select(this).attr('parent-node').replace('-cover',''));
         		// 1.3、定义最小停站间隙.
-    			var minSoptTime = $_GlobalGraph.configuration.dataMap.minztjx;
+    			// var minSoptTime = $_GlobalGraph.configuration.dataMap.minztjx;
+        		var minSoptTime = 0;
     			// 1.4、创建当前时间对象.
     			var $_date = new Date();
     			// 1.5、判断 如果当前班次的停站时间小于零,则修改成最小停站时间.
@@ -421,7 +421,7 @@
         var hours=Math.floor(leave1/(3600*1000));
         DXHOURS = days*24+hours;
         WIDTH = DXHOURS*MINUTE*MULTIPLE;
-        debugger;
+        // debugger;
         var lpsplitA = getylp(p.yAxisCarArray);
 		var args = {
     	        'valueKeyName': VALUEKEYNAME,