Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 791d1557 bd01e897
Showing 19 changed files with 556 additions and 120 deletions
src/main/java/com/bsth/entity/oil/Ylxxb.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/start.js
src/main/resources/static/pages/base/timesmodel/gantt.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
src/main/resources/static/pages/base/timesmodel/tepms/bctype_temp.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/oil/add.html
src/main/resources/static/pages/oil/jyglList.html
src/main/resources/static/pages/oil/list_ph.html
@@ -45,6 +45,9 @@ public class Ylxxb {
 	@Transient
 	private String fgsname;
+	@Transient
+	private Double zjzl;
+	
 	public Integer getId() {
 		return id;
@@ -184,5 +187,13 @@ public class Ylxxb {
 	public void setFgsname(String fgsname) {
 		this.fgsname = fgsname;
 	}
+	public Double getZjzl() {
+		return zjzl;
+	}
+	public void setZjzl(Double zjzl) {
+		this.zjzl = zjzl;
+	}
+	
+	
 }
@@ -20,7 +20,7 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
 	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and ssgs=?2",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and gsdm=?2",nativeQuery=true)
 	List<Ylxxb> checkYlxx(String rq,String gs);
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
@@ -335,7 +335,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					arg0.setDestroy(destroy);
 					// 版本号
 					arg0.setVersions(versions);
-					/*arg0.setbJwpoints(bJwpoints);*/
+					arg0.setbJwpoints(bJwpoints);
 					// 插入站点信息
 					repository.save(arg0);
@@ -31,6 +31,7 @@ import com.bsth.repository.oil.CwjyRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.CwjyService;
+import com.bsth.util.Arith;
 import com.bsth.util.PageHelper;
 import com.bsth.util.PageObject;
@@ -314,7 +315,19 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				 return t;
 			 }
 		});
-		
+		List<Ylxxb> list= ylxxbRepository.checkYlxx(rq, gsdm);
+		for (int i = 0; i < yList.size(); i++) {
+			Ylxxb t=yList.get(i);
+			Double zjzl=0.0;
+			for (int j = 0; j < list.size(); j++) {
+				Ylxxb y=list.get(j);
+				if(t.getNbbm().equals(y.getNbbm())){
+					zjzl=Arith.add(zjzl, y.getJzl());
+				}
+				
+			}
+			t.setZjzl(zjzl);
+		}
 		return yList;
 	}
@@ -266,7 +266,44 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Ylb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
 			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 从排班表中计算出行驶的总里程
-			List<Map<String, Object>> listpb = scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
+			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
+			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
+
+			String sxtj=map2.get("sxtj").toString();
+			if(sxtj.equals("0")){
+				listpb=listpbs;
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, line,nbbm);
+				List<String> stringList=new ArrayList<String>();
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < listpbs.size(); j++) {
+						Map<String, Object> map = listpbs.get(j);
+						String mapNbbm=map.get("clZbh").toString();
+						if(strNbbm.equals(mapNbbm)){
+							listpb.add(map);
+						}
+					}
+				}
+			}
+			
 			List<Ylb> addList = new ArrayList<Ylb>();
 			List<Ylb> updateList = new ArrayList<Ylb>();
 			String ins="";
@@ -443,15 +480,53 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 指定日期YLB信息
 			List<Ylb> ylbList =new ArrayList<Ylb>();
+			List<Ylb> ylbLists =new ArrayList<Ylb>();
 			List<Ylb> iterator2=new ArrayList<Ylb>();
 			if(xlbm.equals("")){
-				ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+				ylbLists=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
 				iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
 			}else{
-				ylbList=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+				ylbLists=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
 				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
 			}
+			// 从排班表中计算出行驶的总里程
+
+			String sxtj=map.get("sxtj").toString();
+			if(sxtj.equals("0")){
+				ylbList=ylbLists;
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				List<String> stringList=new ArrayList<String>();
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < ylbLists.size(); j++) {
+						Ylb y = ylbLists.get(j);
+						String mapNbbm=y.getNbbm();
+						if(strNbbm.equals(mapNbbm)){
+							ylbList.add(y);
+						}
+					}
+				}
+			}
+			
 			for (int i=0;i<ylbList.size();i++) {
 				Ylb ylb = ylbList.get(i);
 				// 判断是否已经计算过
@@ -529,11 +529,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 			if(!scheduleRealInfo.isSflj()){
 				if (scheduleRealInfo.getBcType().equals("in") 
 						|| scheduleRealInfo.getBcType().equals("out")|| scheduleRealInfo.getBcType().equals("ldks")) {
-					double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
-					if(jhlcOrig-scheduleRealInfo.getJhlc()>0){
+					if(!scheduleRealInfo.isSflj()){
 						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
-					}else{
-						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
 					}
 				}
 			}
@@ -44,22 +44,24 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         try {
             // 对上传的excel文件做处理，将第一个sheet名字设定为工作表1
             File file = dataToolsService.uploadFile(filename, filedata);
-            Workbook workbook = Workbook.getWorkbook(file);
-            Sheet sheet = workbook.getSheet(0);
-
-            File fileCal = new File(file.getAbsolutePath() + "_sheetChange.xls");
-            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
-            WritableSheet writableSheet = writableWorkbook.createSheet("工作表1", 0);
-            for (int i = 0; i < sheet.getRows(); i++) {
-                Cell[] cells = sheet.getRow(i);
-                for (int j = 0; j < cells.length; j++) {
-                    writableSheet.addCell(new Label(j, i, cells[j].getContents()));
-                }
-            }
-            writableWorkbook.write();
-            writableWorkbook.close();
+//            Workbook workbook = Workbook.getWorkbook(file);
+//            Sheet sheet = workbook.getSheet(0);
+//
+//            File fileCal = new File(file.getAbsolutePath() + "_sheetChange.xls");
+//            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
+//            WritableSheet writableSheet = writableWorkbook.createSheet("工作表1", 0);
+//            for (int i = 0; i < sheet.getRows(); i++) {
+//                Cell[] cells = sheet.getRow(i);
+//                for (int j = 0; j < cells.length; j++) {
+//                    writableSheet.addCell(new Label(j, i, cells[j].getContents()));
+//                }
+//            }
+//            writableWorkbook.write();
+//            writableWorkbook.close();
+//
+//            return fileCal;
-            return fileCal;
+            return file;
         } catch (Exception exp) {
             throw new ScheduleException(exp);
@@ -47,10 +47,12 @@ public class ReportUtils {
 			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
 					sourcePath));
 			HSSFWorkbook wb = new HSSFWorkbook(fs);
-			Map<String, Object> m = (Map<String, Object>)tArray[0];
-			if(m.containsKey("sheetName") && m.get("sheetName")!=null
-					&& m.get("sheetName").toString().trim().length()!=0)
-				wb.setSheetName(0, m.get("sheetName").toString());
+			if(tArray.length != 0 && tArray[0] instanceof java.util.Map){
+				Map<String, Object> m = (Map<String, Object>)tArray[0];
+				if(m.containsKey("sheetName") && m.get("sheetName")!=null
+						&& m.get("sheetName").toString().trim().length()!=0)
+					wb.setSheetName(0, m.get("sheetName").toString());
+			}
 			HSSFSheet sheet = wb.getSheetAt(0);
 			HSSFRow row;
 			HSSFCell cell = null;
@@ -17,7 +17,7 @@ var pName = &#39;bsth_control&#39;
     , path = process.cwd()
     //根目录
     , root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
-    , workspace = root.substr(0, root.indexOf(separator + pName))
+    , workspace = root.substr(0, root.lastIndexOf(separator + pName))
     //临时目录
     , dest = (workspace + separator + pName + '@fatso_copy')//.replace(/\//g, '\\')
     , _static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static';
@@ -22,7 +22,7 @@ var excludes = [&#39;scheduleApp&#39;, &#39;trafficManage&#39;, &#39;control&#39;]
 	,path = process.cwd()
 	//根目录
 	,root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
-	,workspace = root.substr(0, root.indexOf(separator + pName))
+	,workspace = root.substr(0, root.lastIndexOf(separator + pName))
 	//临时目录
 	,dest = (workspace + separator + pName+'@fatso_copy')
 	,_static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static'
@@ -71,6 +71,11 @@
                                 </a>
                             </li>
                             <li>
+                                <a href="javascript:" class="tool-action editlp">
+                                    <i class="fa fa-pencil"></i>&nbsp;修改路牌
+                                </a>
+                            </li>
+                            <li>
                                 <a href="javascript:" class="tool-action addlp">
                                     <i class="fa fa-plus"></i>&nbsp;添加路牌
                                 </a>
@@ -58,7 +58,7 @@ var BaseFun = function() {
 				var array = new Array();
 				if(len>0) {
 					for(var y = 0; y<len; y++) {
-						array.push({lp:null,lpNo:y+1,lpName:y+1,lpType:'普通路牌'});//添加一个路牌对象
+						array.push({lp:null,lpNo:y+1, parent :y+1, lpName:y+1,lpType:'普通路牌'});//添加一个路牌对象
 					};
 				}
 				return array;
@@ -325,11 +325,9 @@ var BaseFun = function() {
 			},
 			BXPplaceClassesTime01 : function(saa,cara,map,seMap,dataMap,lpNoA) {
-				var allJsonD = baseF.plgfbc(saa,cara,map,seMap,dataMap);
-				var jsonArray = baseF.tzsmbcsj01(baseF.setbcsAndfcno(allJsonD),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj),lpNoA,dataMap;
+				var jsonArray = baseF.plgfbc(saa,cara,map,seMap,dataMap);
 				var list = baseF.splitBxRc(map.bxrc);
 				baseF.fprclp01(list,cara);
-				console.log(list);
 				var bxrclist = list.data;
 				var rs = new Array(),bxrcgs= new Array();
 				// 遍历已分配好路牌的班型人次数组.	
@@ -350,18 +348,33 @@ var BaseFun = function() {
 						// 遍历班次数.
 						for(var i =0 ; i <jsonArray.length; i++) {
 							// 判断当期遍历的班次是否属于当前的路牌.
-							if(jsonArray[i].lpNo == lpNo)
+							if(jsonArray[i].lpNo == lpNo) {
+								jsonArray[i].lpName =  bxrclist[x].type + '_' + lpNo ;
 								lpbc.push(jsonArray[i]);
+							}
+								
+						}
+						for(var l = 0 ; l <cara.length;l++  ) {
+							if(cara[l].lpNo == lpNo) {
+								cara[l].lpName = bxrclist[x].type + '_' + lpNo ;
+							}
 						}
 						// 按照发车序号顺序排序.
 						lpbc.sort(function(a,b){return b.fcno-a.fcno});
 						// 调整班次数.也就是说调整工时.
-						baseF.tzlpgs01(lpbc,hoursV,map,dataMap,lpNo,saa);
-						rs = rs.concat(lpbc);
+						rs = rs.concat(baseF.tzlpgs01(lpbc,hoursV,map,dataMap,lpNo,saa,bxrclist[x].type,lpNo,cara.length));
 					}
 				}
-				var jar = baseF.tzsmbcsj01(baseF.setbcsAndfcno(rs),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj),lpNoA,dataMap;
-				//var jar = baseF.tzsmbcsj(baseF.setbcsAndfcno(rs),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj),lpNoA,dataMap;
+				var jar01 = baseF.tzsmbcsj01(
+						baseF.setbcsAndfcno(
+								baseF.tzsztest(cara,
+										baseF.tzsmbcsj01(baseF.setbcsAndfcno(rs),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap),
+										dataMap)),
+								dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
+				baseF.jhfcjx01(jar01,dataMap);
+				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);
 				var resultJA = new Array();
 				for(var m = 0 ; m < cara.length; m++) {
 					// 获取路牌编号.
@@ -369,17 +382,140 @@ var BaseFun = function() {
 					// 定义路牌下的所有班次.
 					var lpbc_ = new Array();
 					// 遍历班次数.
-					for(var j =0 ; j <jar.length; j++) {
+					for(var x =0 ; x <jar.length; x++) {
 						// 判断当期遍历的班次是否属于当前的路牌.
-						if(jar[j].lpNo == lpNo_)
-							lpbc_.push(jar[j]);
+						if(jar[x].lpNo == lpNo_) {
+							delete jar[x].fcint;
+							lpbc_.push(jar[x]);
+						}
 					}
 					// 按照发车序号顺序排序.
 					lpbc_.sort(function(a,b){return a.fcno-b.fcno});
 					resultJA = resultJA.concat(baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map));
-					// resultJA = resultJA.concat(lpbc_);
 				}
-				return {'json':resultJA,'bxrcgs':null};
+				return {'json':resultJA,'bxrcgs':bxrcgs};
+			},
+			
+			tzsztest : function(cara,tempa,dataMap) {
+				var jsrs = new Array();
+				for(var t = 0 ; t < cara.length; t++) {
+					var sslpbcA = new Array();
+					for(var j =0 ; j <tempa.length; j++) {
+						// 判断当期遍历的班次是否属于当前的路牌.
+						if(tempa[j].lpNo == cara[t].lpNo)
+							sslpbcA.push(tempa[j]);
+					}
+					sslpbcA.sort(function(a,b){return a.fcno-b.fcno});
+					baseF.isbczt(sslpbcA,dataMap);
+					baseF.istccf(sslpbcA,dataMap);
+					baseF.tztzsjInit01(sslpbcA,dataMap);
+					jsrs = jsrs.concat(sslpbcA);
+				}
+				return jsrs;
+			},
+			
+			isbczt : function(ar,dataMap) {
+				for(var r = 0 ; r< ar.length-1;r++) {
+					if(ar[r].bcType==dataMap.bcTypeArr.cf)
+						continue;
+					if(ar[r].xlDir == ar[r+1].xlDir) {
+						ar.splice(r, 1);
+						r--;
+					}
+						
+				}
+			},
+			
+			istccf : function(ar,dataMap) {
+				for(var r = 0 ; r < ar.length;r++) {
+					if(ar[r].bcType==dataMap.bcTypeArr.cf){
+						if(r == ar.length-1){
+							ar.splice(r, 1);
+							break;
+						}else {
+							 var xbcsj = baseF.getDateTime(ar[r+1].fcsj);
+							 if(dataMap.wgfsjd[0].st <= xbcsj && xbcsj <=  dataMap.wgfsjd[0].ed) {
+								 ar.splice(r, 1);
+								 r--;
+							 }
+						}
+					}
+				}
+				
+			},
+			
+			tztzsjInit01 : function(ar,dataMap) {
+				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);
+						ar[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
+						dqbcddsj.setMinutes(dqbcddsj.getMinutes() + ar[r+1].bcsj);
+						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);*/
+					}
+					ar[r].STOPTIME = dxmin>180 ? 0 : dxmin;
+				}
+			},
+			
+			/** 
+			 * @description : (TODO) 均匀发车间隙
+			 * 
+			 * @params : [arr--某个方向下的班次数组;dir--方向;zzsj--周转时间]
+			 * 
+			 * @return : 返回一个数组.这里返回的是调整过后 发车间距均匀的班次数组
+			 **/
+			jhfcjx01 : function(bcArr,dataMap) {
+				if(bcArr.length<=0)
+					return;
+				var dirA = dataMap.dira;
+				for(var d = 0 ; d < dirA.length; d++) {
+					var fxdm = dirA[d],fxbc = new Array();
+					var cctag = baseF.dirDmToIndex(fxdm);
+					for(var b = 0;b<bcArr.length ; b++) {
+						bcArr[b].fcint = baseF.getDateTime(bcArr[b].fcsj).getTime();
+						if(bcArr[b].xlDir == fxdm)
+							fxbc.push(bcArr[b]);
+					}
+					var kssj = baseF.getDateTime(dataMap.smbcsjArr[cctag].kssj),// 开始时间.
+						jssj = baseF.getDateTime(dataMap.smbcsjArr[cctag].jssj);// 结束时间.
+					fxbc.sort(function(m,n){return m.fcint - n.fcint});
+					while(kssj<=jssj) {
+						var tagboolean = baseF.isgfsjd01(kssj,dataMap);
+						var zzsj =  tagboolean ?  dataMap.zzsj.gfzzsj : dataMap.zzsj.dgzzsj;
+						if(!tagboolean){
+							var temp = new Date();
+							temp.setHours(kssj.getHours());
+							temp.setMinutes(kssj.getMinutes()+zzsj);
+							var sjdbcArr = baseF.getObjRegion(kssj,temp,fxbc,dataMap);
+							var len_ = sjdbcArr.length;
+							var bcCount = baseF.getlpNum(sjdbcArr);// 定长度
+							if(len_>0 && bcCount > 0) {
+								var _fcjx = parseInt(Math.ceil(zzsj/bcCount));
+								var fcnosj = new Date(kssj);
+								for(var l = 0 ; l< len_ ; l++) {
+									sjdbcArr[l].fcsj = baseF.getTimeStr(fcnosj);
+									var _xxsj = baseF.getxssj(dataMap.zgfsjd,
+											  dataMap.wgfsjd,fcnosj,dataMap.pcxssjArr,
+											  dataMap.gfxxsjArr,baseF.dirDmToIndex(sjdbcArr[l].xlDir));// 获取行驶时间
+									sjdbcArr[l].bcsj = _xxsj;
+									var ddsj = new Date();
+									ddsj.setHours(fcnosj.getHours());
+									ddsj.setMinutes(fcnosj.getMinutes()+_xxsj);
+									sjdbcArr[l].ARRIVALTIME = baseF.getTimeStr(ddsj);
+									fcnosj.setMinutes(fcnosj.getMinutes() + _fcjx);
+								}
+							} 	
+						}
+						kssj = new Date(kssj.setMinutes(kssj.getMinutes() + zzsj));
+					}
+				}
 			},
 			/**
@@ -395,7 +531,7 @@ var BaseFun = function() {
 				var fcno = 0,dxfno = 0,stas = false;
 				for(var b = 0 ; b < bc.length;b++) {
 					var fxdm = baseF.dirDmToIndex(bc[b].xlDir);
-					var car = {'lp':bc[b].lp, 'lpNo':bc[b].lpNo, 'lpName':bc[b].lpName, 'lpType':bc[b].lpType};
+					var car = {'lp':bc[b].lp, 'lpNo':bc[b].lpNo, 'lpName':bc[b].lpName, 'lpType':bc[b].lpType };
 					if(b==0) {
 						var dqbcfcsj = baseF.getDateTime(bc[b].fcsj);
 						result.push(baseF.getbcObj(
@@ -432,20 +568,10 @@ var BaseFun = function() {
 			 * @param [arr--当前路牌下的班次数组;gs--当前路牌的总工时;dataMap--参数信息;lpNo--路牌编码;saa--参数信息]
 			 * 
 			 * */
-			tzlpgs01 : function(arr,gs,map,dataMap,lpNo,saa) {
+			tzlpgs01 : function(arr,gs,map,dataMap,lpNo,saa,type,lpNo,cla) {
 				// 定义当前路牌的进场时间、早晚例保时间.
 				var jczwsj = saa[0].lbsj*2 + dataMap.ccsjArr[baseF.dirDmToIndex(arr[0].xlDir)] + 
 							 dataMap.jcsjArr[baseF.dirDmToIndex(arr[arr.length-1].xlDir)];
-				// 定义开始、结束时间.
-				//var st = null , ed = null;
-				// 根据路牌编码依次轮流取高峰之间和晚高峰之后的时间段.
-				/*if(lpNo%2!=0) {
-					st = dataMap.gfzjsjd[0].st;
-					ed = dataMap.gfzjsjd[0].ed;
-				}else {
-					st = dataMap.wgfzhsjd[0].st;
-					ed = dataMap.wgfzhsjd[0].ed;
-				}*/
 				// 定义路牌总工时.第一次切高峰之间和晚高峰之后的班次.
 				var lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
 				while(lpdqzgs>gs) {
@@ -453,31 +579,66 @@ var BaseFun = function() {
 						// 得到当前路牌下的发车时间.
 						var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
 						// 判断时间范围.
-						if(!baseF.isgfsjd01(dqbcfcsj,dataMap)) {
+						if(!baseF.issplice(dqbcfcsj,dataMap,type,lpNo,cla)) {
 							arr.splice(t,1);
 							break;
 						}
 					}
 					lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
 				}
-				// 判断总工时是否大于班型对应的工时.
-				/*if(lpdqzgs>gs) {
-					// 定义相差值.
-					var dx = parseFloat((lpdqzgs - gs).toFixed(2));
-					// 定义圈数.
-					var qs = Math.round(dx*60/70);
-					for(var t = 0 ; t<arr.length;t++) {
-						// 得到当前路牌下的发车时间.
-						var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
-						// 判断时间范围.
-						if(dqbcfcsj>st && dqbcfcsj<ed) {
-							arr[t-1].STOPTIME = 0;
-							// 切割.
-							arr.splice(t,qs*2);
-							break;
+				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;
+				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)
+					if(gfzjst <= tmkssj && tmkssj <= dataMap.gfzjsjd[0].ed)
+						gfzjbc.push(arr[a]);
+					else if(dataMap.wgfsjd[0].st <= tmkssj && tmkssj <= dataMap.wgfsjd[0].ed)
+						wgfbc.push(arr[a]);
+					else
+						zgfbc.push(arr[a]);
+				}
+				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);
 						}
 					}
-				}*/
+					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);
+			},
+			
+			issplice : function (kssj,dataMap,type,lpNo,cla){
+				var tag = false;
+				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;
+				}else {
+					if(dataMap.zgfsjd[0].ed >= kssj || kssj >= dataMap.wgfsjd[0].st)
+						tag = true;
+				}
+				return tag;
 			},
 			/**
@@ -966,6 +1127,15 @@ var BaseFun = function() {
 				return tag;
 			},
+			getcfdd : function(value,dirc) {
+				var inv;
+				if(value =='allYes')
+					inv = parseInt(dirc);
+				else
+					inv = parseInt(value);
+				return inv;
+			},
+			
 			plgfbc : function(saa , cara , map, seMap ,dataMap) {
 				var len = cara.length,rs = new Array();
 				var lbsj = map.lb=='' ? 0:parseInt(map.lb);
@@ -982,14 +1152,16 @@ var BaseFun = function() {
 					while(kssj<=endTime) {
 						cctag = map.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
 						fxTagDm = 1;
+						var cfdd = baseF.getcfdd(map.cfdd,cctag);
 						if(kssj> new Date (baseF.getCFDate(10,30)) && 
-								kssj<new Date (baseF.getCFDate(12,0)) && $_cfn<1 ) {
+								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,
 									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(20,0)) && $_cfw<1 ) {
+									kssj<new Date (baseF.getCFDate(19,30)) && $_cfw<1 && cfdd == cctag &&
+									parseInt((endTime-kssj)/60000) > parseInt(dataMap.zwcArr[1])) {
 							$_cfw++;
 							rs.push(baseF.getbcObj(
 									kssj,dataMap.zwcArr[1],cara[c],dataMap.bcTypeArr.cf,
@@ -1009,8 +1181,7 @@ var BaseFun = function() {
 				return rs;
 			},
-			isgfsjd01 :　function(kssj,dataMap) {
-				
+			isgfsjd01 :　function(kssj,dataMap,type) {
 				var tag = false;
 				if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) || ( dataMap.wgfsjd[0].st <= kssj && kssj <=  dataMap.wgfsjd[0].ed))
 					tag = true;
@@ -1178,8 +1349,8 @@ var BaseFun = function() {
 			 * 
 			 * @return : 返回一个数组对象。这里返回的是时刻表明细数据
 			 **/
-			tzsmbcsj01 : function(list,smbcsj,sj,cl,zd,lbsj) {
-				var _obj = baseF.getsxAndxxbc(list);
+			tzsmbcsj01 : function(list,smbcsj,sj,cl,zd,lbsj,dm) {
+				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);// 调整上行首末班车时间
@@ -1191,7 +1362,7 @@ var BaseFun = function() {
 					if(baseF.isDelete(baseF.getDateTime(kssj),
 										baseF.getDateTime(jssj),
 										baseF.getDateTime(ar[s].fcsj))) {
-						var tempa = ar.concat(ppar),sslpA = new Array();
+						/*var tempa = ar.concat(ppar),sslpA = new Array();
 						for(var r  = 0 ; r<tempa.length;r++) {
 							if(tempa[r].lpNo == ar[s].lpNo)
 								sslpA.push(tempa[r]);
@@ -1211,7 +1382,7 @@ var BaseFun = function() {
 									break;
 								}
 							}
-						}
+						}*/
 						ar.splice(s, 1);
 						s--;
 					}  
@@ -1331,15 +1502,19 @@ var BaseFun = function() {
 				return tag;
 			},
-			getsxAndxxbc : function(json) {
+			getsxAndxxbc : function(json,dataMap) {
 				var upArray = new Array(),downArray = new Array(),qt = new Array();
             	for(var j = 0 ; j< json.length ; j++) {
-            		if(json[j].bcType=='normal' || json[j].bcType=='region') {
+            		//json[j].fcint = baseF.getDateTime(json[j].fcsj).getTime();
+            		if(json[j].bcType== dataMap.bcTypeArr.normal || 
+            				json[j].bcType== dataMap.bcTypeArr.region || 
+            				json[j].bcType== dataMap.bcTypeArr.major ||
+            				json[j].bcType== dataMap.bcTypeArr.venting) {
             			if(json[j].xlDir == 'relationshipGraph-up')
                 			upArray.push(json[j]);
                 		else if(json[j].xlDir == 'relationshipGraph-down')
                 			downArray.push(json[j]);
-            		}else {
+            		}else if(json[j].bcType == dataMap.bcTypeArr.cf) {
             			qt.push(json[j]);
             		}
             	}
@@ -1676,24 +1851,26 @@ var BaseFun = function() {
 				dqbcddsj.setMinutes(dqbcddsj.getMinutes() + _xxsj);
 				xgbc.ARRIVALTIME =  baseF.getTimeStr(dqbcddsj);// 修改下个班次的到达时间
 			},
-			getObjRegion : function(t1,t2,arr) {
+			getObjRegion : function(t1,t2,arr,dataMap) {
 				var _r = new Array();
 				for(var p= 0; p<arr.length ; p++) {
 					var _t = baseF.getDateTime(arr[p].fcsj);
-					if(_t >= t1 && _t <= t2)
+					if(_t >= t1 && _t <= t2 && arr[p].bcType != dataMap.bcTypeArr.cf )
 						_r.push(arr[p]);
 				}
-				/*return baseF.sortDirArray(_r);*/
 				return _r.sort(function(a,b){return a.fcno-b.fcno});
 			},
-			getlpNum : function(arr) {
-				var array = new Array(); 
-				for(var r = 0 ; r < arr.length ; r++) {
-					if(array.indexOf(arr[r].lpNo)<0)
-						array.push(arr[r].lpNo);
+			getlpNum : function(sz) {
+				var temparray = new Array(),len_ = 0; 
+				for(var r = 0 ; r <sz.length ; r++) {
+					if(temparray.indexOf(sz[r].lpNo)<0){
+						temparray.push(sz[r].lpNo);
+					}
 				}
-				return (array.length-1);
+				len_ = temparray.length;
+				temparray = null;
+				return len_;
 			},
 			/** 
 			 * @description : (TODO)更新进场与离场班次
@@ -219,11 +219,11 @@ $(&#39;.updownread&#39;).on(&#39;click&#39;,function() {
 			// 执行选择框关闭函数.
 			RelationshipGraph.gClose();
 			// 执行均匀发车间隙函数.
-			RelationshipGraph.updownread();
+			RelationshipGraph.updownread01();
 		});
 	}else {
 		// 执行均匀发车间隙函数
-		RelationshipGraph.updownread();
+		RelationshipGraph.updownread01();
 	}
 });
 /************************************************************************************************************************************************/
@@ -245,17 +245,46 @@ $(&#39;.aboutread&#39;).on(&#39;click&#39;,function() {
 			layer.closeAll();
 			// 执行选择框关闭函数.
 			RelationshipGraph.gClose();
-			// 执行均匀发车间隙函数.
+			// 执行调整班次函数.
 			RelationshipGraph.aboutread();
 		});
 	}else {
-		// 执行均匀发车间隙函数
+		// 执行调整班次函数
 		RelationshipGraph.aboutread();
 	}
 });
 /************************************************************************************************************************************************/
 /** 
+ * @description : (TODO) 修改路牌点击事件
+ * 
+ * @status OK.
+ ************************************************************************************************************************************************/
+$('.editlp').on('click',function() {
+	// 判断选择框是否存在.
+	if(RelationshipGraph.getFlagIndex()>0) {
+		// 关闭所有提示弹出层.
+		layer.closeAll();
+		layer.confirm('您正处于【批量班次操作】过程中...是否确定退出当前操作进行【修改路牌】!', {
+			btn : [ '确认提示并提交', '取消' ]
+		},function () {
+			// 关闭所有提示弹出层.
+			layer.closeAll();
+			// 执行选择框关闭函数.
+			RelationshipGraph.gClose();
+			// 执行修改路牌函数.
+			RelationshipGraph.editlpEvents();
+		});
+	}else {
+		// 执行修改路牌函数
+		RelationshipGraph.editlpEvents();
+	}
+});
+/************************************************************************************************************************************************/
+
+
+
+/** 
  * @description : (TODO) 监听保存数据事件.
  * 
  * @status OK. 
@@ -438,7 +467,7 @@ var createTooltip = function createTooltip(self) {
             count = keys.length,
             rows = [];
         var showKeys = self.configuration.showKeys;
-        var hiddenKeys = ['_PRIVATE_' ,'PARENTCOLOR', 'SETNODECOLOR', 'SETNODESTROKECOLOR','lpNo','lpName','lp','lpType',
+        var hiddenKeys = ['_PRIVATE_' ,'PARENTCOLOR', 'SETNODECOLOR', 'SETNODESTROKECOLOR','lpNo','parent','lp','lpType',
                           'jhlc','tcc','ttinfo','xl','isfb','qdz','zdz','isSwitchXl','bz','bcs',/*'fcno'*/];
         while (count--) {
             var element = keys[count];
@@ -459,7 +488,7 @@ var createTooltip = function createTooltip(self) {
                        		changeKey = '停息时间:';
                        else if(element=='xlDir')
                        		changeKey = '行驶方向:';
-                       else if(element=='parent')
+                       else if(element=='lpName')
                       		changeKey = '当前路牌:';
                        else if(element=='bcType')
                      		changeKey = '班次类型:';
@@ -607,7 +636,6 @@ var RelationshipGraph = function () {
 						   .attr('height', this.configuration.height + this.configuration.heightMargin)
 						   .attr('style', 'display: block')
 						   .append('g').attr("class", "gantt-chart");
-        	
         	// 创建时间线性区域
         	var x = d3.time
         			  .scale()
@@ -1197,6 +1225,7 @@ var RelationshipGraph = function () {
     		 $_GlobalGraph.configuration.taskTypes.push({'lp':null,'lpName':len+1,'lpNo':len+1,'lpType':'普通路牌'});
     		 // 添加路牌编码
     		 $_GlobalGraph.configuration.lpNoA.push(len+1);
+    		 $_GlobalGraph.configuration.lpNameA.push(len+1);
     		 // 修改图形高度
     		 $_GlobalGraph.configuration.height = $_GlobalGraph.configuration.lpNoA.length*60 + 240;
     		 // 修改初始化图形时间轴开始时间
@@ -1226,6 +1255,43 @@ var RelationshipGraph = function () {
     		}
     	}
     }, {
+    	key : 'updownread01',
+    	value : function updownread01() {
+    		// 1、获取所有班次数.
+    		var list = $_GlobalGraph.getDataArray();
+    		var dataMap = $_GlobalGraph.configuration.dataMap;
+    		var rsmap = BaseFun.getsxAndxxbc(list,dataMap);
+    		var cara =  $_GlobalGraph.configuration.taskTypes;
+    		var jar01 = rsmap.qt.concat(rsmap.sxbc).concat(rsmap.xxbc);
+    		BaseFun.jhfcjx01(jar01,dataMap);
+    		var jar = BaseFun.tzsmbcsj01(
+					BaseFun.setbcsAndfcno(BaseFun.tzsmbcsj01(BaseFun.setbcsAndfcno(BaseFun.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap)),
+							dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap);
+			var resultJA = new Array();
+			for(var m = 0 ; m < cara.length; m++) {
+				// 获取路牌编号.
+				var lpNo_ = cara[m].lpNo;
+				// 定义路牌下的所有班次.
+				var lpbc_ = new Array();
+				// 遍历班次数.
+				for(var x =0 ; x <jar.length; x++) {
+					// 判断当期遍历的班次是否属于当前的路牌.
+					if(jar[x].lpNo == lpNo_)
+						lpbc_.push(jar[x]);
+				}
+				// 按照发车序号顺序排序.
+				lpbc_.sort(function(a,b){return a.fcno-b.fcno});
+				resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,dataMap.lbsj,dataMap.map));
+			}
+			// 删除图形.
+   		 	$('svg.svg-chart').remove();
+   		 	// 重新创建图形.
+   		 	var graph_ = d3.select('#ganttSvg').relationshipGraph($_GlobalGraph.configuration);
+   		 	// 根据数据重新渲染图形.
+   		 	graph_.data(resultJA);
+   		 	$_GlobalGraph = graph_;
+    	}
+    }, {
     	key :　'updownread',
     	value : function updownread() {
     		//var index = layer.load(1, {shade: [0.1,'#fff'] });//0.1透明度的白色背景
@@ -1337,6 +1403,15 @@ var RelationshipGraph = function () {
     	}
     }, {
+    	key : 'editlpEvents',
+    	value : function() {
+    		// 弹出层mobal页面
+    		$.get('/pages/base/timesmodel/editlp.html', function(m){
+    			$(pjaxContainer).append(m);
+    			$('#editlp_mobal').trigger('editlpMobal.show',[$_GlobalGraph,BaseFun]);
+    		});
+    	}
+    }, {
     	key : 'checkAdd',
     	value : function checkAdd() {
     		var xl = $_GlobalGraph.configuration.dataMap.map.lineName.split('_');
@@ -1483,7 +1558,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setYValue',
     	value : function setYValue(obj) {
-        	return $_GlobalGraph.configuration.y(obj.parent) + $_GlobalGraph.configuration.offsetY;
+        	/*return $_GlobalGraph.configuration.y(obj.parent) + $_GlobalGraph.configuration.offsetY;*/
+    		return $_GlobalGraph.configuration.y(obj.lpName) + $_GlobalGraph.configuration.offsetY;
         }
     }, {
     	/**
@@ -1710,7 +1786,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCirclecyV',
     	value : function setCirclecyV(obj) {
-        	return $_GlobalGraph.configuration.y(obj.parent) +  $_GlobalGraph.configuration.offsetY + 12;
+        	/*return $_GlobalGraph.configuration.y(obj.parent) +  $_GlobalGraph.configuration.offsetY + 12;*/
+    		return $_GlobalGraph.configuration.y(obj.lpName) +   $_GlobalGraph.configuration.offsetY + 12;
         }
     }, {
     	/**
@@ -1865,7 +1942,9 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText04YV',
     	value : function setText04YV(obj) {
-    		return $_GlobalGraph.configuration.y(obj.parent) +  $_GlobalGraph.configuration.offsetY + 16;
+    		/*return $_GlobalGraph.configuration.y(obj.parent) +  $_GlobalGraph.configuration.offsetY + 16;*/
+    		return  $_GlobalGraph.configuration.y(obj.lpName) +$_GlobalGraph.configuration.offsetY + 16;
+    		
         }
     }, {
     	/**
@@ -32,7 +32,6 @@
 		});
 		$('.tipso-animation').tipso('show');
 		setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
-		console.log(map);
 		//debugger;
 		// 1、定义开始与结束时间点字符串.
 		var seMap = getStartAndEndDate(map);
@@ -379,7 +378,7 @@
 			ra.push(arr[i].lpNo);
 			name.push(arr[i].lpName);
 		}
-		return {'lpNoA':ra,'lpNameA':name};
+		return {'lpNoA':ra,'lpNameA':name,};
 	}
 	/**
 	 * @description : (TODO) 获取甘特图参数配置信息.
@@ -267,8 +267,8 @@
 		<div class="col-md-5">
 		 	<select type="text" class="form-control" name="cfdd" id="cfddSelect">
 				<option value="">请选择...</option>
-				<option value="{{map.line.startStationName}}">{{map.line.startStationName}}</option>
-				<option value="{{map.line.endStationName}}">{{map.line.endStationName}}</option>
+				<option value="0">{{map.line.startStationName}}</option>
+				<option value="1">{{map.line.endStationName}}</option>
 				<option value="allYes">起终点站都可以</option>
 			</select> 
 		</div> 
@@ -263,14 +263,13 @@
 			});
 			jName = params[0].split("\\")[0];
 			jGh = params[0].split("\\")[1];
-			var id = $("#"+params[1]).val();
+			var id = params[3];
 			$get('/realSchedule/MapById',{id:id},function(result){
 			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
 				var ludan_1 = template('ludan_1',result);
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
 			});
-			console.log(params);
 			$get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    getTime(result);
 				var ludan_2 = template('ludan_2',{list:result});
@@ -336,7 +335,8 @@
 		<tr>
 			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
 			<td width="32%">{{obj[2]}}</td>
-			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
+			<td width="20%">{{obj[3]}}</td>
+			<td  width="3%"  hidden="true">{{obj[0]}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -348,9 +348,11 @@
 <script type="text/html" id="list_info_px">
 	{{each list as obj i}}
 		<tr>
+			
 			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
 			<td width="32%">{{obj.clZbh}}</td>
-			<td width="23%">{{obj.lpName}}<input type="hidden" id="{{obj.clZbh}}" value="{{obj.id}}"></td>
+			<td width="23%">{{obj.lpName}}</td>
+			<td  hidden="true">{{obj.id}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -259,7 +259,8 @@
 					return{nbbm: params.term,
 	            	    gsbm:$('#ssgsdm').val(),
 	            	    fgsbm:$('#fgsdm').val(),
-	            	    xlbm:$('#xlbm').val()};
+	            	    xlbm:""
+	            	    };
 				},
 			    processResults: function (data) {
 			      return {
@@ -69,7 +69,7 @@
 								<th width="3%">油价</th>
 								<th width="4%">路单工号</th>
 								<th width="4%">备注</th>
-								<th width="10%">操作</th>
+								<th width="10%">总加注量</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
@@ -160,7 +160,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             type="text" value="{{obj.bz}}" style=" width:45px" />
 	</td>
 	<td>
-		<!--<a class="btn btn-sm blue btn-outline" onclick="editCyjy('{{obj.nbbm}}')" data-pjax><i class="fa fa-edit"></i> 编辑</a>-->
+		{{obj.zjzl}}
 	</td>
 </tr>
 {{/each}}
@@ -200,7 +200,6 @@ $(function(){
         	params['fgsbm']=$("#jyglListFgsdmId").val();
         	params['rq']=$("#rq").val();
         	 var i = layer.load(2);
-        	 console.log(params);
         	 $post('/cwjy/savejzl', params, function(){
         		 layer.close(i);
 		        		 var cells = $('tr.filter')[0].cells
@@ -316,7 +315,7 @@ $(function(){
 		params['page'] = page;
 		params['rq']=$("#rq").val();
-		var i = 2;
+		var i = layer.load(2);;
 		/* var jyglGsdm=$("#jyglListGsdmId").val();
 		var jyglFgsdm=$("#jyglListFgsdmId").val();
 		if(jyglGsdm=="" || jyglGsdm==null){
@@ -340,7 +339,6 @@ $(function(){
 			$.each(data, function(i, obj) {
                 obj.yyrq = $("#rq").val();
             });
-			console.log(data)
 			var bodyHtm = template('jygl_list_temp', {list: data});
 			$('#datatable_cwjy tbody').html(bodyHtm);
 			 iCheckChange();
@@ -229,7 +229,9 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
         </td>
         <td>
-			 {{obj.yh}}
+			 
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_yh" 
+            type="text" value="{{obj.yh}}" style=" width:50px"  disabled="true"　readOnly="true"  />
         </td>
         <td>
 			<select data-id="{{obj.id}}" class="in_carpark_rylx" style=" width:80px" >
@@ -319,7 +321,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             }
         });
-        
         //保存
         $("#saveButton").on('click',function(){
         	var ylArray = [];
@@ -627,9 +628,83 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         		});
 //                 startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
 //                 startOptShylLink($('#ll_oil_list .in_carpark_shyl'));
+            	 $('input').on('input propertychange',function(){
+                 	var id=$(this).data('id');
+                 	var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();
+            		if(jzl=="" || jzl ==null){
+            			jzl=0;
+            		}
+            		var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();
+            		if(czyl=="" || czyl==null){
+            			czyl=0;
+            		}
+            		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+            		if(jzyl=="" || jzyl==null){
+            			jzyl=0;
+            		}
+            		
+            		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+            		if(sh=="" || sh==null){
+            			sh=0;
+            		}
+            		var addNum=accAdd(jzl,czyl);
+            		var subNum=accAdd(jzyl,sh);
+            		var sub=numSubtr(addNum*1000,subNum*1000);
+            		var subValue=0;
+            		if(sub/1000>=0){
+            			subValue=sub/1000;
+            		}
+            		$('.in_carpark_yh[data-id='+id+']', '#ll_oil_list').val(subValue);
+            		
+                 });
             });
         }
+		
+		//页面计算防止精度丢失
+		var accAdd = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (mul(a, e) + mul(b, e)) / e;
+	    };
+	    var numSubtr = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (a * e - b * e) / e;
+	    };
+	    
+	    function mul(a, b) {
+	        var c = 0,
+	            d = a.toString(),
+	            e = b.toString();
+	        try {
+	            c += d.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        try {
+	            c += e.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+	    }
         //改变状态
         function startOptJzylLink(es) {
             es.editable({