Merge branch 'minhang' into pudong

潘钊
2 parents a119a6f9 36430cc8
Showing 32 changed files with 3555 additions and 413 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/summary/entity/FastAndSlow.java
src/main/java/com/bsth/data/summary/service/impl/FastAndSlowServiceImpl.java
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/CulateMileageService.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/js/strategy/ParameterObj.js
src/main/resources/static/pages/base/timesmodel/tepms/fcjx_temp.html
@@ -549,9 +549,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
 		List<String> rs = new ArrayList<>();
-		long t = new Date().getTime();
+		long t = System.currentTimeMillis();
 		if(c != 1)
-		 	t -= ONE_DAY - (1000 * 60 * 60 * 2);
+		 	t -= (ONE_DAY + (1000 * 60 * 60 * 2));
 		for(int i = 0; i < 3; i ++){
 			rs.add(fmtyyyyMMdd.print(t));
 			t -= ONE_DAY;
@@ -41,7 +41,7 @@ public class GpsRealAnalyse {
     @Autowired
     GpsRealData gpsRealData;
-    final static int POOL_SIZE = 15;
+    final static int POOL_SIZE = 30;
     static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
     public static long st;
@@ -68,7 +68,7 @@ public class GpsRealAnalyse {
             }
             List<String> deviceList = new ArrayList<>(multimap.keySet());
-            //数据均分给20个线程
+            //数据均分给线程
             ArrayListMultimap dataListMap = ArrayListMultimap.create();
             int size = deviceList.size(), threadIndex=0, threadSize = size / POOL_SIZE;
             for(int i = 0; i < size; i++){
@@ -70,14 +70,18 @@ public class InOutStationSignalHandle extends SignalHandle{
             return false;
         }
-        if(isNotEmpty(prevs)){
-            GpsEntity prev = prevs.getTail();
-            if(isOutStation(gps, prev))
-                outStation(gps, prev);
+        try{
+            if(isNotEmpty(prevs)){
+                GpsEntity prev = prevs.getTail();
+                if(isOutStation(gps, prev))
+                    outStation(gps, prev);
-            if(isInStation(gps, prev))
-                inStation(gps, prev);
+                if(isInStation(gps, prev))
+                    inStation(gps, prev);
+            }
+        }catch (Exception e){
+            logger.error("in out error info ..", e);
         }
         return true;
@@ -21,6 +21,22 @@ public class FastAndSlow {
     private Long id;
     /**
+     * 驾驶员
+     */
+    private String jsy;
+
+    /**
+     * 车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 路牌名称
+     */
+    @Column(name = "lp_name")
+    private String lpName;
+
+    /**
      * 发车站点
      */
     private String stationName;
@@ -281,4 +297,28 @@ public class FastAndSlow {
     public boolean isFast() {
         return this.fcsjFast>0 || this.dfsjFast>0 || this.zdsjFast>0 || this.zdsjDfFast>0;
     }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getJsy() {
+        return jsy;
+    }
+
+    public void setJsy(String jsy) {
+        this.jsy = jsy;
+    }
 }
 \ No newline at end of file
@@ -119,29 +119,33 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
         //前4行是表头
         Row row;
         row = sheet.getRow(0);
-        row.getCell(4).setCellValue(list.get(0).getRq());
+        row.getCell(0).setCellValue(list.get(0).getRq());
         row.getCell(13).setCellValue(BasicData.lineCode2NameMap.get(list.get(0).getLineCode()));
         FastAndSlow fas;
         for(int i = 0; i < list.size(); i++){
             fas = list.get(i);
             row = sheet.createRow(i + 4);
             row.createCell(0).setCellValue(i + 1);
-            row.createCell(1).setCellValue(fas.getStationName());
-            row.createCell(2).setCellValue(fas.getUpDown());
-            row.createCell(3).setCellValue(fas.getFcsj());
-            row.createCell(4).setCellValue(fas.getDfsj());
-            row.createCell(5).setCellValue(fas.getFcsjActual());
-            row.createCell(6).setCellValue(fas.getFcsjFast());
-            row.createCell(7).setCellValue(fas.getFcsjSlow());
-            row.createCell(8).setCellValue(fas.getDfsjFast());
-            row.createCell(9).setCellValue(fas.getDfsjSlow());
-            row.createCell(10).setCellValue(fas.getZdsj());
-            row.createCell(11).setCellValue(fas.getZdsjDf());
-            row.createCell(12).setCellValue(fas.getZdsjActual());
-            row.createCell(13).setCellValue(fas.getZdsjFast());
-            row.createCell(14).setCellValue(fas.getZdsjSlow());
-            row.createCell(15).setCellValue(fas.getZdsjDfFast());
-            row.createCell(16).setCellValue(fas.getZdsjDfSlow());
+            row.createCell(1).setCellValue(fas.getLpName());
+            row.createCell(2).setCellValue(fas.getNbbm());
+            row.createCell(3).setCellValue(fas.getJsy());
+
+            row.createCell(4).setCellValue(fas.getStationName());
+            row.createCell(5).setCellValue(fas.getUpDown());
+            row.createCell(6).setCellValue(fas.getFcsj());
+            row.createCell(7).setCellValue(fas.getDfsj());
+            row.createCell(8).setCellValue(fas.getFcsjActual());
+            row.createCell(9).setCellValue(fas.getFcsjFast());
+            row.createCell(10).setCellValue(fas.getFcsjSlow());
+            row.createCell(11).setCellValue(fas.getDfsjFast());
+            row.createCell(12).setCellValue(fas.getDfsjSlow());
+            row.createCell(13).setCellValue(fas.getZdsj());
+            row.createCell(14).setCellValue(fas.getZdsjDf());
+            row.createCell(15).setCellValue(fas.getZdsjActual());
+            row.createCell(16).setCellValue(fas.getZdsjFast());
+            row.createCell(17).setCellValue(fas.getZdsjSlow());
+            row.createCell(18).setCellValue(fas.getZdsjDfFast());
+            row.createCell(19).setCellValue(fas.getZdsjDfSlow());
             if(fas.getUpDown()==0)
                 ups.add(fas);
@@ -151,28 +155,28 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
         //合计
         int size = list.size();
         row = sheet.createRow(size + 4);
-        row.createCell(1).setCellValue("发车：上行（计划快误点："+jhfcFast(ups)+"  累计时间："+jhfcFastTime(ups)+"  待发快误点："+dffcFast(ups)+"  累计时间："+dffcFastTime(ups)+"） ");
-        row.createCell(9).setCellValue("下行（计划快误点："+jhfcFast(downs)+"  累计时间："+jhfcFastTime(downs)+"  待发快误点："+dffcFast(downs)+"  累计时间："+dffcFastTime(downs)+"）");
+        row.createCell(2).setCellValue("发车：上行（计划快误点："+jhfcFast(ups)+"  累计时间："+jhfcFastTime(ups)+"  待发快误点："+dffcFast(ups)+"  累计时间："+dffcFastTime(ups)+"） ");
+        row.createCell(12).setCellValue("下行（计划快误点："+jhfcFast(downs)+"  累计时间："+jhfcFastTime(downs)+"  待发快误点："+dffcFast(downs)+"  累计时间："+dffcFastTime(downs)+"）");
         row = sheet.createRow(size + 5);
-        row.createCell(1).setCellValue("发车：上行（计划慢误点："+jhfcSlow(ups)+"  累计时间："+jhfcSlowTime(ups)+"  待发慢误点："+dffcSlow(ups)+"  累计时间："+dffcSlowTime(ups)+"） ");
-        row.createCell(9).setCellValue("下行（计划慢误点："+jhfcSlow(downs)+"  累计时间："+jhfcSlowTime(downs)+"  待发慢误点："+dffcSlow(downs)+"  累计时间："+dffcSlowTime(downs)+"）");
+        row.createCell(2).setCellValue("发车：上行（计划慢误点："+jhfcSlow(ups)+"  累计时间："+jhfcSlowTime(ups)+"  待发慢误点："+dffcSlow(ups)+"  累计时间："+dffcSlowTime(ups)+"） ");
+        row.createCell(12).setCellValue("下行（计划慢误点："+jhfcSlow(downs)+"  累计时间："+jhfcSlowTime(downs)+"  待发慢误点："+dffcSlow(downs)+"  累计时间："+dffcSlowTime(downs)+"）");
         row = sheet.createRow(size + 6);
-        row.createCell(1).setCellValue("到达：上行（计划快误点："+jhzdFast(ups)+"  累计时间："+jhzdFastTime(ups)+"  待发快误点："+dfzdFast(ups)+"  累计时间："+dfzdFastTime(ups)+"） ");
-        row.createCell(9).setCellValue("下行（计划快误点："+jhzdFast(downs)+"  累计时间："+jhzdFastTime(downs)+"  待发快误点："+dfzdFast(downs)+"  累计时间："+dfzdFastTime(downs)+"）");
+        row.createCell(2).setCellValue("到达：上行（计划快误点："+jhzdFast(ups)+"  累计时间："+jhzdFastTime(ups)+"  待发快误点："+dfzdFast(ups)+"  累计时间："+dfzdFastTime(ups)+"） ");
+        row.createCell(12).setCellValue("下行（计划快误点："+jhzdFast(downs)+"  累计时间："+jhzdFastTime(downs)+"  待发快误点："+dfzdFast(downs)+"  累计时间："+dfzdFastTime(downs)+"）");
         row = sheet.createRow(size + 7);
-        row.createCell(1).setCellValue("到达：上行（计划慢误点："+jhzdSlow(ups)+"  累计时间："+jhzdSlowTime(ups)+"  待发慢误点："+dfzdSlow(ups)+"  累计时间："+dfzdSlowTime(ups)+"） ");
-        row.createCell(9).setCellValue("下行（计划慢误点："+jhzdSlow(downs)+"  累计时间："+jhzdSlowTime(downs)+"  待发慢误点："+dfzdSlow(downs)+"  累计时间："+dfzdSlowTime(downs)+"）");
+        row.createCell(2).setCellValue("到达：上行（计划慢误点："+jhzdSlow(ups)+"  累计时间："+jhzdSlowTime(ups)+"  待发慢误点："+dfzdSlow(ups)+"  累计时间："+dfzdSlowTime(ups)+"） ");
+        row.createCell(12).setCellValue("下行（计划慢误点："+jhzdSlow(downs)+"  累计时间："+jhzdSlowTime(downs)+"  待发慢误点："+dfzdSlow(downs)+"  累计时间："+dfzdSlowTime(downs)+"）");
         //合并单元格
-        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 1, 8));
-        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 9, 16));
-        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 1, 8));
-        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 9, 16));
-        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 1, 8));
-        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 9, 16));
-        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 1, 8));
-        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 9, 16));
-
-        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 7, 0, 0));
+        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 2, 11));
+        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 4, 12, 19));
+        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 2, 11));
+        sheet.addMergedRegion(new CellRangeAddress(size + 5, size + 5, 12, 19));
+        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 2, 11));
+        sheet.addMergedRegion(new CellRangeAddress(size + 6, size + 6, 12, 19));
+        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 2, 11));
+        sheet.addMergedRegion(new CellRangeAddress(size + 7, size + 7, 12, 19));
+
+        sheet.addMergedRegion(new CellRangeAddress(size + 4, size + 7, 0, 1));
     }
     private List<FastAndSlow> filterByType(List<FastAndSlow> all, String type) {
@@ -35,6 +35,7 @@ public class ChildTaskPlan {
 	/**
 	 * 任务类型2
+	 * 1 正常 2 进场 3 出场
 	 */
 	private String type2;
@@ -99,6 +100,11 @@ public class ChildTaskPlan {
 	private String nbbm;
 	/**
+	 * 中途换车营运， 新车关联的主任务ID，子任务删除时，主任务ID将级联
+	 */
+	private Long ccId;
+
+	/**
 	 * 为true 则无售票员， 否则继承主任务
 	 */
 	private boolean noClerk;
@@ -277,4 +283,12 @@ public class ChildTaskPlan {
 	public void setNoClerk(boolean noClerk) {
 		this.noClerk = noClerk;
 	}
+
+	public Long getCcId() {
+		return ccId;
+	}
+
+	public void setCcId(Long ccId) {
+		this.ccId = ccId;
+	}
 }
@@ -225,6 +225,11 @@ public class ScheduleRealInfo {
 	 */
 	private Integer driftStatus = 0;
+	/**
+	 * 换车营运标记 true 表示该主任务由 【中途换车子任务】 级联生成
+	 */
+	private boolean ccService;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -958,4 +963,12 @@ public class ScheduleRealInfo {
 	public void setDriftStatus(Integer driftStatus) {
 		this.driftStatus = driftStatus;
 	}
+
+	public boolean isCcService() {
+		return ccService;
+	}
+
+	public void setCcService(boolean ccService) {
+		this.ccService = ccService;
+	}
 }
@@ -129,7 +129,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	int countByLineCodeAndDate(String xlBm, String schDate);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value = "select DISTINCT s from ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2")
+	@Query(value = "select DISTINCT s from ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2 and ccService=false")
 	List<ScheduleRealInfo> findByLineCodeAndDate(String xlBm, String schDate);
 	@Modifying
@@ -146,7 +146,14 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 order by s.lpName, s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
-
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and s.scheduleDateStr = ?2 and s.ccService=false order by s.lpName, s.realExecDate,s.fcsj")
+	List<ScheduleRealInfo> scheduleDdrb(String line,String date);
+	
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and s.scheduleDateStr= ?2 and s.ccService=false order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
+	List<ScheduleRealInfo> scheduleDdrb2(String line,String date);
+	
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and s.scheduleDateStr = ?3 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineByGs_(String gsdm,String fgsdm,String date);
@@ -170,7 +177,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//按照时间段统计
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr >= ?2  and s.scheduleDateStr<= ?3  and gsBm like %?4% and fgsBm like %?5% order by s.xlBm")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and s.scheduleDateStr between ?2 and ?3 and gsBm = ?4 and fgsBm = ?5 order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2,String gsdm,String fgsdm);
 	//按照时间段统计
@@ -744,7 +744,7 @@ public class FormsServiceImpl implements FormsService {
 				            if(cts != null && cts.size() > 0){
 				            	newList_.add(s);
 				            }else{
-					            if(s.getZdsjActual()!=null){
+					            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 					            	newList_.add(s);
 					            }
 				            }
@@ -798,7 +798,7 @@ public class FormsServiceImpl implements FormsService {
 					            if(cts != null && cts.size() > 0){
 					            	newList_.add(s);
 					            }else{
-						            if(s.getZdsjActual()!=null){
+						            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 						            	newList_.add(s);
 						            }
 					            }
@@ -884,7 +884,7 @@ public class FormsServiceImpl implements FormsService {
 					            if(cts != null && cts.size() > 0){
 					            	newList_.add(s);
 					            }else{
-						            if(s.getZdsjActual()!=null){
+						            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 						            	newList_.add(s);
 						            }
 					            }
@@ -1199,8 +1199,8 @@ public class FormsServiceImpl implements FormsService {
 		String sql = "select gs_name, fgs_name, cl_zbh, fcsj, bc_type, xl_bm, xl_name, schedule_date"
 				+ " from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
-				+ "and schedule_date_str >= '"+startDate+"' "
-				+ "and schedule_date_str <= '"+endDate+"' ";
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' "
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"' ";
 		if(line.trim().length() != 0){
 			sql += "and xl_bm = '"+line+"' ";
 		}
@@ -1356,8 +1356,8 @@ public class FormsServiceImpl implements FormsService {
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
 				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ " from bsth_c_s_sp_info" + "  where schedule_date_str >= '"
-				+ map.get("startDate").toString() + "'  and  schedule_date_str <='" + map.get("endDate").toString() + "'  and xl_bm='"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
+				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
 				+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
@@ -1440,8 +1440,8 @@ public class FormsServiceImpl implements FormsService {
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
 				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ " from bsth_c_s_sp_info" + "  where schedule_date_str >= '"
-				+ map.get("startDate").toString() + "'  and schedule_date_str<= '" + map.get("endDate").toString() + "'  and xl_bm='"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
+				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out') "
 				+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
@@ -57,7 +57,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -86,7 +86,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
 					schedule.setId(rs.getLong("id"));
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setXlName(rs.getString("xl_name"));
@@ -117,6 +117,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setjName(rs.getString("j_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
 					schedule.setSflj(rs.getBoolean("sflj"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -371,6 +372,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
 		for(ScheduleRealInfo schedule : list){
+			if(schedule.isCcService())
+				continue;
 			String[] split1 = schedule.getFcsj().split(":");
 			String[] split2 = schedule.getZdsj().split(":");
 			long fcsj = Long.valueOf(split1[0])*60 + Long.valueOf(split1[1]);
@@ -674,10 +677,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 			where += " and bc_type != 'ldks'";
-			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type,"
+			String sql = "select id, schedule_date_str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type,"
 					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
-					+ " from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
-					+ " and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"+where+"";
+					+ " ,cc_service from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"'"
+					+ " and schedule_date_str <= '"+endDate+"'"+where+"";
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
@@ -685,7 +688,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
 					schedule.setId(rs.getLong("id"));
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
@@ -705,6 +708,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -885,7 +889,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		for(ScheduleRealInfo schedule : list){
-			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0)
+			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0
+					|| schedule.isCcService())
 				continue;
 			if(model.length() != 0){
 				if(ttSet.contains(schedule.getSpId())){
@@ -1393,6 +1398,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
 		for(ScheduleRealInfo s : list){
+			if(s.isCcService()){
+				continue;
+			}
 			String key = s.getScheduleDateStr() + "/" + s.getLpName();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
@@ -1668,14 +1676,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					lc = new BigDecimal("0"+schedule.getJhlc());
 				}
-				if(!schedule.isSflj()){
+				if(!schedule.isSflj() && !schedule.isCcService()){
 					jhbc++;
 					jhlc = jhlc.add(lc);
 				}
-				if(schedule.getStatus() != -1){
+				if(schedule.getStatus() != -1 && !schedule.isCcService()){
 					sjbc++;
 					sjlc = sjlc.add(lc);
-				} else if(schedule.getStatus() == -1){
+				} else if(schedule.getStatus() == -1 && !schedule.isCcService()){
 					if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){
 						lzbc++;
 						lzlc = lzlc.add(lc);
@@ -1811,8 +1819,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d')"
-					+ " >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str"
+					+ " >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -1829,7 +1837,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
 			if(company.length() != 0){
-				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
+				sql += " and (gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"')";
 			}
 			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
@@ -1838,7 +1846,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
@@ -1864,6 +1872,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setjGh(rs.getString("j_gh"));
 					schedule.setjName(rs.getString("j_name"));
 					schedule.setUpdateDate(rs.getDate("update_date"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -1905,7 +1914,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					dxtz = 0, lbtz = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
 				boolean flag = false;
-				if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
+				if(schedule.getFcsjActual() != null && schedule.getStatus() != -1
+						&& !schedule.isCcService()){
 					sjbc++;
 					if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
 						flag = true;
@@ -1937,9 +1947,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf + lbtz);
-			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
+			tempMap.put("dfbl", sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0 + "%");
 //			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
-			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
+			tempMap.put("lbbl", sjbc>0?df.format((double)(lbtz)/sjbc*100):0 + "%");
 //			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 //			tempMap.put("workList", tempList);
@@ -2069,9 +2079,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf  + lbtz);
-			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
+			tempMap.put("dfbl", sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0 + "%");
-			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
+			tempMap.put("lbbl", sjbc>0?df.format((double)(lbtz)/sjbc*100):0 + "%");
 //			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 			resList.add(tempMap);
 		}
@@ -2097,8 +2107,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         			resMap.put("dxbl", "0");
         			resMap.put("correctbl", "0");
         		}else{
-        			resMap.put("dxbl", df.format((double)(dxtzz)/sjbc*100) + "%");
-        			resMap.put("correctbl", df.format((double)(correct+dxtzz)/sjbc*100) + "%");
+        			resMap.put("dxbl", sjbc>0?df.format((double)(dxtzz)/sjbc*100):0 + "%");
+        			resMap.put("correctbl", sjbc>0?df.format((double)(correct+dxtzz)/sjbc*100):0 + "%");
         		}
@@ -2152,8 +2162,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         			resMap.put("dxbl", "0");
         			resMap.put("correctbl", "0");
         		}else{
-        			resMap.put("dxbl", df.format((double)(dxtzf)/sjbc*100) + "%");
-        			resMap.put("correctbl", df.format((double)(correct+dxtzf)/sjbc*100) + "%");
+        			resMap.put("dxbl", sjbc>0?df.format((double)(dxtzf)/sjbc*100):0 + "%");
+        			resMap.put("correctbl", sjbc>0?df.format((double)(correct+dxtzf)/sjbc*100):0 + "%");
         		}
         		resMap.put("xlname",BasicData.lineCode2NameMap.get(xlbm));
         	}
@@ -46,14 +46,11 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         try {
             ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
             //保存起终点名称
-            //String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
             if(StringUtils.isEmpty(t.getStartStationName()))
                 t.setStartStationName(getStationName(sch.getXlBm(), t.getStartStation()));
-                //t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
             if(StringUtils.isEmpty(t.getEndStationName()))
                 t.setEndStationName(getStationName(sch.getXlBm(), t.getEndStation()));
-                //t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
             if(t.getDestroyReason() == null)
                 t.setDestroyReason("");
@@ -61,13 +58,63 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
             if(t.isDestroy() && StringUtils.isEmpty(t.getDestroyReason()))
                 t.setDestroyReason(t.getReason());
+            //中途换车出场子任务，级联生成一个主任务，供报表和对外接口计算用
+            if(StringUtils.isNotEmpty(t.getNbbm())){
+                ScheduleRealInfo ccServiceSch = new ScheduleRealInfo();
+                ccServiceSch.setSflj(sch.isSflj());
+                ccServiceSch.setjGh(sch.getjGh());
+                ccServiceSch.setjName(sch.getjName());
+                ccServiceSch.setsGh(sch.getsGh());
+                ccServiceSch.setsName(sch.getsName());
+                ccServiceSch.setGsBm(sch.getGsBm());
+                ccServiceSch.setFgsBm(sch.getFgsBm());
+                ccServiceSch.setGsName(sch.getGsName());
+                ccServiceSch.setFgsName(sch.getFgsName());
+                ccServiceSch.setLpName(sch.getLpName());
+                ccServiceSch.setXlBm(sch.getXlBm());
+                ccServiceSch.setXlName(sch.getXlName());
+                ccServiceSch.setXlDir(sch.getXlDir());
+                ccServiceSch.setScheduleDate(sch.getScheduleDate());
+                ccServiceSch.setScheduleDateStr(sch.getScheduleDateStr());
+                ccServiceSch.setRealExecDate(sch.getRealExecDate());
+
+                ccServiceSch.setId(null);
+                ccServiceSch.setSpId(null);
+                ccServiceSch.setClZbh(t.getNbbm());
+                ccServiceSch.setCcService(true);
+                ccServiceSch.setFcsj(t.getStartDate());
+                ccServiceSch.setDfsj(t.getStartDate());
+                ccServiceSch.setZdsj(t.getEndDate());
+                ccServiceSch.setBcsj(0);
+                ccServiceSch.setJhlcOrig(Double.parseDouble(String.valueOf(t.getMileage())));
+                ccServiceSch.setJhlc(ccServiceSch.getJhlcOrig());
+                ccServiceSch.setQdzCode(t.getStartStation());
+                ccServiceSch.setZdzCode(t.getEndStation());
+                ccServiceSch.setQdzName(t.getStartStationName());
+                ccServiceSch.setZdzName(t.getEndStationName());
+                ccServiceSch.setFcsjActual(ccServiceSch.getDfsj());
+                ccServiceSch.setZdsjActual(ccServiceSch.getZdsj());
+                ccServiceSch.setRemarks(t.getRemarks());
+                ccServiceSch.setStatus(2);
+                if("1".equals(t.getType2())){
+                    ccServiceSch.setBcType("normal");
+                }
+                else {
+                    if("2".equals(t.getType2()))
+                        ccServiceSch.setBcType("in");
+                    else if("3".equals(t.getType2()))
+                        ccServiceSch.setBcType("out");
+                }
+                //实时入库
+                ccServiceSch = scheduleRealInfoRepository.save(ccServiceSch);
+                t.setCcId(ccServiceSch.getId());
+            }
+
             //先持久化子任务
             rs = super.save(t);
             //关联主任务
             sch.getcTasks().add(t);
             dayOfSchedule.save(sch);
-            //直接持久化
-            //scheduleRealInfoRepository.save(sch);
             //站到场对照
             t.setSchedule(sch);
             Station2ParkBuffer.put(t);
@@ -101,6 +148,11 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         //删除子任务
         rs = super.delete(id);
+
+        //删除级联生成的换车主任务
+        if(null != cPlan.getCcId()){
+            scheduleRealInfoRepository.delete(cPlan.getCcId());
+        }
         //dayOfSchedule.save(sch);
         //解除和主任务关联
         ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
@@ -873,7 +873,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
@@ -1743,30 +1743,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getFcsjActual() !=null&&s.getZdsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
         }
-        double ksgl=culateService.culateKsgl(list);
-        double sjgl=culateService.culateSjgl(lists);
-        double jccgl=culateService.culateJccgl(lists);
-        double ljgl=culateService.culateLjgl(lists);
-
-        map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
+        map.put("jhbc", culateService.culateJhbc(list,""));//计划班次
+        map.put("jhlc", Arith.add(culateService.culateJhgl(list),
+        		culateService.culateJhJccgl(list))); //计划总里程
+        map.put("cjbc", culateService.culateLbbc(list));//烂班班次
         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
+        map.put("ljbc", culateService.culateLjbc(lists,""));//临加班次
+        double ljgl=culateService.culateLjgl(lists);
         map.put("addMileage", ljgl); //临加公里
-        map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
-        map.put("ksgl", ksgl);//空驶公里
-        map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
-//         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
-        map.put("jhbc", culateService.culateJhbc(list,""));
-        map.put("cjbc", culateService.culateLbbc(list));
-        map.put("ljbc", culateService.culateLjbc(lists,""));
         map.put("sjbc", culateService.culateSjbc(lists,"") + culateService.culateLjbc(lists,""));
-        map.put("jcclc", jccgl);
+        double ksgl=culateService.culateKsgl(list);//子任务空驶公里
+        double jccgl=culateService.culateJccgl(lists);//空驶班次公里
+        map.put("ksgl", ksgl);//空驶公里
+        double sjgl=culateService.culateSjgl(lists);//实际营运公里
+        map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));//总公里
         map.put("zkslc", Arith.add(ksgl,jccgl));
-//         map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
+        map.put("jcclc", jccgl);
+        map.put("yygl",Arith.add(sjgl,ljgl)); //总营运公里
         return map;
     }
@@ -1789,7 +1787,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
                 lists.add(s);
             }else{
-                if(s.getZdsjActual()!=null){
+                if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
                     lists.add(s);
                 }
             }
@@ -2139,20 +2137,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 for (int j = 0; j < listit.size(); j++) {
                     ScheduleRealInfo t = new ScheduleRealInfo();
                     ChildTaskPlan childTaskPlan = listit.get(j);
-                    if (childTaskPlan.isDestroy()) {
-                        t.setFcsjActual("");
-                        t.setZdsjActual("");
-                        t.setJhlc(0.0);
-                    } else {
-                        t.setFcsjActual(childTaskPlan.getStartDate());
-                        t.setZdsjActual(childTaskPlan.getEndDate());
-                        t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                    if(childTaskPlan.getCcId()==null){
+                    	 if (childTaskPlan.isDestroy()) {
+                             t.setFcsjActual("");
+                             t.setZdsjActual("");
+                             t.setJhlc(0.0);
+                         } else {
+                             t.setFcsjActual(childTaskPlan.getStartDate());
+                             t.setZdsjActual(childTaskPlan.getEndDate());
+                             t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                         }
+                         t.setFcsj(childTaskPlan.getStartDate());
+                         t.setZdsj(childTaskPlan.getEndDate());
+                         t.setQdzName(childTaskPlan.getStartStationName());
+                         t.setZdzName(childTaskPlan.getEndStationName());
+                         t.setRemarks(childTaskPlan.getRemarks());
+                         t.setAdjustExps("子");
+                         listSchedule.add(t);
                     }
-                    t.setQdzName(childTaskPlan.getStartStationName());
-                    t.setZdzName(childTaskPlan.getEndStationName());
-                    t.setRemarks(childTaskPlan.getRemarks());
-                    t.setAdjustExps("子");
-                    listSchedule.add(t);
                 }
             }
         }
@@ -2295,7 +2297,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
@@ -2370,7 +2372,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
                 lists.add(s);
             }else{
-                if(s.getZdsjActual()!=null){
+                if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
                     lists.add(s);
                 }
             }
@@ -2433,7 +2435,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
@@ -2487,10 +2489,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	        map.put("dtbc", 0);
 	        map.put("dtbc_m", 0);
 	        map.put("dtbc_a", 0);
-	        map.put("djg", 0);
-	        map.put("djg_m", 0);
-	        map.put("djg_a", 0);
-	        map.put("djg_time", 0);
+	        Map<String, Object> m_=culateService.culateDjg(lists, list.get(0).getXlBm());
+	        map.put("djg", m_.get("djgcsq"));
+	        map.put("djg_m", m_.get("djgcsz"));
+	        map.put("djg_a", m_.get("djgcsw"));
+	        map.put("djg_time", m_.get("djgsj"));
     	}
         return map;
     }
@@ -2515,7 +2518,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	 list_s.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	                list_s.add(s);
 	            }
             }
@@ -2592,10 +2595,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("dtbc", 0);
         map.put("dtbc_m", 0);
         map.put("dtbc_a", 0);
-        map.put("djg", 0);
-        map.put("djg_m", 0);
-        map.put("djg_a", 0);
-        map.put("djg_time", 0);
+        Map<String, Object> m_=culateService.culateDjg(list_s, list.get(0).getXlBm());
+        map.put("djg", m_.get("djgcsq"));
+        map.put("djg_m", m_.get("djgcsz"));
+        map.put("djg_a", m_.get("djgcsw"));
+        map.put("djg_time", m_.get("djgsj"));
         lMap.add(map);
         if (type != null && type.length() != 0 && type.equals("export")) {
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -2723,7 +2727,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String zdsjActual = "";
         String zdsj1 = "";
         String zdsjActual1 = "";
-        List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
+        List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleDdrb(line, date);
         for (int i = 0; i < listInfo.size(); i++) {
             ScheduleRealInfo t = listInfo.get(i);
             if (!lpName.equals(t.getLpName())) {
@@ -2743,7 +2747,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             list.add(t);
         }
-        List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleByDateAndLineQp2(line, date);
+        List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleDdrb2(line, date);
         List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
@@ -4211,7 +4215,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
           if(cts != null && cts.size() > 0){
           	lists.add(s);
           }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
           }
@@ -39,6 +39,8 @@ public interface CulateMileageService {
 	 Map<String, Object> culateWdbcs(List<ScheduleRealInfo> lists);
 	 int culateDtfzbc(List<ScheduleRealInfo> lists,String type,String status,String item);
+	 
+
 	 //以下计算方法供新报表使用
 	 Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists);//计划内营运and计划外营运
 package com.bsth.service.report.impl;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
-import com.bsth.data.BasicData;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.Interval;
@@ -27,8 +7,18 @@ import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
 import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableJob;
-import com.bsth.util.ReportUtils;
-import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Service
 public class CulateMileageServiceImpl  implements CulateMileageService{
@@ -179,10 +169,12 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 	                while (it.hasNext()) {
 	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("service")){
-		                    if (childTaskPlan.isDestroy()) {
-		    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
-		                    } 
+	                    if(childTaskPlan.getCcId()==null){
+		                    if(childTaskPlan.getMileageType().equals("service")){
+			                    if (childTaskPlan.isDestroy()) {
+			    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+			                    } 
+		                    }
 	                    }
 	                }
 				}
@@ -198,30 +190,11 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-//				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-//				if(childTaskPlans.isEmpty()){
+				if(!scheduleRealInfo.isCcService()){
 					if(scheduleRealInfo.getStatus() == -1){
 						lbbc++;
 					}
-//				}
-				/*else{
-					if(scheduleRealInfo.getStatus() == -1){
-						boolean fage=true;
-						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-						if(it.hasNext()){
-							ChildTaskPlan childTaskPlan = it.next();
-							if(!childTaskPlan.isDestroy()){
-								if(childTaskPlan.getMileageType().equals("service")){
-									fage=false;
-								}
-							}
-							
-						}
-						if(fage){
-							lbbc++;
-						}
-					}
-				}*/
+				}
 			}
 		}
 		return lbbc;
@@ -378,7 +351,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 			                while (it.hasNext()) {
 			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if(childTaskPlan.getMileageType().equals("service")){
+			                    if(childTaskPlan.getMileageType().equals("service") && childTaskPlan.getCcId()==null){
 			                    	 if (!childTaskPlan.isDestroy()) {
 			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 			 	                    	ljgl=Arith.add(ljgl,jhgl);
@@ -399,11 +372,13 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 			                while (it.hasNext()) {
 			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
-			                    	 if (!childTaskPlan.isDestroy()) {
-			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-			 	                    	ljgl=Arith.add(ljgl,jhgl);
-			 	                    } 
+			                    if(childTaskPlan.getCcId()==null){
+				                    if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
+				                    	 if (!childTaskPlan.isDestroy()) {
+				 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+				 	                    	ljgl=Arith.add(ljgl,jhgl);
+				 	                    } 
+				                    }
 			                    }
 			                }
 						}
@@ -463,7 +438,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-				if(!scheduleRealInfo.isSflj()){
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					jhgl=Arith.add(jhgl,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
 				}
 			}
@@ -504,7 +479,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-				if(!scheduleRealInfo.isSflj()){
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
 					long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
 					if(item.equals("zgf")){
@@ -535,21 +510,23 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 					if(!scheduleRealInfo.isSflj()){
 						if(childTaskPlans.isEmpty()){
-								if(!scheduleRealInfo.isDestroy()){
-									double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
-									double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-									if(jhlc-jhlcOrig>0){
-										sjgl=Arith.add(sjgl,jhlcOrig);
-									}else{
-										sjgl=Arith.add(sjgl,jhlc);
-									}
-									
+							if(!scheduleRealInfo.isDestroy()){
+								double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+								double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+								if(jhlc-jhlcOrig>0){
+									sjgl=Arith.add(sjgl,jhlcOrig);
+								}else{
+									sjgl=Arith.add(sjgl,jhlc);
 								}
+								
+							}
 						}else{
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 			                while (it.hasNext()) {
 			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if(childTaskPlan.getMileageType().equals("service")&&"正常".equals(childTaskPlan.getType1())){
+			                    if(childTaskPlan.getMileageType().equals("service")
+			                    		&&"正常".equals(childTaskPlan.getType1())
+			                    		&& childTaskPlan.getCcId()==null){
 			                    	 if (!childTaskPlan.isDestroy()) {
 			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 			 	                    	sjgl=Arith.add(sjgl,jhgl);
@@ -649,8 +626,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				if(!scheduleRealInfo.isSflj()){
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					String time="";
 					if(item.equals("zgf") || item.equals("wgf")){
 						if(scheduleRealInfo.getFcsjActual()!=null){
@@ -681,62 +657,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							}
 						}
-						/*if(childTaskPlans.isEmpty()){
-							if(scheduleRealInfo.getStatus()!=-1){
-								if(item.equals("zgf")){
-									if(fcsj>=zgf1 && fcsj<=zgf2){
-										sjbc++;
-									}
-								}else if(item.equals("wgf")){
-									if(fcsj>=wgf1 && fcsj<=wgf2){
-										sjbc++;
-									}
-								}else{
-									sjbc++;
-								}
-								
-							}
-						}else{
-							if(scheduleRealInfo.getStatus() == -1){
-								boolean fage=false;
-								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-								while(it.hasNext()){
-									ChildTaskPlan childTaskPlan = it.next();
-									if(!childTaskPlan.isDestroy()){
-										if(childTaskPlan.getMileageType().equals("service")){
-											fage=true;
-										}
-									}
-									
-								}
-								if(fage){
-									if(item.equals("zgf")){
-										if(fcsj>=zgf1 && fcsj<=zgf2){
-											sjbc++;
-										}
-									}else if(item.equals("wgf")){
-										if(fcsj>=wgf1 && fcsj<=wgf2){
-											sjbc++;
-										}
-									}else{
-										sjbc++;
-									}
-								}
-								
-							}else{
-								if(item.equals("zgf")){
-									if(fcsj>=zgf1 && fcsj<=zgf2){
-										sjbc++;
-									}
-								}else if(item.equals("wgf")){
-									if(fcsj>=wgf1 && fcsj<=wgf2){
-										sjbc++;
-									}
-								}else{
-									sjbc++;
-								}
-							}
-						}*/
 					}
 				}
 			}
@@ -750,14 +670,13 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double ksgl =0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+			if (!isInOut(scheduleRealInfo)) {
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				if(!childTaskPlans.isEmpty()){
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 	                while (it.hasNext()) {
 	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("empty")){
+	                    if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
 	                    	 if (!childTaskPlan.isDestroy()) {
 	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 	 	                    	ksgl=Arith.add(ksgl,jhgl);
@@ -786,7 +705,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 	                while (it.hasNext()) {
 	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("empty")){
+	                    if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
 	                    	 if (!childTaskPlan.isDestroy()) {
 	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 	 	                    	jcclc=Arith.add(jcclc,jhgl);
@@ -907,7 +826,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double jcclc =0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if(!scheduleRealInfo.isSflj()){
+			if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 				if (scheduleRealInfo.getBcType().equals("in") 
 						|| scheduleRealInfo.getBcType().equals("out")|| scheduleRealInfo.getBcType().equals("ldks")) {
 					if(!scheduleRealInfo.isSflj()){
@@ -946,16 +865,17 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for(ChildTaskPlan c : cts){
-                	if(item.equals("其他")){
-                		if(c.isDestroy() && 
-                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
-                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
-                            sum = Arith.add(sum, c.getMileage());
-                	}else{
-                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
-                            sum = Arith.add(sum, c.getMileage());
+                	if(c.getCcId()==null){
+	                	if(item.equals("其他")){
+	                		if(c.isDestroy() && 
+	                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
+	                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
+	                            sum = Arith.add(sum, c.getMileage());
+	                	}else{
+	                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
+	                            sum = Arith.add(sum, c.getMileage());
+	                	}
                 	}
-                    
                 }
             }
             else if(isInOut(sch))
@@ -984,7 +904,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		int fzbc=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (scheduleRealInfo.getBcType().equals("venting")) {
+			if (scheduleRealInfo.getBcType().equals("venting")
+					|| scheduleRealInfo.getBcType().equals("major")) {
 //				if(!scheduleRealInfo.isSflj()){
 					String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
 					long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
@@ -1838,7 +1838,7 @@ public class ReportServiceImpl implements ReportService{
 					|| scheduleRealInfo.getBcType().equals("ldks"))) {
 //				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 //				if(childTaskPlans.isEmpty()){
-				if(scheduleRealInfo.isSflj()){
+				if(scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					Map<String, Object> newMap=new HashMap<String,Object>();
 					newMap.put("lp", scheduleRealInfo.getLpName());
 					newMap.put("nbbm", scheduleRealInfo.getClZbh());
@@ -1916,7 +1916,7 @@ public class ReportServiceImpl implements ReportService{
 	            if(cts != null && cts.size() > 0){
 	            	lists.add(s);
 	            }else{
-		            if(s.getZdsjActual()!=null){
+		            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 		            	lists.add(s);
 		            }
 	            }
@@ -2534,7 +2534,7 @@ public class ReportServiceImpl implements ReportService{
 			if(cts != null && cts.size() > 0){
 				lists.add(s);
 			}else{
-				if(s.getZdsjActual()!=null){
+				if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 					lists.add(s);
 				}
 			}
@@ -42,7 +42,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str = '"+date+"'";
 			if(line.length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -54,7 +54,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
@@ -80,6 +80,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setsGh(rs.getString("s_gh"));
 					schedule.setsName(rs.getString("s_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -175,7 +176,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		if(map.get("subCompany")!=null){
-			subCompany=map.get("subCompany").toString();
+			subCompany = map.get("subCompany").toString();
 		}
 		String line = map.get("line").toString();
 		String date = map.get("date").toString();
@@ -187,7 +188,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		try {
-			String sql = "select * from bsth_c_s_sp_info where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'";
+			String sql = "select * from bsth_c_s_sp_info where schedule_date = '"+date+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -364,7 +365,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			int jhsb = 0, sjsb = 0, jhmb = 0, sjmb = 0;
 			int jhzgf = 0, sjzgf = 0, jhwgf = 0, sjwgf = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
-//				schedule.setFcsjAll(schedule.getFcsj());
+				if(schedule.isCcService()){
+					continue;
+				}
+				
 				if(companyName.length() == 0 && schedule.getGsName() != null)
 					companyName = schedule.getGsName();
 				if(subCompanyName.length() == 0 && schedule.getFgsName() != null)
@@ -547,7 +551,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -565,7 +569,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setBcType(rs.getString("bc_type"));
 					schedule.setGsName(rs.getString("gs_name"));
@@ -579,6 +583,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setBcsj(rs.getInt("bcsj"));
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -636,6 +641,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		//分组计算 同时判断是否所选时刻信息
 		for(ScheduleRealInfo schedule : list){
+			if(schedule.isCcService()){
+				continue;
+			}
 			DO:{
 				if(model.length() != 0){
 					for(Long tt : ttList){
@@ -840,7 +848,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		try {
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			String sql = "select * from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -862,7 +870,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setBcType(rs.getString("bc_type"));
@@ -878,6 +886,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setBcsj(rs.getInt("bcsj"));
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
 						schedule.setFcsjActual(null);
@@ -973,6 +982,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		//按时间段分组
 		for(ScheduleRealInfo schedule : list){
+			if(schedule.isCcService()){
+				continue;
+			}
+			
 			if(companyName.length()==0&&schedule.getGsName()!=null
 					&&schedule.getGsName().trim().length()!=0){
 				companyName = schedule.getGsName();
@@ -1230,9 +1243,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			date = sdf.format(new Date());
 		try {
-			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
-					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
-					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'"
+			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
+					+ " a.cc_service, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
+					+ " where schedule_date_str = '"+date+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.trim().length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -1244,7 +1257,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setFcsj(rs.getString("fcsj"));
@@ -1257,6 +1270,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					int startOpt = 0;
 					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
@@ -1298,7 +1312,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String companyName = "", subCompanyName = "";
 		for(ScheduleRealInfo s : list){
-			if(lineSet.contains(s.getXlName())){
+			if(lineSet.contains(s.getXlName()) || s.isCcService()){
 				continue;
 			}
 			String xlName = s.getXlName();
@@ -1456,9 +1470,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		try {
-			String sql = "select a.schedule_date_Str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
-					+ " b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
-					+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"
+			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
+					+ " a.cc_service, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
+					+ " where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
 			if(line.length() != 0)
 				sql += " and xl_bm = '"+line+"'";
@@ -1470,7 +1484,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
-					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setFcsj(rs.getString("fcsj"));
@@ -1483,6 +1497,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
+					schedule.setCcService(rs.getBoolean("cc_service"));
 					int startOpt = 0;
 					if(rs.getString("start_opt") != null && rs.getString("start_opt").trim().length() != 0){
@@ -1524,7 +1539,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String companyName = "", subCompanyName = "";
 		for(ScheduleRealInfo s : list){
-			if(lineSet.contains(s.getXlName())){
+			if(lineSet.contains(s.getXlName()) || s.isCcService()){
 				continue;
 			}
 			String xlName = s.getXlName();
@@ -1716,7 +1731,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			String sql = 
 					"select r.id, r.schedule_date_str, r.xl_name, r.cl_zbh, r.j_gh, r.j_name, r.fcsj, d.timestamp, d.reply46, d.reply47, d.reply46time, d.reply47time, r.gs_name, r.fgs_name " +
-					"FROM bsth_c_s_sp_info_real as r left join bsth_v_directive_60 as d on r.id = d.sch and d.is_dispatch = 1 where DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'";
+					"FROM bsth_c_s_sp_info_real as r left join bsth_v_directive_60 as d on r.id = d.sch and d.is_dispatch = 1 where schedule_date_str = '"+date+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -1728,7 +1743,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			}
 			sql += " union " +
 					"select r.id, r.schedule_date_str, r.xl_name, r.cl_zbh, r.j_gh, r.j_name, r.fcsj, d.timestamp, d.reply46, d.reply47, d.reply46time, d.reply47time, r.gs_name, r.fgs_name " +
-					"FROM bsth_c_s_sp_info_real as r right join bsth_v_directive_60 as d on r.id = d.sch where d.is_dispatch = 1 and DATE_FORMAT(schedule_date,'%Y-%m-%d') = '"+date+"'";
+					"FROM bsth_c_s_sp_info_real as r right join bsth_v_directive_60 as d on r.id = d.sch where d.is_dispatch = 1 and schedule_date_str = '"+date+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -522,10 +522,16 @@ var SKBFormWizard = function() {
                     'dgmaxtzsj' : {required : true,number : true}, // 低谷最大停站时间,必填项、必须为整数.
                     // 发车间隙分析用参数
-                    'fcjx': {required: true}, // 时段发车间隙，TODO:貌似没发启用form验证
+                    //'fcjx': {required: true}, // 时段发车间隙，TODO:貌似没发启用form验证
                     'stt': {required: true}, // 停站类型，TODO：貌似没发启用form验证
+                    'zgffcjxmin' : {required : true,number : true,digits: true},// 早高峰最小发车间隔.
+                    'zgffcjxmax' : {required : true,number : true,digits: true},// 早高峰最大发车间隔.
+                    'wffcjxmin' : {required : true,number : true,digits: true},// 晚高峰最小发车间隔.
+                    'wffcjxmax' : {required : true,number : true,digits: true},// 晚高峰最大发车间隔.
+                    'dgfcjxmin' : {required : true,number : true,digits: true},// 低谷最小发车间隔.
+                    'dgfcjxmax' : {required : true,number : true,digits: true},// 低谷最大发车间隔.
                     'gfjypcs': {required : true,number : true,digits: true}, // 高峰建议配车数
-                    'jblps': {required : true,number : true,digits: true} // 加班车路牌数
+                    'jbclcount': {required : true,number : true,digits: true} // 建议加班车数
 				},
 				/**
@@ -934,7 +940,7 @@ var SKBFormWizard = function() {
                                     });
                                     // 发车间隙选择控件
-                                    ComponentsBootstrapTagsinput.init_fcjx();
+                                    //ComponentsBootstrapTagsinput.init_fcjx();
                                     // 停站类型选择控件
                                     ComponentsBootstrapTagsinput.init_stoptype();
@@ -50,7 +50,7 @@
 		var CSMap = null,data = null;
         // 创建ParameterObj
-        var _paramObj = StrategyUtils.getFactory().createParameterObj(map, dataMap);
+        var _paramObj;
 		if(map.baseRes== '0') {
 			CSMap = getMaxCarAndStopSpace0(map,seMap);
@@ -62,6 +62,8 @@
             map.fcjx = CSMap.fcjx;
 		}else if (map.baseRes == '2') {
             // TODO：之后可能有新的参数加入
+            _paramObj = StrategyUtils.getFactory().createParameterObj(map, dataMap);
+
             map.clzs = StrategyUtils.calcuClzx(_paramObj);
             CSMap = getMaxCarAndStopSpace1(map);
@@ -105,7 +105,6 @@ var ParameterObj = function(formMap, dataMap) {
     // 计算各个时段的发车间隙
     var _fcjxIntervalObj_fun = function() {
-        var _fcjxes = _formMap.fcjx.split(",");
         var _rtn = {
             mpeakfcjx : {}, // 早高峰
             epeakfcjx : {}, // 晚高峰
@@ -114,32 +113,34 @@ var ParameterObj = function(formMap, dataMap) {
         var _fcjx = [];
         var i = 0;
-        // TODO：这里按照顺序判定发车间隔
+        // TODO：这里只有3个间隔，以后加其他的
         // 1、早高峰间隙
         // 2、晚高峰间隙
-        // 3、早低谷
-        // 4、平峰
-        // 5、晚低谷
-
-        // 至少3个，系统暂时使用3个，有最小间隔，有最大间隔
-        if (_fcjxes.length < 3) {
-            alert("发车间隙至少3个（早高峰，晚高峰，低谷）");
-            throw "发车间隙至少3个（早高峰，晚高峰，低谷）";
-        } else {
-            for (i = 0; i < 3; i++) {
-                _fcjx = _fcjxes[i].split("/");
-                if (i == 0) {
-                    _rtn.mpeakfcjx.min = parseInt(_fcjx[2].split("-")[0]);
-                    _rtn.mpeakfcjx.max = parseInt(_fcjx[2].split("-")[1]);
-                } else if (i == 1) {
-                    _rtn.epeakfcjx.min = parseInt(_fcjx[2].split("-")[0]);
-                    _rtn.epeakfcjx.max = parseInt(_fcjx[2].split("-")[1]);
-                } else {
-                    _rtn.troughfcjx.min = parseInt(_fcjx[2].split("-")[0]);
-                    _rtn.troughfcjx.max = parseInt(_fcjx[2].split("-")[1]);
-                }
-            }
+        // 3、低谷
+
+        _rtn.mpeakfcjx.min = parseInt(_formMap.zgffcjxmin);
+        _rtn.mpeakfcjx.max = parseInt(_formMap.zgffcjxmax);
+
+        _rtn.epeakfcjx.min = parseInt(_formMap.wffcjxmin);
+        _rtn.epeakfcjx.max = parseInt(_formMap.wffcjxmax);
+
+        _rtn.troughfcjx.min = parseInt(_formMap.dgfcjxmin);
+        _rtn.troughfcjx.max = parseInt(_formMap.dgfcjxmax);
+
+        // 做一些逻辑检查
+        if (_rtn.mpeakfcjx.min > _rtn.mpeakfcjx.max) {
+            alert("早高峰最小间隔大于最大间隔");
+            throw "早高峰最小间隔大于最大间隔";
+        }
+        if (_rtn.epeakfcjx.min > _rtn.epeakfcjx.max) {
+            alert("晚高峰最小间隔大于最大间隔");
+            throw "晚高峰最小间隔大于最大间隔";
         }
+        if (_rtn.troughfcjx.min > _rtn.troughfcjx.max) {
+            alert("低谷最小间隔大于最大间隔");
+            throw "低谷最小间隔大于最大间隔";
+        }
+
         return _rtn;
     };
@@ -502,7 +503,7 @@ var ParameterObj = function(formMap, dataMap) {
          * @returns {Number|*}
          */
         getJBLpes: function() {
-            return parseInt(_formMap.jblps);
+            return parseInt(_formMap.jbclcount);
         },
         //----------------- 获取关联数据信息 -----------------//
@@ -144,44 +144,55 @@
     </div>
     <div class="form-group">
-        <div class="col-md-6 ">
-            <label class="control-label col-md-5"><span class="required"> * </span>时段发车间隔　:</label>
-            <div class="col-md-5 tagsDiv">
-                <div class="row" style="margin-left: 15px;">
-                    <input type="text" value="" name="fcjx" id="fcjx_tagsinput" style="display: none;">
-                </div>
-
-                <div class="row" style="margin-top: 10px;">
-                    <label class="control-label col-md-4">开始时间:</label>
-                    <div class="col-md-8">
-                        <input type="text" class="form-control" placeholder="时段开始时间" id="fcjx_tagsinput_starttime">
-                    </div>
-                </div>
-
-                <div class="row" style="margin-top: 10px;">
-                    <label class="control-label col-md-4">结束时间:</label>
-                    <div class="col-md-8">
-                        <input type="text" class="form-control" placeholder="时段结束时间" id="fcjx_tagsinput_endtime">
-                    </div>
-                </div>
-
-                <div class="row" style="margin-top: 10px;">
-                    <label class="control-label col-md-4">间隔值:</label>
-                    <div class="col-md-4">
-                        <input type="number" class="form-control" placeholder="开始" id="fcjx_tagsinput_fvalue" min="1">
-                    </div>
-                    <div class="col-md-4">
-                        <input type="number" class="form-control" placeholder="结束" id="fcjx_tagsinput_tvalue" min="1">
-                    </div>
-                </div>
-
-                <div class="row" style="margin-top: 10px;margin-left: 116px;">
-                    <a href="javascript:" class="btn red" id="fcjx_tagsinput_add">添加</a>
-                </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5"><span class="required"> * </span>早高峰发车间隔　:</label>
+            <div class="col-md-3" style="padding-right: 0px;">
+                <input type="text" class="form-control" name="zgffcjxmin" id="zgffcjxmin_id"
+                       placeholder="最小间隔">
+            </div>
+            <div class="col-md-1" style="padding-top: 10px; font-size: 85%;">至</div>
+            <div class="col-md-3" style="padding-left: 0px;">
+                <input type="text" class="form-control" name="zgffcjxmax" id="zgffcjxmax_id"
+                       placeholder="最大间隔">
             </div>
         </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5"><span class="required"> * </span>晚高峰发车间隔　:</label>
+            <div class="col-md-3" style="padding-right: 0px;">
+                <input type="text" class="form-control" name="wffcjxmin" id="wffcjxmin_id"
+                       placeholder="最小间隔">
+            </div>
+            <div class="col-md-1" style="padding-top: 10px; font-size: 85%;">至</div>
+            <div class="col-md-3" style="padding-left: 0px;">
+                <input type="text" class="form-control" name="wffcjxmax" id="wffcjxmax_id"
+                       placeholder="最大间隔">
+            </div>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5"><span class="required"> * </span>低谷发车间隔　:</label>
+            <div class="col-md-3" style="padding-right: 0px;">
+                <input type="text" class="form-control" name="dgfcjxmin" id="dgfcjxmin_id"
+                       placeholder="最小间隔">
+            </div>
+            <div class="col-md-1" style="padding-top: 10px; font-size: 85%;">至</div>
+            <div class="col-md-3" style="padding-left: 0px;">
+                <input type="text" class="form-control" name="dgfcjxmax" id="dgfcjxmax_id"
+                       placeholder="最大间隔">
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5"><span class="required"> * </span>建议加班车数　:</label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="jbclcount" id="jbclcount_id"
+                       placeholder="间隔">
+            </div>
+        </div>
+    </div>
+    <div class="form-group">
         <div class="col-md-6">
             <label class="control-label col-md-5"><span class="required"> * </span>停站类型　:</label>
             <div class="col-md-5 tagsDiv">
@@ -218,25 +229,14 @@
         </div>
-    </div>
-
-    <div class="form-group">
         <div class="col-md-6">
             <label class="control-label col-md-5">
-                <span class="required"> * </span> 高峰建议配车数  :</label>
+                <span class="required"> * </span> 高峰建议配车数　:</label>
             <div class="col-md-5">
                 <input type="text" class="form-control" placeholder="车辆数" name="gfjypcs" id="gfjypcsInput" min="1">
             </div>
         </div>
-        <div class="col-md-6">
-            <label class="control-label col-md-5">
-                <span class="required"> * </span> 加班车路牌数  :</label>
-            <div class="col-md-5">
-                <input type="text" class="form-control" placeholder="加班路牌数" name="jblps" id="jblpsInput" min="1">
-            </div>
-        </div>
-
     </div>
     <!-- 隐藏字段-时间 -->
@@ -412,38 +412,76 @@
     <div class="form-group">
         <div class="col-md-6">
-            <label class="control-label col-md-5">
-                <span class="required"> * </span> 时段发车间隔　:
-            </label>
+            <label class="control-label col-md-5">早高峰最小发车间隔　:</label>
             <div class="col-md-4">
-                <p class="form-control-static" data-display="fcjx"> </p>
+                <p class="form-control-static" data-display="zgffcjxmin"> </p>
             </div>
         </div>
         <div class="col-md-6">
-            <label class="control-label col-md-5">
-                <span class="required"> * </span> 停站类型　:
-            </label>
+            <label class="control-label col-md-5">早高峰最大发车间隔　:</label>
             <div class="col-md-4">
-                <p class="form-control-static" data-display="stt"> </p>
+                <p class="form-control-static" data-display="zgffcjxmax"> </p>
             </div>
         </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">晚高峰最小发车间隔　:</label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="wffcjxmin"> </p>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">晚高峰最大发车间隔　:</label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="wffcjxmax"> </p>
+            </div>
+        </div>
     </div>
     <div class="form-group">
         <div class="col-md-6">
-            <label class="control-label col-md-5"> 高峰建议配车数　: </label>
+            <label class="control-label col-md-5">低谷最小发车间隔　:</label>
             <div class="col-md-4">
-                <p class="form-control-static" data-display="gfjypcs"> </p>
+                <p class="form-control-static" data-display="dgfcjxmin"> </p>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">低谷最大发车间隔　:</label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="dgfcjxmax"> </p>
             </div>
         </div>
+    </div>
+
+    <div class="form-group">
         <div class="col-md-6">
-            <label class="control-label col-md-5"> 加班车路牌数　: </label>
+            <label class="control-label col-md-5">
+                <span class="required"> * </span> 建议加班车数　:
+            </label>
             <div class="col-md-4">
-                <p class="form-control-static" data-display="jblps"> </p>
+                <p class="form-control-static" data-display="jbclcount"> </p>
             </div>
         </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">
+                <span class="required"> * </span> 停站类型　:
+            </label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="stt"> </p>
+            </div>
+        </div>
+
+        <div class="col-md-6">
+            <label class="control-label col-md-5"> 高峰建议配车数　: </label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="gfjypcs"> </p>
+            </div>
+        </div>
     </div>
 </script>
 \ No newline at end of file
@@ -273,7 +273,13 @@
 				})
 				$get('/report/jobHzxx',{line:line,date:date},function(result){
-					console
+					//临加
+					$("#ljbcs").html(result.ljbc);
+					$("#ljgls").html(result.ljgl)
+					
+					//烂班
+					$("#lbbcs").html(result.lbbc);
+					$("#lbgls").html(result.lbgl)
 					var list_xxsj=template('list_xxsj',result);
 					$('#forms .list_xxsj').html(list_xxsj);
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button{
+    display: none;
+}
+
+input::-webkit-calendar-picker-indicator {
+    display: none;
+}
+
+input::-webkit-datetime-edit { padding: 1px; }
+
+.ps-container > .ps-scrollbar-y-rail{
+    z-index: 1 !important;
+}
+
+.ps-container > .ps-scrollbar-x-rail,
+.ps-container > .ps-scrollbar-y-rail {
+    opacity: 0.6 !important;
+    padding: 0 !important;
+}
+/* ^_^ baidu map hide logo */
+.anchorBL, .anchorBL, .amap-logo, .amap-copyright {
+    display: none;
+}
+
+audio, canvas, img, svg, video {
+    max-width: none;
+}
+
+html, body {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    margin-left: 0 !important;
+}
+
+.main-container {
+    height: calc(100% - 120px);
+}
+
+#main-tab-content {
+    height: 100%;
+    margin-bottom: 0;
+}
+
+.uk-modal .uk-form.fv-form, .uk-modal .ct-modal-body {
+    margin-bottom: -20px !important;
+}
+
+.uk-modal .uk-form.fv-form.fixed-tool {
+    width: 100%;
+    position: relative;
+    height: 100%;
+}
+
+.uk-modal .ct-modal-body .uk-modal-footer {
+    margin-left: 0;
+}
+
+.uk-modal .uk-form.fv-form.fixed-tool .uk-modal-footer {
+    position: absolute;
+    bottom: 0;
+    width: calc(100% - 20px);
+}
+
+table.ct-fixed-table {
+    table-layout: fixed;
+}
+
+table.ct-fixed-table tr.context-menu-active {
+    background: #f0f0f0;
+}
+
+table.ct-fixed-table.uk-table tr td {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+table.ct-fixed-table.uk-table .uk-badge {
+    padding: 2px 5px;
+}
+
+.horizontal-field {
+    vertical-align: middle;
+    margin: 0 5px;
+}
+
+.legend-tools {
+    float: right;
+    font-size: 11px;
+}
+
+.legend-tools a.uk-icon-small {
+    margin: 0 5px;
+    cursor: pointer;
+}
+
+.text-succ {
+    color: #659f13;
+}
+
+.text-err {
+    color: red;
+}
+
+.text-grey {
+    color: grey;
+}
+
+svg.line-chart {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+}
+
+svg.line-chart circle.station_circle {
+    fill: #5e96d2;
+    r: 5.5;
+    stroke: rgb(253, 253, 253);
+    stroke-width: 3;
+    Pointer-events: none;
+}
+
+svg.line-chart circle.station_circle.down {
+    fill: #c92121;
+}
+
+svg.line-chart path.station_link {
+    stroke-width: 3.5px;
+    stroke: #5E96D2;
+    Pointer-events: none;
+}
+
+svg.line-chart path.station_link.down {
+    stroke: #c92121;
+}
+
+svg.line-chart path.station_link.down.loop_line {
+    stroke-dasharray: 4, 3;
+    stroke-width: 1px;
+}
+
+svg.line-chart text.station_text {
+    writing-mode: tb;
+    fill: #3e3e3e;
+    letter-spacing: -.2px;
+    text-shadow: 0 0 2px #dadada;
+    Pointer-events: none;
+}
+
+svg.line-chart text.station_text.up {
+    fill: #4556b6;
+}
+
+svg.line-chart text.station_text.down {
+    fill: #c94f21;
+}
+
+svg.line-chart g.item:first-child > text {
+    stroke: #6f6e6e;
+    fill: none;
+}
+
+svg.line-chart g.item:nth-last-child(3) > text {
+    stroke: #6f6e6e;
+    fill: none;
+}
+
+svg.line-chart g.item:first-child > text.up,
+svg.line-chart g.item:nth-last-child(3) > text.up {
+    stroke: #4556b6;
+}
+
+svg.line-chart g.item:first-child > text.down,
+svg.line-chart g.item:nth-last-child(3) > text.down {
+    stroke: #c94f21;
+}
+
+svg.line-chart g.gps-wrap > rect {
+    width: 30px;
+    height: 15px;
+    /* fill: #fff; */
+    rx: 2px;
+    cursor: pointer;
+}
+
+svg.line-chart g.gps-wrap > rect[updown="0"] {
+    stroke: rgb(62, 80, 179);
+    fill: rgb(62, 80, 179);
+}
+
+svg.line-chart g.gps-wrap > rect[updown="1"] {
+    stroke: #c94f21;
+    fill: #c94f21;
+}
+
+svg.line-chart g.gps-wrap > rect.hover {
+    stroke-width: 2;
+}
+
+svg.line-chart g.gps-wrap > text {
+    font-size: 12px;
+    transform: translate(0, 12px);
+    pointer-events: none;
+}
+
+svg.line-chart g.gps-wrap > text[updown="0"] {
+    fill: #fff;
+}
+
+svg.line-chart g.gps-wrap > text[updown="1"] {
+    fill: #fff;
+}
+
+svg.line-chart g.gps-wrap > rect.abnormal[updown="0"],
+svg.line-chart g.gps-wrap > rect.abnormal[updown="1"] {
+    width: 40px;
+    fill: yellow;
+    stroke: yellow;
+}
+
+svg.line-chart g.gps-wrap > text.abnormal[updown="0"],
+svg.line-chart g.gps-wrap > text.abnormal[updown="1"] {
+    fill: black;
+}
+
+svg.line-chart .merge_hide {
+    display: none !important;
+}
+
+svg.line-chart g.merge-item rect {
+    width: 22px;
+    height: 22px;
+    rx: 15px;
+    fill: #19a53a;
+    cursor: pointer;
+    stroke: #19a53a;
+    stroke-dasharray: 1, 2;
+    stroke-width: 3px;
+}
+
+svg.line-chart g.merge-item text {
+    fill: #fff;
+    pointer-events: none;
+}
+
+.qtip-multi-gps {
+    max-width: 720px !important;
+}
+
+.qtip-bootstrap.qtip-multi-gps .qtip-content {
+    padding: 0;
+}
+
+.tooltip {
+    position: relative;
+    padding-bottom: 160px;
+    width: 220px;
+}
+
+.multi-tooltip-wrap {
+    width: 100%;
+    max-height: 350px;
+    overflow: auto;
+}
+
+.tip_map_wrap.multi {
+    width: 100%;
+    height: 130px;
+}
+
+.tooltip.multi-tooltip {
+    width: 160px;
+    display: inline-block;
+    padding: 10px 0 10px 15px;
+    border-right: 1px solid #eeeeee;
+    border-bottom: 1px solid #eeeeee;
+}
+
+.tooltip hr {
+    border-top: 1px solid #eeeeee;
+    width: calc(100% + 30px);
+    margin: 7px 0 11px -15px;
+}
+
+.tooltip.multi-tooltip hr {
+    width: calc(100% + 16px);
+}
+
+.tooltip .tooltip-container {
+    padding: 1px;
+}
+
+.tooltip .tooltip-container div, .tooltip .tooltip-container div a {
+    margin: 7px 1px;
+    font-size: 13px;
+    color: rgb(76, 76, 76);
+}
+
+.tooltip .tooltip-container div.title {
+    margin: 8px 1px 12px;
+}
+
+.tooltip .tooltip-container .title a {
+    font-size: 18px;
+    font-family: 微软雅黑;
+}
+
+.tooltip span.field {
+    color: #7d7d7b;
+    margin-right: 5px;
+}
+
+.tooltip .tip_map_wrap {
+    position: absolute;
+    bottom: -16px;
+    left: -15px;
+    width: calc(100% + 28px);
+    background: #fff;
+    height: 165px;
+    border-radius: 0 0 5px 5px;
+    border-top: 1px solid #e6e4e4;
+}
+
+canvas.crosshair-layer {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    background: rgba(255, 255, 255, 0.33);
+    left: 0;
+}
+
+li.map-panel {
+    height: 100%;
+    position: relative;
+}
+
+.main-container .load-panel {
+    display: block;
+    color: #999797;
+}
+
+.uk-panel-box-danger {
+    background-color: #fff1f0;
+    /*color: #d85030;*/
+    border-color: rgba(216, 80, 48, .3);
+}
+
+/*.uk-panel-box-danger .uk-panel-title {
+    color: #d85030;
+}*/
+
+.uk-badge-default {
+    background-color: #a09b9c;
+    background-image: -webkit-linear-gradient(top, #9a9898, #8c8687);
+    background-image: linear-gradient(to bottom, #9a9898, #8c8687);
+}
+
+.ct-bottom-drawer {
+    width: 100%;
+    background: rgb(255, 255, 255);
+    position: fixed;
+    bottom: 0;
+    box-shadow: 0 0 10px rgba(0, 0, 0, .3);
+    transition: all .3s ease;
+    height: 0;
+}
+
+.ct-bottom-drawer.open {
+    height: 320px;
+}
+
+.ct-bottom-drawer a.ct-bottom-drawer-close {
+    position: absolute;
+    right: 10px;
+    top: 10px;
+    color: #c3c3c3;
+    width: 20px;
+    line-height: 20px;
+    background: #fff;
+    text-align: center;
+    z-index: 99;
+}
+
+.ct-bottom-drawer a.ct-bottom-drawer-close:hover {
+    text-decoration: none;
+    color: grey;
+}
+
+.ct-bottom-drawer a.ct-bottom-drawer-close:after {
+    display: block;
+    content: "\f00d";
+    font-family: FontAwesome;
+}
+
+.ct-bottom-drawer-body {
+    width: 100%;
+    height: 100%;
+}
+
+#station_route_spacing_chart_drawer .svg_wrap {
+    width: 80%;
+    height: 100%;
+    display: inline-block;
+    font-size: 14px;
+    overflow: hidden;
+    position: relative;
+}
+
+#station_route_spacing_chart_drawer .drawer_right_map {
+    width: 20%;
+    height: 100%;
+    display: inline-block;
+}
+
+#station_route_spacing_chart_drawer .svg_cont_body {
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+#station_route_spacing_chart_drawer svg {
+    width: 100%;
+    height: 100%;
+}
+
+#station_route_spacing_chart_drawer svg g._item rect {
+    stroke: rgb(62, 80, 179);
+    fill: rgb(62, 80, 179);
+    width: 30px;
+    height: 124px;
+    rx: 5;
+    transform: translate(-15px);
+}
+
+#station_route_spacing_chart_drawer svg g._item text {
+    writing-mode: tb;
+    transform: translate(0, 9px);
+    fill: #fff;
+}
+
+#station_route_spacing_chart_drawer svg g._item path {
+    stroke-width: 5.4px;
+    stroke: #3e50b3;
+}
+
+#station_route_spacing_chart_drawer svg g._item circle {
+    r: 3px;
+    fill: #ffffff;
+}
+
+#station_route_spacing_chart_drawer svg g._item path.arc_path {
+    stroke-width: 1.3px;
+    stroke: #3e50b3;
+    stroke-dasharray: 1000;
+    stroke-dashoffset: 1000;
+    fill: none;
+
+    animation: dash .9s;
+    webkit-amimation: dash .9s;
+    animation-fill-mode: forwards;
+    -webkit-animation-fill-mode: forwards;
+}
+
+@keyframes dash {
+    to {
+        stroke-dashoffset: 0;
+        stroke-dasharray: 4, 4;
+    }
+}
+
+@-webkit-keyframes dash {
+    to {
+        stroke-dashoffset: 0;
+        stroke-dasharray: 4, 4;
+    }
+}
+
+#station_route_spacing_chart_drawer svg g._item text.distance_text {
+    writing-mode: horizontal-tb;
+    fill: #3e50b3;
+}
+
+#station_route_spacing_chart_drawer svg g._item rect.distance_rect {
+    height: 20px;
+    width: 40px;
+    fill: #fff !important;
+    stroke-width: 0;
+}
+
+#station_route_spacing_chart_drawer .tl_desc_text {
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    font-size: 12px;
+    color: #525050;
+    font-family: 微软雅黑;
+}
+
+#station_route_spacing_chart_drawer svg g._item:first-child circle {
+    fill: #3e50b3;
+    r: 6px;
+}
+
+#station_route_spacing_chart_drawer svg g._item:last-child circle {
+    fill: #3e50b3;
+    r: 6px;
+}
+
+/* 下行 */
+#station_route_spacing_chart_drawer svg.down g._item rect {
+    stroke: #dd3829;
+    fill: #dd3829;
+}
+
+#station_route_spacing_chart_drawer svg.down g._item path {
+    stroke: #dd3829;
+}
+
+#station_route_spacing_chart_drawer svg.down g._item:first-child circle {
+    fill: #dd3829;
+}
+
+#station_route_spacing_chart_drawer svg.down g._item text.distance_text {
+    fill: #dd3829;
+}
+
+#station_route_spacing_chart_drawer svg.down g._item path.arc_path {
+    stroke: #dd3829;
+}
+
+#station_route_spacing_chart_drawer svg.down g._item:last-child circle {
+    fill: #dd3829;
+}
+
+.svg-edit-panel-wrap {
+    width: 48%;
+    border: 1px solid #e1d3d3;
+    padding: 12px 0 0 0;
+    border-radius: 4px;
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    height: 440px;
+}
+
+.svg-edit-panel-wrap .title-badge {
+    position: absolute;
+    top: -10px;
+    left: 7px;
+    font-size: 13px;
+    background: #fff;
+    padding: 0 3px;
+    color: #888888;
+}
+
+.svg-edit-panel-wrap .rename-tools {
+    height: 21px;
+    padding: 0 0 0 9px;
+}
+
+.svg-edit-panel-wrap .rename-item-panel {
+    border-bottom: 1px solid #ede5e5;
+    padding: 4px;
+}
+
+.svg-edit-panel-wrap .rename-item-panel select {
+    width: 150px;
+}
+
+.svg-edit-panel-wrap .rename-item-panel input {
+    margin-left: 7px;
+}
+
+.svg-edit-panel-wrap .rename-item-panel input[type=checkbox] {
+    margin-top: 2px;
+    margin-right: 4px;
+}
+
+.svg-edit-panel-wrap .rename-item-panel.active {
+    background: #65c9f8;
+    box-shadow: 0px 3px 7px 0 rgba(101, 201, 248, 0.48), 0px 1px 4px 0 rgba(101, 201, 248, 0.32);
+}
+
+.svg-edit-panel-wrap .rename-item-panel.active select,
+.svg-edit-panel-wrap .rename-item-panel.active input {
+    background: #65c9f8;
+    color: #fff;
+}
+
+.svg-edit-panel-wrap .rename-item-panel.active i {
+    color: #e4f6ff;
+}
+
+.svg-edit-panel-wrap .rename-item-panel.active input[type=checkbox] {
+    border: none;
+}
+
+.svg-edit-panel-wrap .rename-item-panel.active input[type=checkbox]:before {
+    color: #fff;
+}
+
+.svg-edit-panel-wrap .rename-tools a {
+    font-size: 14px;
+    padding: 5px;
+}
+
+.svg-edit-panel-wrap .rename-tools a:hover {
+    background: #e8edef;
+    border-radius: 5px;
+}
+
+.station-list {
+    width: 190px;
+    padding: 2px 7px;
+    height: 100%;
+    overflow: auto;
+    display: inline-block;
+}
+
+.station-list .station-item {
+    padding: 3px 0;
+    margin: 5px 0;
+    border-radius: 3px;
+    font-size: 13px;
+    text-indent: 7px;
+    cursor: pointer;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.station-list .station-item.disable,
+.station-list .station-item.disable:hover {
+    background: #d5c9c9 !important;
+    color: #686565 !important;
+}
+
+.station-list.up .station-item {
+    background: #5364c3;
+    color: white;
+}
+
+.station-list.up .station-item:hover {
+    box-shadow: 0px 3px 6px 0 rgba(0, 0, 0, 0.2), 0px 1px 4px 0 rgba(0, 0, 0, 0.19);
+    background: #4556b6;
+}
+
+.station-list.down .station-item {
+    background: #f95858;
+    color: white;
+}
+
+.station-list.down .station-item:hover {
+    box-shadow: 0px 3px 6px 0 rgba(0, 0, 0, 0.2), 0px 1px 4px 0 rgba(0, 0, 0, 0.19);
+    background: #e95151;
+}
+
+.modal-dotted-hr {
+    height: 1px;
+    border: none;
+    border-top: 1px dashed #d1d1d1;
+    width: calc(100% + 40px);
+    margin-left: -20px;
+}
+
+#add-sub-task-range_turn-modal .main-sch-panel {
+    height: 60px;
+    border: 1px solid #dddddd;
+    border-radius: 5px;
+    position: relative;
+    padding: 20px 0 0 8px;
+}
+
+#add-sub-task-range_turn-modal .main-sch-panel:before {
+    content: '主任务';
+    position: absolute;
+    top: -10px;
+    left: 10px;
+    background: #fff;
+    padding: 0 4px;
+    font-size: 12px;
+    color: #adadad;
+}
+
+.ct_row {
+    font-size: 0;
+}
+
+.ct_row .ct_cell {
+    display: inline-block;
+    font-size: 13px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.ct_row .ct_cell label {
+    color: #979393;
+    margin-right: 3px;
+}
+
+.ct_row .ct_cell.c_1_3 {
+    width: 33%;
+}
+
+#schedule-lp_change-modal .sch-list dl dd {
+    font-size: 14px;
+}
+
+#schedule-lp_change-modal .sch-list dl dt:nth-of-type(1), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(1) {
+    width: 5%;
+    border-left: 1px solid #dedede;
+}
+
+#schedule-lp_change-modal .sch-list dl dt:nth-of-type(2), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(2) {
+    width: 22%;
+}
+
+#schedule-lp_change-modal .sch-list dl dt:nth-of-type(3), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(3) {
+    width: 17%;
+}
+
+#schedule-lp_change-modal .sch-list dl dt:nth-of-type(4), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(4) {
+     width: 10%;
+ }
+
+#schedule-lp_change-modal .sch-list dl dt:nth-of-type(5), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(5) {
+    width: 21%;
+}
+
+#schedule-lp_change-modal .sch-list dl dt:nth-of-type(6), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(6) {
+    width: 10%;
+}
+
+#schedule-lp_change-modal .sch-list dl dt:nth-of-type(7), #schedule-lp_change-modal .sch-list dl dd:nth-of-type(7) {
+    width: 14%;
+}
+
+
+
+
+#schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(1), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(1) {
+    width: 5%;
+    border-left: 1px solid #dedede;
+}
+
+#schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(2), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(2) {
+    width: 14%;
+}
+
+#schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(3), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(3) {
+    width: 10%;
+}
+
+#schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(4), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(4) {
+    width: 21%;
+}
+
+#schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(5), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(5) {
+    width: 10%;
+}
+
+#schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(6), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(6) {
+    width: 17%;
+}
+
+#schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(7), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(7) {
+    width: 22%;
+}
+
+#schedule-lp_change-modal .ct_table.sch-list .ct_table_body dl.active {
+    background: #b9d2ff;
+}
+
+#schedule-lp_change-modal .ct_table.sch-list .ct_table_body dl.active dd {
+    border-top: 1px solid #b9d2ff;
+}
+
+#schedule-lp_change-modal .ct_table.sch-list dl.active input[type=checkbox] {
+    border: none;
+}
+
+#schedule-lp_change-modal .ct_table.sch-list.reverse .ct_table_body dl.active {
+    background: #ffe2b9;
+}
+
+#schedule-lp_change-modal .ct_table.sch-list.reverse .ct_table_body dl.active dd {
+    border-top: 1px solid #ffe2b9;
+}
+
+#cache_data_manage-modal .uk-table td{
+    vertical-align: bottom;
+}
+
+#cache_data_manage-modal .uk-table td,
+#cache_data_manage-modal .uk-table th{
+    padding: 8px 8px 6px;
+}
+
+
+.ps-help-panel{
+    color: grey;
+    padding: 5px 2px;
+}
+
+.ps-help-panel small{
+    display: block;
+}
+
+
+svg text.offline{
+    fill: #6f6a6a !important;
+}
+
+svg rect.offline{
+    stroke: #dbdada !important;
+    fill: #dbdada !important;
+}
+
+.tooltip .tooltip-container .title a>.abnormal-text{
+    font-size: 14px;
+    color: #ff5e5e;
+    font-weight: 600;
+}
+
+#addChildTaskBtn{
+    margin-left: 5px;
+    color: #36729b;
+    padding: 1px 5px 1px 6px;
+}
+
+#addChildTaskBtn:hover{
+    box-shadow: 2px 1px 3px 0 rgba(0, 0, 0, 0.2), 0px 3px 8px 0 rgba(0, 0, 0, 0.19);
+}
+
+.edit-icon{
+    color: #aba9a9;
+    font-size: 12px;
+    margin-left: 5px;
+    display: none;
+}
+
+.operation-real-text{
+    position: absolute;
+    top: 9px;
+    width: 100%;
+    left: 0;
+    text-align: center;
+    pointer-events: none;
+}
+
+.operation-real-text span{
+    padding: 15px;
+    background: #ff4f4f;
+    color: white;
+    box-shadow: 0px 4px 6px 0 rgba(0, 0, 0, 0.2), 0px 4px 10px 0 rgba(0, 0, 0, 0.19);
+    border-radius: 1px 1px 4px 4px;
+}
+
+#oil_station-modal.ct-form-modal form.uk-form-horizontal .uk-form-label{
+    width: 120px;
+}
+
+#oil_station-modal.ct-form-modal form.uk-form-horizontal .uk-form-controls{
+    margin-left: 125px;
+}
+
+#oil_station-modal .uk-form-icon>[class*=uk-icon-]{
+    right: 23px;
+}
+
+#oil_station-modal .uk-form-icon:not(.uk-form-icon-flip)>input{
+    padding-left: 10px !important;
+}
+
+#oil_station-modal .uk-form-icon{
+    width: calc(100% - 145px);
+}
+
+#oil_station-modal .uk-icon-mile:before{
+    content: '公里';
+}
+
+#oil_station-modal .uk-icon-minute:before{
+    content: '分钟';
+}
+
+option.oil_station_opt{
+    color: red;
+}
+
+#oil_station-modal .uk-modal .uk-form.fv-form{
+    margin-bottom: 0 !important;
+}
+
+#gb_wait_modal .uk-modal-spinner{
+    top: 25px;
+    -webkit-transform: translate(-50%,0);
+    transform: translate(-50%,0);
+}
+
+#gb_wait_modal .wait-modal-text{
+    text-align: center;
+    margin-top: 35px;
+    font-size: 15px;
+    color: #635e5e;
+}
+
+.park-and-station-wrap{
+    margin-top: 9px;
+    border: 1px solid #3dce69;
+    width: 580px;
+    padding: 12px;
+    border-radius: 5px;
+}
+.park-and-station-wrap select{
+    width: auto !important;
+}
+
+/** 安全驾驶相关css */
+.safe_driv_pop_wrap{
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+    z-index: 99;
+}
+
+.safe_driv_pop{
+    background: #d44b4b;
+    font-size: 15px;
+    padding: 9px 10px 0;
+    border: 1px solid #f4f0f0;
+    border-radius: 5px;
+    cursor: pointer;
+    box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    transition: all .03s;
+    color: #f2f2f2;
+}
+
+.safe_driv_pop:hover{
+    background: #bc2a2a;
+}
+
+.safe_driv_pop .title{
+}
+
+.safe_driv_pop .desc{
+    display: block;
+    font-size: 12px;
+    color: #ff9d9d;
+    text-align: right;
+    margin-right: 5px;
+}
+
+/** 嵌入表单modal滚动条样式 */
+#formFragmentModal::-webkit-scrollbar {
+    width: 10px;
+    background-color: #F5F5F5;
+}
+#formFragmentModal::-webkit-scrollbar-thumb {
+    background-color: #000000;
+}
+#formFragmentModal::-webkit-scrollbar-track {
+    border: 0;
+    background-color: #F5F5F5;
+    border-radius: 0;
+}
+
+#formFragmentModal::-webkit-scrollbar-thumb{
+    border: 5px solid rgb(226, 122, 122);
+}
+
+#schedule-addsch_oil-modal select{
+    height: 30px !important;
+}
+
+#oil_station-modal .input_clear_icon{
+    position: absolute;
+    top: 6px;
+    right: 108px;
+    color: #f75757;
+    height: 18px;
+    line-height: 18px;
+    border-radius: 7px;
+    font-size: 16px;
+    display: none;
+    cursor: pointer;
+}
+
+#oil_station-modal .input_clear_icon:hover{
+    color: #de2020;
+}
+
+#oil_station-modal .input_clear_icon:before{
+    display: block;
+    font-family: FontAwesome;
+    content: "\f057";
+}
+
+#oil_station-modal input.readonly{
+    background: #dddddd;
+}
+
+
+.ct_tags{
+    margin-bottom: 12px;
+}
+
+.ct_tags>span{
+    padding: 3px 7px;
+    background: #e8e8e8;
+    color: #3a3939;
+    cursor: pointer;
+    margin-right: 5px;
+}
+
+.ct_tags>span.active{
+    background: #62a9e1;
+    color: white;
+    box-shadow: 0 0 4px rgba(0, 0, 0, 0.35);
+}
+
+.ct_tags>span.active:before{
+    content: "\f00c";
+    font-family: FontAwesome;
+    margin-right: 2px;
+    font-size: 13px;
+}
+
+.ct_tags>span:hover{
+ box-shadow: 0 0 4px rgba(0,0,0,.3);
+}
+
+span.late-badge {
+    height: 20px;
+    line-height: 20px;
+    margin-top: 8px;
+    color: grey;
+    margin-left: 2px;
+}
+
+dl.intimity span.late-badge{
+    color: #fbfbfb;
+}
+
+/** badge tooltip */
+.uk-badge.c_task:hover,
+.uk-badge.sch_region:hover{
+    background-image: none;
+    background: #38b3e1;
+    border: 1px solid #7ebad1;
+}
+
+.uk-badge.out:hover{
+    background-image: none;
+    background: #8fc650;
+    border: 1px solid #949f86;
+}
+
+.uk-badge.in:hover{
+    background-image: none;
+    background: #fabc64;
+    border: 1px solid #a68c67;
+}
+
+.qtip.sch-badge-tip{
+    max-width: 500px;
+}
+
+.tip_task_list {
+    width: 460px;
+    margin-bottom: -10px;
+}
+.tip_task_list dl{
+    font-size: 0;
+    border-bottom: 1px solid #e6e6e6;
+    margin: 0;
+}
+.tip_task_list dl:last-child{
+    border-bottom: none;
+}
+.tip_task_list dl dt,
+.tip_task_list dl dd{
+    display: inline-block;
+    font-size: 13px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    height: 24px;
+    line-height: 24px;
+}
+
+.tip_task_list dl dt:nth-of-type(1), .tip_task_list dl dd:nth-of-type(1){
+    width: 19%;
+}
+.tip_task_list dl dt:nth-of-type(2), .tip_task_list dl dd:nth-of-type(2){
+    width: 12%;
+}
+.tip_task_list dl dt:nth-of-type(3), .tip_task_list dl dd:nth-of-type(3){
+    width: 28%;
+}
+.tip_task_list dl dt:nth-of-type(4), .tip_task_list dl dd:nth-of-type(4){
+    width: 28%;
+}
+.tip_task_list dl dt:nth-of-type(5), .tip_task_list dl dd:nth-of-type(5){
+    width: 13%;
+}
+
+.tip_task_list dl.service{
+    color: blue;
+}
+.tip_task_list dl.service.destroy{
+    color: red;
+}
+
+.tip_task_list dl.service.temp_add{
+    color: #9C27B0;
+}
+
+.tip_task_list dl span{
+    margin: 0;
+    width: auto;
+}
+
+ul.left_tabs_lg{
+    border: 1px solid #efeded;
+    height: 100%;
+    background: #fafafa;
+}
+
+ul.left_tabs_lg li{
+    line-height: 40px;
+    font-size: 15px;
+}
+
+#schedule-addsch-modal .uk-modal-footer{
+    border-top: none;
+    background: none;
+}
+
+.ct_line_lp_badge{
+    float: left;
+    margin-top: 6px;
+    background: #e0e0e0;
+    padding: 2px 7px;
+    border-radius: 3px;
+}
+
+.uk-badge.sch_ldks{
+    background: #8c8c8c;
+    background-image: linear-gradient(to bottom,#a7a7a7,#8c8c8c);
+}
+
+.ct_layer_modal{
+    background: #e5e5e5;
+    height: 100%;
+    width: 100%;
+    overflow: auto;
+}
+
+.layui-layer-setwin{
+
+}
+
+.device_config_table dl dt:nth-of-type(1), .device_config_table dl dd:nth-of-type(1){
+    width: 7%;
+    text-indent: 10px;
+}
+.device_config_table dl dt:nth-of-type(2), .device_config_table dl dd:nth-of-type(2){
+    width: 7%;
+}
+.device_config_table dl dt:nth-of-type(3), .device_config_table dl dd:nth-of-type(3){
+    width: 8%;
+}
+.device_config_table dl dt:nth-of-type(4), .device_config_table dl dd:nth-of-type(4){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(5), .device_config_table dl dd:nth-of-type(5){
+    width: 4%;
+}
+.device_config_table dl dt:nth-of-type(6), .device_config_table dl dd:nth-of-type(6){
+    width: 4%;
+}
+.device_config_table dl dt:nth-of-type(7), .device_config_table dl dd:nth-of-type(7){
+    width: 4%;
+}
+.device_config_table dl dt:nth-of-type(8), .device_config_table dl dd:nth-of-type(8){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(9), .device_config_table dl dd:nth-of-type(9){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(10), .device_config_table dl dd:nth-of-type(10){
+    width: 8%;
+}
+.device_config_table dl dt:nth-of-type(11), .device_config_table dl dd:nth-of-type(11){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(12), .device_config_table dl dd:nth-of-type(12){
+    width: 5%;
+}
+.device_config_table dl dt:nth-of-type(13), .device_config_table dl dd:nth-of-type(13){
+    width: 4%;
+}
+.device_config_table dl dt:nth-of-type(14), .device_config_table dl dd:nth-of-type(14){
+    width: 4%;
+}
+.device_config_table dl dt:nth-of-type(15), .device_config_table dl dd:nth-of-type(15){
+    width: 4%;
+}
+.device_config_table dl dt:nth-of-type(16), .device_config_table dl dd:nth-of-type(16){
+    width: 3%;
+}
+.device_config_table dl dt:nth-of-type(17), .device_config_table dl dd:nth-of-type(17){
+    width: 4%;
+}
+.device_config_table dl dt:nth-of-type(18), .device_config_table dl dd:nth-of-type(18){
+    width: 13%;
+}
+
+.uk-tooltip{
+    z-index: 29999999 !important;
+}
+
+.device_config_table.ct_table dl dd,
+.device_config_table.ct_table dl dt{
+    border-right: 1px solid #dedede !important;
+}
+
+.device_configs_manager .search_form{
+    text-indent: 12px;
+    margin-bottom: 0;
+    padding: 18px 5px;
+}
+
+.sub_task_form_v2{
+    background: #f9f9f9;
+    padding: 12px 15px;
+    border-radius: 5px 0 5px 5px;
+    border: 1px solid #dfdfdf;
+    position: relative;
+    margin-bottom: 20px;
+}
+
+.task_form_close_icon{
+    background: #f9f9f9;
+    padding: 0px 4px;
+    position: absolute;
+    top: -8px;
+    right: -8px;
+    color: #898989;
+    font-size: 15px;
+    border: 1px solid #dfdfdf;
+    border-radius: 100%;
+    border-left: none;
+    border-bottom: none;
+    transition: all .03s;
+}
+
+.task_form_close_icon:hover{
+    border: 1px solid #ff1515;
+    border-left: none;
+    border-bottom: none;
+    color: #e03e3e;
+}
+
+.sub_task_form_v2:hover::after{
+    color: #5f5b5b;
+}
+
+.sub_task_form_v2.uk-form-horizontal .uk-form-label{
+    width: 80px;
+}
+
+.sub_task_form_v2.uk-form-horizontal .uk-form-controls{
+    margin-left: 85px;
+}
+
+.sub_task_form_v2.uk-form-horizontal .uk-form-controls input[type=text],
+.sub_task_form_v2.uk-form-horizontal .uk-form-controls input[type=time],
+.sub_task_form_v2.uk-form-horizontal .uk-form-controls select{
+    width: 100%;
+}
+
+#add-sub-task-main-modal .uk-modal-footer{
+    background: none;
+    border-top: none;
+}
+
+#add-sub-task-main-modal .uk-grid+.uk-grid{
+    margin-top: 12px;
+}
+
+#add-sub-task-main-modal .plus_icon_span{
+    font-size: 26px;
+    color: #b2b2b2;
+    padding: 10px 64px;
+    display: inline-block;
+    border: 1px dashed grey;
+    margin: 15px 0;
+    border-radius: 5px;
+    cursor: pointer;
+}
+
+#add-sub-task-main-modal .uk-animation-fade{
+    animation-duration: .3s;
+}
+
+#add-sub-task-main-modal .forms{
+    max-height: 488px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 8px 8px 0 0;
+}
+
+.add_custom_wrap .forms .sub_task_form_v2:last-child{
+    margin-bottom: 0;
+}
+
+.sub_task_form_v2.destroy_form{
+    background-color: #fff5f4 !important;
+}
+
+.uk-form>.half_change_car_box{
+    margin: -10px 0 15px;
+    padding: 3px 5px;
+    display: inline-block;
+    border: 1px solid #dfdddd;
+    color: #918f8f;
+}
+
+.half_change_car_box input[type=checkbox]{
+    vertical-align: top;
+}
+
+.uk-form>.half_change_car_box.active{
+    background: #4CAF50;
+    color: #fff;
+}
+
+.uk-form>.half_change_car_box.active input[type=checkbox]{
+    background: #4caf50;
+    border-color: #4caf50;
+}
+
+.uk-form>.half_change_car_box.active input[type=checkbox]:before{
+    color: #ffffff;
+}
+
+.sub_task_form_v2.change_car{
+    z-index: 99;
+}
+
+.st_range_top_form{
+    padding: 0 0 15px 5px;
+    border: 1px solid #c4bb76;
+    background: #e5e1c1;
+    margin-bottom: 15px;
+    box-shadow: 0px 4px 3px 0 rgba(142, 138, 138, 0.2), 0px 4px 5px 0 rgba(157, 156, 156, 0.19);
+}
+
+.st_range_top_form .uk-form-row{
+    margin-top: 20px;
+}
+
+.uk-form-horizontal.st_range_top_form .uk-form-label{
+    width: 80px;
+}
+
+.uk-form-horizontal.st_range_top_form .uk-form-controls{
+    margin-left: 84px;
+}
+
+.uk-form-horizontal.st_range_top_form .uk-form-controls select{
+    width: calc(100% - 2px);
+}
+
+.sub_task_form_v2.service_st_form{
+    background: #f4faff;
+}
+
+.uk-modal  .uk-form.fv-form.sub_task_form_v2{
+    margin-bottom: 20px !important;
+}
+
+.sub_task_table_wrap .ct_table>.ct_table_body{
+    border-bottom: none;
+}
+
+.err_panel{
+    font-size: 12px;
+    color: #7e7d7d;
+    font-family: 微软雅黑;
+    margin-top: 5px;
+}
+
+#schedule-lp_change-modal .ct_table dl{
+    height: 35px;
+}
+
+#schedule-lp_change-modal .ct_table dl dd, #schedule-lp_change-modal .ct_table dl dt{
+    line-height: 35px;
+}
+
+/*
+.sub_task_form_v2.repeat_main:before{
+    content: '复';
+    position: absolute;
+    top: -10px;
+    font-size: 12px;
+    color: #2196F3;
+    background: #ffffff;
+    padding: 0 3px;
+    font-weight: 600;
+}*/
+
+.sub_task_form_v2:before{
+    position: absolute;
+    top: -7px;
+    font-size: 12px;
+    padding: 0 3px;
+    font-weight: 600;
+    line-height: 14px;
+}
+
+.sub_task_form_v2.destroy_form:before{
+    content: '烂班' !important;
+    color: #f14235 !important;
+    background: #ffffff !important;
+}
+
+.sub_task_form_v2.service_form:before{
+    content: '营运';
+    color: #2196F3;
+    background: #ffffff;
+}
+
+.sub_task_form_v2.service_form.temp_service:before{
+    content: '营运 (临加)';
+    color: #9C27B0;
+    background: #ffffff;
+}
+
+.sub_task_form_v2.service_form.temp_service {
+    background: #faf0fd;
+}
+
+.sub_task_form_v2.empty_form:before{
+    content: '空驶';
+    color: #928f92;
+    background: #ffffff;
+}
+
+.sub_task_form_v2.service_form{
+    background: #f4faff;
+}
+
+/*.sub_task_form_v2.repeat_main.destroy_form:before{
+    color: #F44336;
+}
+
+.sub_task_form_v2.repeat_main{
+    background: #f4faff;
+}*/
+.footer_tools{
+    position: absolute;
+    left: 235px;
+    bottom: 19px;
+}
+
+.footer_mileage_count{
+    border: 1px solid #f2f2f2;
+    padding: 5px;
+    box-shadow: 0px 2px 5px 0 rgba(0, 0, 0, 0.2), 0px 2px 7px 0 rgba(0, 0, 0, 0.19);
+    display: inline-block;
+}
+
+.footer_mileage_count>span{
+    padding: 2px 5px;
+}
+
+.footer_mileage_count>span.service_sum{
+    color: #2196F3;
+}
+
+.footer_mileage_count>span.empty_sum{
+    color: #636363;
+}
+
+.footer_mileage_count>span.destroy_sum{
+    color: #f5574b;
+}
+
+.station_to_park_link{
+    display: inline-block;
+    margin-left: 15px;
+    vertical-align: bottom;
+    font-size: 12px;
+}
+
+.station_to_park_link>a{
+    color: #607D8B;
+}
+
+#station_to_park-modal.ct-form-modal form input[type=text],
+#station_to_park-modal.ct-form-modal form select{
+    width: auto;
+}
+
+.s_2_park_form_wrap{
+    background: #fafafa;
+    border: 1px solid #e5e5e5;
+    padding: 7px 16px;
+    margin: 15px 0;
+    position: relative;
+}
+
+.s_2_park_form_wrap .ct_close{
+    position: absolute;
+    top: -12px;
+    padding: 0 4px;
+    right: -8px;
+    color: #939393;
+    border: 1px solid #f7dfdf;
+    border-radius: 25px;
+    cursor: pointer;
+}
+
+.s_2_park_form_wrap .ct_close:hover{
+    background: #e5e5e5;
+    color: #fd6e6e;
+}
+
+.s_2_park_form_wrap label{
+    color: #666;
+    font-size: 13px;
+}
+
+#station_to_park-modal.ct-form-modal form input[readonly]{
+    background: #fafafa;
+}
+
+.s_2_park_form_wrap .bottom_label{
+    margin-top: 25px;
+    display: block;
+}
+
+.s_2_park_form_wrap .bottom_label_2{
+    margin-top: 4px;
+    display: block;
+}
+
+.ct_describe{
+    font-size: 12px;
+    color: #909090;
+    font-family: FontAwesome;
+}
+
+.ct_describe:before{
+    content: "\f059";
+    margin-right: 3px;
+}
+
+#add-sub-task-main-modal abbr{
+    display: inline-block;
+    font-size: 12px;
+    margin-left: 25px;
+    vertical-align: bottom;
+    color: #929292;
+}
+
+#all-devices-modal .search-form input[type=text]{
+    width: 100px;
+}
+
+#all-devices-modal .auto-refresh{
+    vertical-align: middle;margin-left: 5px;color: grey;
+}
+
+#all-devices-modal .auto-refresh.active{
+    color: #405dff;
+}
+
+#all-devices-modal .uk-margin-small-top {
+    margin-top: 0 !important;
+}
+
+#history-sch-maintain-modal .add_lp_link{
+    display: inline-block;
+    vertical-align: bottom;
+    margin-left: 15px;
+    text-decoration: underline;
+    font-size: 13px;
+}
+
+#schedule-tzrc-modal input[type=checkbox]{
+    margin-right: 9px;
+}
+
+#schedule-tzrc-modal span.ct_zt_yzx{
+    color: #2196F3;
+    font-size: 12px;
+}
+
+#schedule-tzrc-modal span.ct_zt_lb{
+    color: red;
+    font-size: 12px;
+}
+
+#schedule-tzrc-modal span.ct_zt_zzzx{
+    font-size: 12px;
+    color: #38ad3c;
+}
+
+#schedule-tzrc-modal .tzrc_form{
+    padding: 20px;
+    border: 1px solid #f0eded;
+    box-shadow: 0px -3px 15px rgba(0,0,0,0.08);
+    background: #f9f9f9;
+}
+
+.uk-panel.ct_search_panel{
+    padding: 15px;
+    border: 1px solid #f0eded;
+    box-shadow: 0px 3px 15px rgba(0,0,0,0.08);
+    background: #f9f9f9;
+}
+
+.sch-tzrc-table.ct_table dl.active,
+.sch-tzrc-table.ct_table>.ct_table_body dl.active:hover{
+    background: #5bd460;
+    color: white;
+}
+
+#schedule-tzrc-modal dl.active span.ct_zt_yzx{
+    color: #545252;
+}
+
+#schedule-tzrc-modal dl.active span.ct_zt_lb{
+    color: #d64949;
+}
+
+#schedule-tzrc-modal dl.active span.ct_zt_zzzx{
+    color: white;
+}
+
+#schedule-tzrc-modal dl.active input[type=checkbox]{
+    border: 0;
+}
+
+#schedule-tzrc-modal dl.active input[type=checkbox]:before{
+    color: #ffffff;
+}
+
+.sch-search-autocom input{
+    padding: 0 !important;
+    height: 100% !important;
+}
+
+label.blue_checkbox{
+    margin-left: 12px;
+}
+
+label.blue_checkbox>input{
+    width: 17px !important;
+    height: 17px !important;
+}
+
+label.blue_checkbox>input:checked:before,
+label.blue_checkbox>input:indeterminate:before{
+    line-height: 15px !important;
+}
+
+dd.disabled{
+    color: #b5b3b3;
+}
+
+dl.active>dd.disabled{
+    color: #ececec;
+}
+
+#change_user_options-modal .user_info{
+    width: 360px;
+    margin: auto;
+}
+
+.display_hide{
+    display: none;
+}
+
+.ct_eye_icon{
+    font-size: 16px;
+    cursor: pointer;
+}
+
+.ct_eye_icon.active{
+    color: #444;
+}
+
+#tempScheduleContent .forms::-webkit-scrollbar {
+    width: 19px;
+    height: 16px;
+}
+
+.range_2_normal_tt{
+    margin-bottom: 15px;
+    border-top: 1px dashed #c7c7c7;
+    color: #a6a6a6;
+    text-indent: 7px;
+    padding-bottom: 5px;
+}
+
+.cancel_link{
+    font-size: 12px;
+    margin-left: 15px;
+    vertical-align: bottom;
+    color: #8d8d8d;
+    text-decoration: underline;
+    position: absolute;
+    right: 0;
+}
+
+.edit_link{
+    font-size: 12px;
+    margin-left: 15px;
+    vertical-align: bottom;
+    color: #ff2f2f;
+    text-decoration: underline;
+}
 \ No newline at end of file
+<div class="uk-modal " id="history-sch-maintain-modal" style="">
+    <div class="uk-modal-dialog" style="width: 95%;margin: 20px auto;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+        <h2>历史路单维护</h2>
+            </div>
+
+        <div style="padding-left: 12px;margin: 20px 0">
+            <ul class="uk-subnav uk-subnav-pill h-s-time">
+            </ul>
+        </div>
+
+        <div class="uk-panel uk-panel-box uk-panel-box-primary">
+            <form class="uk-form search-form">
+                <fieldset data-uk-margin>
+                    <span class="horizontal-field">公司</span>
+                    <select name="companyId" style="width: 110px;"></select>
+                    <span class="horizontal-field">分公司</span>
+                    <select name="subCompanyId" style="width: 110px;"></select>
+                    <span class="horizontal-field">线路</span>
+                    <select name="xlBm_eq" style="width: 120px;"></select>
+                    <span class="horizontal-field">路牌</span>
+                    <select name="lpName_eq" style="width: 80px;"></select>
+                    <span class="horizontal-field">上下行</span>
+                    <select name="xlDir_eq">
+                        <option value="">全部</option>
+                        <option value="0">上行</option>
+                        <option value="1">下行</option>
+                    </select>
+                    &nbsp;
+                    <span class="horizontal-field">车辆</span>
+                    <div class="uk-autocomplete uk-form autocomplete-cars">
+                        <input type="text" name="clZbh_like" placeholder="自编号" style="width: 80px;">
+                    </div>
+                    <span class="horizontal-field">驾驶员</span>
+                    <div class="uk-autocomplete uk-form autocomplete-jsy">
+                        <input type="text" name="jGh_like" placeholder="驾驶员" style="width: 80px;">
+                    </div>
+                    <button class="uk-button">检索</button>
+                    <a class="add_lp_link" title="先点击检索后再临加路牌"><i class="uk-icon-plus"></i> 临加路牌</a>
+                </fieldset>
+            </form>
+        </div>
+
+        <div class="ct_table_wrap ct_table_no_border history-sch-wrap" style="height: 510px;">
+            <div class="ct_table history-sch-table">
+                <div class="ct_table_head">
+                    <dl>
+                        <dt>序号</dt>
+                        <dt>路牌</dt>
+                        <dt>车辆</dt>
+                        <dt>驾驶员</dt>
+                        <dt>起点</dt>
+                        <dt>终点</dt>
+                        <dt>计发</dt>
+                        <dt>待发</dt>
+                        <dt>实发</dt>
+                        <dt>终点实达</dt>
+                        <dt>备注</dt>
+                    </dl>
+                </div>
+                <div class="ct_table_body">
+                </div>
+            </div>
+        </div>
+
+        <div class="load-panel">
+            <i class="uk-icon-spinner uk-icon-spin"></i>
+            正在加载数据
+        </div>
+    </div>
+
+    <script id="history-sch-maintain-table-temp" type="text/html">
+        {{each list as sch i}}
+        <dl data-id="{{sch.id}}">
+            <dd>{{i + 1}}</dd>
+            <dd>{{sch.lpName}}</dd>
+            <dd>{{sch.clZbh}}</dd>
+            <dd>{{sch.jGh}}/{{sch.jName}}</dd>
+            <dd title="{{sch.qdzName}}">{{sch.qdzName}}</dd>
+            <dd title="{{sch.zdzName}}">{{sch.zdzName}}</dd>
+            <dd>{{sch.fcsj}}
+                {{if sch.bcType == "out"}}
+                <span class="uk-badge uk-badge-success">出场</span>
+                {{else if sch.bcType == "in"}}
+                <span class="uk-badge uk-badge-warning">进场</span>
+                {{else if sch.bcType == "venting"}}
+                <span class="uk-badge uk-badge-danger">直放</span>
+                {{else if sch.bcType == "major"}}
+                <span class="uk-badge uk-badge-danger">放站</span>
+                {{else if sch.bcType == "region"}}
+                <span class="uk-badge sch_region">区间</span>
+                {{else if sch.bcType == "ldks"}}
+                <span class="uk-badge sch_ldks">空驶</span>
+                {{/if}}
+                {{if sch.sflj}}
+                <span class="uk-badge uk-badge-danger">临加</span>
+                {{/if}}
+                {{if sch.cTasks.length > 0}}
+                <span class="uk-badge uk-badge-notification">{{sch.cTasks.length}}</span>
+                {{/if}}</dd>
+            <dd>
+                {{sch.dfsj}}
+                {{if sch.status==-1}}
+                <span class="uk-badge uk-badge-danger">烂班</span>
+                {{/if}}
+            </dd>
+            <dd>{{sch.fcsjActual}}<span class="fcsj-diff">{{sch.fcsj_diff}}</span></dd>
+            <dd>{{sch.zdsjActual}}</dd>
+            <dd title="{{sch.remarks}}">{{sch.remarks}}</dd>
+        </dl>
+        {{/each}}
+    </script>
+
+    <script>
+        (function () {
+            var modal = '#history-sch-maintain-modal';
+
+            //滚动条
+            $('.history-sch-wrap', modal).perfectScrollbar({suppressScrollX: true});
+            //history-sch-wrap
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+                $.get('/realSchedule/dateArray', function (rs) {
+                    //日期tab
+                    var tsStr = '';
+                    $.each(rs, function (i) {
+                        tsStr += '<li ' + (i == 0 ? 'class="uk-active"' : '') + '><a>' + this + '</a></li>';
+                    });
+
+                    $('.h-s-time', modal).html(tsStr);
+                    clearLpSelect();
+                    //reLoadLp=true;
+                    //jsQuery();
+                });
+            });
+
+            $(modal).on('refresh', function (e, data) {
+                if(data){
+                    var lpName = data.lpName;
+                    if(is_new_temp_lp(lpName)){
+                        $('[name=lpName_eq]', modal).append('<option value="'+lpName+'" selected>'+lpName+'</option>');
+                    }
+                }
+                jsQuery();
+            });
+
+            $(modal).on('click', '.h-s-time li,.h-s-line li', function () {
+                if(loading)
+                    return;
+                $(this).parent().find('li.uk-active').removeClass('uk-active');
+                $(this).addClass('uk-active');
+                clearLpSelect();
+                //检索之前将滚动条置顶
+                $('.history-sch-wrap', modal)[0].scrollTop = 0;
+                jsQuery();
+            });
+
+            $('.search-form', modal).on('submit', function (e) {
+                try {
+                    //检索之前将滚动条置顶
+                    $('.history-sch-wrap', modal)[0].scrollTop = 0;
+                    jsQuery();
+                }catch(e){
+                    console.log(e);
+                }
+                return false;
+            });
+
+            var reLoadLp;
+            var nbbmArray,jsyArray,lpArray,loading;
+            var schArray;//主键映射
+            function jsQuery(cb) {
+                var data = $('.search-form', modal).serializeJSON();
+                data.companyId=null;
+                data.subCompanyId=null;
+                var rq = $('.h-s-time li.uk-active', modal).text();
+                data.scheduleDateStr_eq = rq;
+                if(!data.xlBm_eq)
+                    return notify_err('请选择线路...');
+                if(data.jGh_like.indexOf('/')!=-1){
+                    var jsy=data.jGh_like.split('/');
+                    data.jGh_like=jsy[0];
+                    data.jName_like=jsy[1];
+                }
+
+                $('.load-panel', modal).show();
+                loading=true;
+                $.get('/realSchedule/all', data, function (rs) {
+                    rs.sort(schedule_sort);
+                    //可搜索的车辆自编号和驾驶员
+                    nbbmArray=[];
+                    jsyArray=[];
+                    lpArray = [];
+                    schArray = {};
+                    $.each(rs, function () {
+                        nbbmArray.push({value: this.clZbh});
+                        jsyArray.push({value: this.jGh+'/'+this.jName,
+                            fullChars: pinyin.getFullChars(this.jName).toUpperCase(),
+                            camelChars: pinyin.getCamelChars(this.jName)});
+                        lpArray.push({value: this.lpName});
+                        calc_sch_real_shift(this);
+                        schArray[this.id] = this;
+                    });
+
+                    var tbodyStr = template('history-sch-maintain-table-temp', {list: rs});
+                    $('.history-sch-table .ct_table_body', modal).html(tbodyStr);
+                    //value
+                    nbbmArray=distinctByField(nbbmArray);
+                    jsyArray=distinctByField(jsyArray);
+                    lpArray=distinctByField(lpArray);
+
+                    if(reLoadLp){
+                        //路牌下拉框
+                        var ops = '<option value="">全部</option>';
+                        $.each(lpArray, function () {
+                            ops += '<option value="'+this.value+'">'+this.value+'</option>';
+                        });
+                        $('[name=lpName_eq]', modal).html(ops);
+                        reLoadLp = false;
+                    }
+
+                    //lpName_eq
+                    $('.load-panel', modal).hide();
+                    loading=false;
+
+                    //更新滚动条高度
+                    $('.history-sch-wrap', modal).perfectScrollbar('update');
+
+                    cb && cb();
+
+                    //初始化依赖数据
+                    gb_data_basic.initData(data.xlBm_eq);
+                });
+            }
+
+            function clearLpSelect() {
+                $('[name=lpName_eq]', modal).val('').html('');
+                reLoadLp = true;
+            }
+            
+            //nbbm autocomplete
+            var carAutoCom=$('.autocomplete-cars', modal);
+            UIkit.autocomplete(carAutoCom, {
+                minLength: 1,
+                delay: 50,
+                source: function(release) {
+                    var q = $('input', carAutoCom).val().toUpperCase()
+                            ,rs = [],
+                            count = 0;
+                    $.each(nbbmArray, function () {
+                        if(this.value.indexOf(q) != -1){
+                            rs.push(this);
+                            count++;
+                        }
+                        if (count >= 15)
+                            return false;
+                    });
+                    release && release(rs);
+                }
+            });
+
+            //jsy autocomplete
+            var jsyAutoCom=$('.autocomplete-jsy', modal);
+            UIkit.autocomplete(jsyAutoCom, {
+                minLength: 1,
+                delay: 50,
+                source: function(release) {
+                    var q = $('input', jsyAutoCom).val().toUpperCase()
+                            ,rs = [],
+                            count = 0;
+
+                    $.each(jsyArray, function() {
+                        if (this.value.indexOf(q) != -1 || this.fullChars.indexOf(q) != -1 || this.camelChars.indexOf(q) != -1){
+                            rs.push(this);
+                            count++;
+                        }
+
+                        if (count >= 10)
+                            return false;
+                    });
+                    release && release(rs);
+                }
+            });
+
+            function schedule_sort(s1, s2) {
+                return (s1.realExecDate+s1.fcsj).localeCompare(s2.realExecDate+s2.fcsj);
+            }
+
+            function distinctByField(arr, f){
+                if(!f)
+                    f = 'value';
+                var rs = {};
+                $.each(arr, function () {
+                   rs[this[f]]=this;
+                });
+                return gb_common.get_vals(rs);
+            }
+
+            gb_ct_table.fixedHead($('.ct_table_wrap', modal));
+
+            //班次点击
+            $(modal).on('click contextmenu',  '.history-sch-table .ct_table_body dl', function() {
+                $(this).parent().find('.active').removeClass('active');
+                $(this).addClass('active');
+            });
+
+            var modal_opts = {center: false,bgclose: false, modal: false};
+            var folder = '/real_control_v2/fragments/north/nav/history_sch';
+            var callbackHandler={
+                edit: function(id){
+                    open_modal(folder + '/editor.html', {id: id, parentModal: modal}, modal_opts);
+                },
+                add: function (id) {
+                    open_modal(folder + '/h_add_temp_sch.html', {
+                        sch: schArray[id]
+                    }, modal_opts);
+                },
+                delete: function (id) {
+                    var sch = schArray[id];
+                    if (!sch || !sch.sflj)
+                        return notify_err('只能删除临加班次！');
+                    var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3><h5 style="color: #6c6c6c;font-size: 12px;">班次删除后，调度指令会保留</h5>';
+                    alt_confirm(str, function () {
+                        gb_common.$del('/realSchedule/history/' + sch.id, function (rs) {
+                            if($('.history-sch-table .ct_table_body dl', modal).length == 1){
+                                $('[name=lpName_eq]', modal).val('');
+                                reLoadLp = true;
+                            }
+
+                            jsQuery();
+                        });
+                    }, '确定删除');
+                }
+            };
+
+            //计算实发时间差值
+            var calc_sch_real_shift = function (sch) {
+                if (sch.fcsjActualTime) {
+                    var diff = parseInt((sch.fcsjActualTime - sch.dfsjT) / 1000 / 60);
+                    if (diff > 0)
+                        sch.fcsj_diff = '( +' + diff + ' )';
+                    else if (diff < 0)
+                        sch.fcsj_diff = '( ' + diff + ' )';
+                    else
+                        sch.fcsj_diff = '';
+                }
+            };
+
+            //右键菜单
+            $.contextMenu({
+                selector: modal+' .history-sch-table .ct_table_body dl',
+                className: 'schedule-ct-menu',
+                callback: function(key, options) {
+                    var id = $('.context-menu-active', modal).data('id');
+                    callbackHandler[key] && callbackHandler[key](id);
+                },
+                items: {
+                    'edit': {
+                        name: '编辑'
+                    },
+                    'add': {
+                        name: '新增临加班次'
+                    },
+                    'delete':{
+                        name: '删除'
+                    }
+                }
+            });
+
+            //临加路牌
+            $('.add_lp_link', modal).on('click', function () {
+                var index = 0, max;
+                $.each(lpArray, function (i, obj) {
+                    var lp = obj.value;
+                    if (lp.indexOf('临') != -1) {
+                        max = lp.substr(lp.indexOf('临') + 1);
+                        if (!isNaN(max))
+                            index = parseInt(max);
+                    }
+                });
+
+                var lpName = '临' + (index + 1);
+                var lineSelect = $('[name=xlBm_eq]', modal);
+                var rq = $('.h-s-time li.uk-active', modal).text(),
+                        lineName = lineSelect[0].options[lineSelect[0].selectedIndex].text,//$('.h-s-line li.uk-active', modal).text(),
+                        lineCode = lineSelect.val();
+
+                var sch = {
+                    scheduleDateStr: rq,
+                    xlBm: lineCode,
+                    xlName: lineName,
+                    lpName: lpName
+                };
+
+                open_modal(folder + '/h_add_temp_sch.html', {
+                    sch: sch
+                }, modal_opts);
+            });
+
+            /**
+             * 是否是临加路牌
+             * @param lpName
+             */
+            function is_new_temp_lp(lpName) {
+                if(lpName.indexOf('临') ==-1)
+                    return false;
+
+                for(var i=0,obj;obj=lpArray[i++];){
+                    if(obj.value==lpName)
+                        return false;
+                }
+
+                return true;
+            }
+
+
+            var f = $('.search-form', modal);
+            var ep = EventProxy.create('query_comps', 'query_lines', function () {
+                $('[name=companyId]', f).trigger('change');//公司change
+            });
+            var comps;
+            //构建公司级联下拉框
+            $.get('/user/companyData', function (rs) {
+                comps = rs;
+                var opts = '';
+                for(var i=0,obj;obj=comps[i++];){
+                    opts += '<option value="'+obj.companyCode+'">'+obj.companyName+'</option>';
+                }
+                $('[name=companyId]', f).html(opts);
+                ep.emit('query_comps');
+            });
+            var lineMapps;
+            //加载线路信息
+            $.get('/line/all', {'destroy_eq': 0}, function (rs) {
+                rs.sort(function (a, b) {
+                    return a.name.localeCompare(b.name);
+                });
+                lineMapps={};
+                var k;
+                $.each(rs, function () {
+                    k = this.company+'_'+this.brancheCompany;
+                    if(!lineMapps[k])
+                        lineMapps[k]=[];
+                    lineMapps[k].push(this);
+                });
+
+                ep.emit('query_lines');
+            });
+
+            $('[name=companyId]', f).on('change', function () {
+                var code = $(this).val(), subs=[];
+                $.each(comps, function () {
+                    if(this.companyCode==code)
+                        subs=this.children;
+                });
+
+                var opts='';
+                $.each(subs, function () {
+                    opts += '<option value="'+this.code+'">'+this.name+'</option>';
+                });
+                $('[name=subCompanyId]', f).html(opts).trigger('change');
+            });
+
+            $('[name=subCompanyId]', f).on('change', function () {
+                var k = $('[name=companyId]', f).val() + '_' + $(this).val();
+                var array = lineMapps[k];
+                var opts = '';
+                if(array){
+                    $.each(array, function () {
+                        opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+                    });
+                }
+                $('[name=xlBm_eq]', f).html(opts);
+            });
+
+            $('[name=xlBm_eq]', f).on('change', clearLpSelect);
+            //clearLpSelect
+        })();
+    </script>
+</div>
 \ No newline at end of file
+/* 基础数据管理模块 */
+
+var gb_data_basic = (function () {
+
+    var allPersonnel;
+    var stationRoutes, lineInformations, codeToLine={};
+    var ep = EventProxy.create("all_personnel"
+        , function (all_personnel) {
+            allPersonnel = all_personnel;
+            //gb_main_ep.emitLater('data-basic');
+        });
+
+/*    //线路标准信息
+    gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
+        var informations = {};
+        $.each(rs, function () {
+            informations[this.line.lineCode] = this;
+            delete this['line'];
+        });
+        ep.emit('lineInformations', informations);
+    });*/
+
+    //人员信息
+    loadAllPersonnel(function (data) {
+        ep.emit('all_personnel', data);
+    });
+    function loadAllPersonnel(cb) {
+        $.get('/personnel/all_py', function (rs) {
+            //转换成自动补全组件需要的数据
+            var data = [], code;
+            for(var i =0, p; p = rs[i++];){
+                code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
+                data.push({
+                    value: code + '/' + p.name,
+                    fullChars: p.fullChars.toUpperCase(),
+                    camelChars: p.camelChars.toUpperCase()
+                });
+            }
+            cb && cb(data);
+        });
+    }
+
+    var carparks = {};
+    //停车场数据
+    gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+        rs.list.sort(function (a, b) {
+           return a.parkName.localeCompare(b.parkName);
+        });
+        $.each(rs.list, function () {
+            carparks[this.parkCode] = this;
+        });
+    });
+
+    //车辆数据
+    var carsArray;
+    $.get('/basic/cars?t=' + Math.random(), function (rs) {
+        carsArray = rs;
+    });
+
+    var getCarparkByCode = function (code) {
+        return carparks[code];
+    };
+
+    //line code to name
+    $.get('/basic/lineCode2Name', function (rs) {
+        ep.emit('lineCode2Name', rs);
+    });
+
+    var getLineInformation = function (lineCode) {
+        return lineInformations[lineCode];
+    };
+
+    var stationRouteSort = function (a, b) {
+        return a.stationRouteCode - b.stationRouteCode;
+    };
+
+    function findLineByCodes(codeArr) {
+        var rs = [];
+        $.each(codeArr, function () {
+            rs.push(codeToLine[this]);
+        });
+        return rs;
+    }
+
+    return {
+        getLineInformation: getLineInformation,
+        allInformations: function () {
+            return {};
+        },
+        allPersonnel: function () {
+            return allPersonnel;
+        },
+        getSvgAttr: function (lineCode) {
+            return svgAttrs[lineCode];
+        },
+        //刷新员工信息
+        refreshAllPersonnel: function (cb) {
+            loadAllPersonnel(function (data) {
+                allPersonnel = data;
+                cb && cb();
+            });
+        },
+        carsArray: function () {
+            return carsArray;
+        },
+        simpleParksArray: function () {
+            var map = {};
+            for(var code in carparks)
+                map[code] = carparks[code].parkName;
+            return map;
+        },
+        getLineInformation: getLineInformation,
+        allInformations: function () {
+            return lineInformations;
+        },
+        stationRoutes: function (lineCode) {
+            return stationRoutes[lineCode]
+        },
+        remarksMapps: function () {
+            return "";
+        },
+        findLineByCodes: findLineByCodes,
+        //初始化依赖数据
+        initData: function (lineCode) {
+            var ep = EventProxy.create("stationRoutes",  "lineInformations", "codeToLineMap", function (routes, informations, _codeToLine) {
+                stationRoutes = routes;
+                lineInformations = informations;
+                codeToLine[_codeToLine.lineCode] = _codeToLine;
+            });
+
+            //站点路由
+            gb_common.$get('/stationroute/multiLine', {lineIds: lineCode}, function (rs) {
+                var list = rs.list;
+                var routeData = gb_common.groupBy(list, 'lineCode');
+                //排序
+                for (var lineCode in routeData) {
+                    routeData[lineCode].sort(stationRouteSort);
+                }
+                ep.emitLater('stationRoutes', routeData);
+            });
+
+            //线路标准信息
+            gb_common.$get('/lineInformation/line/multi', {lineCodes: lineCode}, function (rs) {
+                var _informations = {};
+                $.each(rs, function () {
+                    _informations[this.line.lineCode] = this;
+                    delete this['line'];
+                });
+                ep.emitLater('lineInformations', _informations);
+            });
+
+            //线路基础信息
+            gb_common.$get('/line/' + lineCode, {}, function (rs) {
+                ep.emitLater('codeToLineMap', rs);
+            });
+        }
+    };
+})();
+//modal hide remove dom
+$(document).on('hide.uk.modal', '.uk-modal', function () {
+    $(this).trigger('ct-destroy').remove();
+});
+
+
+var show_modal = function (id, dom) {
+    $(document.body).append(dom);
+    return UIkit.modal(id, {
+        bgclose: false, modal: false
+    }).show();
+};
+
+var open_modal = function (pageUrl, data, opt) {
+    $.get(pageUrl, function (dom) {
+        open_modal_dom(dom, data, opt);
+    });
+};
+
+var open_modal_dom = function (dom, data, opt) {
+    if (!$(dom).hasClass('uk-modal')) {
+        alert('无效的dom片段！');
+        return;
+    }
+    var id = '#' + $(dom).attr('id');
+
+    $(document.body).append(dom);
+    UIkit.modal(id, opt).show();
+
+    if (data)
+        $(id).trigger('init', data);
+};
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <!-- uikit  core style-->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" />
+    <link rel="stylesheet"
+          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css" />
+
+    <!-- main style -->
+    <link rel="stylesheet" href="/pages/history_sch/edit/css/main.css" />
+    <!-- north style -->
+    <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
+    <!-- line style -->
+    <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css" merge="custom_style"/>
+
+    <!-- custom table -->
+    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
+    <!-- jquery contextMenu style -->
+    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css"  merge="plugins"/>
+    <!-- formvalidation style -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"  merge="plugins"/>
+
+    <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
+    <!-- perfect-scrollbar style -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
+    <style>
+        .uk-modal.ct_move_modal .uk-modal-header {
+            cursor: default;
+            user-select: none;
+        }
+        .uk-modal.ct_move_modal .uk-modal-dialog {
+            position: relative !important;
+            margin: 50px auto !important;
+        }
+    </style>
+</head>
+
+<body>
+<div class="ct_page" >
+</div>
+<!-- jquery -->
+<script src="/real_control_v2/assets/js/jquery.min.js"></script>
+<!-- jquery actual -->
+<script src="/real_control_v2/assets/js/jquery.actual.min.js" merge="plugins"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- moment.js 日期处理类库 -->
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/zh-cn.js"></script>
+
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" merge="plugins"></script>
+
+<!-- perfect-scrollbar -->
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
+<!-- common js -->
+<script src="/real_control_v2/js/common.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js" merge="plugins"></script>
+<!-- d3 -->
+<script src="/assets/js/d3.min.js"></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- uikit core -->
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/pagination.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/timepicker.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.min.js" merge="uikit_js"></script>
+
+<!-- jquery contextMenu -->
+<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/js/jquery.ui.position.min.js"  merge="plugins"></script>
+<!-- formvalidation- -->
+<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js"  merge="plugins"></script>
+<!-- js tree -->
+<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"  merge="plugins"></script>
+<!-- simple pinyin -->
+<script src="/assets/plugins/pinyin.js" merge="plugins"></script>
+<!-- qtip -->
+<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" merge="plugins"></script>
+<!-- layer 3.0.3 -->
+<script src="/real_control_v2/assets/plugins/layer3.0.3/layer.js" merge="plugins"></script>
+
+<!-- custom table js -->
+<script src="/real_control_v2/js/utils/ct_table.js" merge="custom_js"></script>
+<script src="/pages/history_sch/edit/js/modal_extend.js" merge="custom_js"></script>
+<!-- 字典相关 -->
+<script src="/assets/js/dictionary.js" merge="custom_js"></script>
+<!-- 数据 -->
+<script src="/pages/history_sch/edit/js/data_basic.js" merge="custom_js"></script>
+<script>
+
+    (function () {
+        open_modal('/pages/history_sch/edit/history_sch_maintain.html', {}, {
+            center: false,
+            bgclose: false
+        });
+    })();
+
+    var notify_err = function (t) {
+        UIkit.notify("<i class='uk-icon-times'></i> " + t, {
+            status: 'danger'
+        });
+    };
+
+    var gb_form_validation_opts = {
+        framework: 'uikit',
+        locale: 'zh_CN',
+        icon: {
+            valid: 'uk-icon-check',
+            invalid: 'uk-icon-times',
+            validating: 'uk-icon-refresh'
+        }
+    };
+
+    var disabled_submit_btn = function (form) {
+        var subBtn = $('button[type=submit]', form);
+        if (subBtn) {
+            subBtn.addClass('disabled').attr('disabled', 'disabled');
+        }
+    };
+
+    var notify_succ = function (t) {
+        UIkit.notify("<i class='uk-icon-check'></i> " + t, {
+            status: 'success'
+        });
+    };
+
+    var hide_wait_modal = function () {
+        UIkit.modal('#gb_wait_modal').hide();
+    };
+</script>
+</body>
+</html>
 \ No newline at end of file
+<!-- 历史路单维护 -->
+<iframe src="/pages/history_sch/edit/main_page.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
 \ No newline at end of file
+<!-- 烂班明细统计 -->
+<iframe src="/pages/summary/destory_sch_detail/list.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+    <style>
+        html,body{
+            height: 100%;
+        }
+        .ct_page{
+            padding: 25px 15px;
+            height: 100%;
+            height: calc(100% - 50px);
+        }
+
+        .ct_cont{
+            height: calc(100% - 35px);
+        }
+
+        .ct_cont>div>div.uk-card{
+            height: 99%;
+        }
+
+        .loading{
+            height: 100%;
+            text-align: center;
+        }
+        .loading .uk-spinner{
+            margin-top: 200px;
+        }
+        .loading circle{
+            stroke: red;
+        }
+
+        .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+            opacity: 0.6 !important;
+            padding: 0 !important;
+        }
+
+        .ct_destroy_sch_table_width th:nth-of-type(1),.ct_destroy_sch_table_width td:nth-of-type(1){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(2),.ct_destroy_sch_table_width td:nth-of-type(2){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(3),.ct_destroy_sch_table_width td:nth-of-type(3){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(4),.ct_destroy_sch_table_width td:nth-of-type(4){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(5),.ct_destroy_sch_table_width td:nth-of-type(5){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(6),.ct_destroy_sch_table_width td:nth-of-type(6){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(7),.ct_destroy_sch_table_width td:nth-of-type(7){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(8),.ct_destroy_sch_table_width td:nth-of-type(8){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(9),.ct_destroy_sch_table_width td:nth-of-type(9){
+            width: 10%;
+        }
+        .ct_destroy_sch_table_width th:nth-of-type(10),.ct_destroy_sch_table_width td:nth-of-type(10){
+            width: 10%;
+        }
+
+/*        .ct_table_wrap.day th:nth-of-type(1),.ct_table_wrap.day td:nth-of-type(1){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(2),.ct_table_wrap.day td:nth-of-type(2){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(3),.ct_table_wrap.day td:nth-of-type(3){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(4),.ct_table_wrap.day td:nth-of-type(4){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(5),.ct_table_wrap.day td:nth-of-type(5){
+            width: 5%;
+        }
+        .ct_table_wrap.day th:nth-of-type(6),.ct_table_wrap.day td:nth-of-type(6){
+            width: 15%;
+        }
+        .ct_table_wrap.day th:nth-of-type(7),.ct_table_wrap.day td:nth-of-type(7){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(8),.ct_table_wrap.day td:nth-of-type(8){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(9),.ct_table_wrap.day td:nth-of-type(9){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(10),.ct_table_wrap.day td:nth-of-type(10){
+            width: 10%;
+        }*/
+
+        .ct_search_form_wrap{
+            border-bottom: 1px solid #e5e5e5;
+            padding: 10px 0 25px 10px;
+        }
+        .ct_search_form_wrap .ct_field{
+            display: inline-block;
+            margin: 0 5px;
+        }
+
+        .ct_search_form_wrap .ct_field label{
+            font-size: 14px;
+        }
+
+        .ct_search_form_wrap .ct_field input{
+            width: 110px;
+        }
+
+        .ct_search_form_wrap .ct_field select{
+            width: auto;
+            min-width: 100px;
+        }
+
+        .ct_search_form_wrap .uk-button{
+            padding: 0 14px;
+        }
+
+        .ct_search_form_wrap .uk-button i{
+            vertical-align: middle;
+            margin-top: -2px;
+            margin-right: 7px;
+        }
+
+        .ct_table_wrap{
+            font-size: 14px;
+            height: calc(100% - 77px);
+        }
+
+        .t_body_wrap{
+            height: calc(100% - 41px);
+            overflow: auto;
+            position: relative;
+        }
+
+        .ct_field.ct_field_bottom{
+            vertical-align: bottom;
+            font-size: 12px;
+            margin-left: 0;
+        }
+    </style>
+</head>
+
+<body>
+<div class="loading">
+    <div uk-spinner></div>
+</div>
+<div class="ct_page" style="display: none;">
+    <h3 class="uk-heading-line uk-heading-bullet"><span>烂班明细统计</span></h3>
+    <div class="ct_cont" >
+        <div class="ct_search_form_wrap">
+            <form>
+                <input type="hidden" name="status_eq" value="-1">
+                <div class="ct_field">
+                    <label>公司：
+                        <select class="uk-select" name="gsBm_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>分公司：
+                        <select class="uk-select" name="fgsBm_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>线路：
+                        <select class="uk-select" name="xlBm_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>日期：
+                        <input class="uk-input" name="rq" style="width: 220px;">
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <span uk-icon="icon: question" title="暂时只支持单线路查询，目前实时汇总。导出功能先等等" uk-tooltip="pos: bottom"></span>
+                </div>
+            </form>
+        </div>
+        <div class="ct_table_wrap day">
+            <table class="uk-table uk-table-small ct_destroy_sch_table_width" style="margin-bottom: 0;">
+                <thead>
+                <tr>
+                    <th>日期</th>
+                    <th>线路</th>
+                    <th>车号</th>
+                    <th>司机</th>
+                    <th>售票员</th>
+                    <th>原因</th>
+                    <th>班次</th>
+                    <th>烂班公里</th>
+                    <th>烂班时间</th>
+                    <th>备注</th>
+                </tr>
+                </thead>
+            </table>
+            <div class="t_body_wrap">
+                <table class="uk-table uk-table-divider uk-table-hover uk-table-small ct_destroy_sch_table ct_destroy_sch_table_width">
+                    <tbody>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script id="destroy_sch_list_temp" type="text/html">
+    {{each list as obj i}}
+        <tr>
+            <td>{{obj.scheduleDateStr}}</td>
+            <td>{{obj.xlName}}</td>
+            <td>{{obj.clZbh}}</td>
+            <td>{{obj.jGh}}</td>
+            <td>{{obj.sGh}}</td>
+            <td>{{obj.adjustExps}}</td>
+            <td><a>{{obj.destroySize}}</a></td>
+            <td>{{obj.destroyMileageSum}}</td>
+            <td>{{obj.dfsj}}</td>
+            <td>{{obj.remarks}}</td>
+        </tr>
+    {{/each}}
+</script>
+
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+<script>
+
+    var f = $('form', '');
+    //var page=0, pageSize=120;
+
+    var ep = EventProxy.create('query_comps', 'query_lines', function () {
+        $('[name=gsBm_eq]', f).trigger('change');//公司change
+        query();
+
+        $('.loading').remove();
+        $('.ct_page').show();
+    });
+
+    //点击搜索
+    $('button.search', f).on('click', query);
+
+    function query() {
+        $('button.search', f).attr('disabled', 'disabled');
+        var data = f.serializeJSON();
+        //data.page = page;
+        //data.size = pageSize;
+
+        //开始结束时间
+        data.scheduleDateStr_ge = data.rq.substr(0, 10);
+        data.scheduleDateStr_le = data.rq.substr(13);
+
+        delete data.rq;
+
+        $.get('/realSchedule/all', data, function (rs) {
+            console.log('rs', rs);
+            $('button.search', f).removeAttr('disabled');
+
+            //按线路、车、人、烂班原因分组
+            var groupData = {}, key;
+            $.each(rs, function () {
+                key=this.xlBm+'_'+this.clZbh+'_'+this.jGh+'_'+this.adjustExps;
+                if(!groupData[key])
+                    groupData[key] = [];
+
+                groupData[key].push(this);
+            });
+
+            var list = [], sch;
+            for(var k in groupData){
+                //排序
+                groupData[k].sort(sch_sort_fun);
+                sch=groupData[k][0];
+                sch.destroySize=groupData[k].length;
+                sch.destroyMileageSum=countMileage(groupData[k]);
+                list.push(sch);
+            }
+
+            var htmlStr = template('destroy_sch_list_temp', {list: list});
+            $('.ct_destroy_sch_table tbody').html(htmlStr);
+            $('.t_body_wrap').perfectScrollbar('update');
+        });
+    }
+
+
+    function sch_sort_fun(a, b) {
+        return a.dfsjT - b.dfsjT;
+    }
+
+    function countMileage(array) {
+        var sum=0;
+        $.each(array, function () {
+            sum = accAdd(sum, this.jhlcOrig);
+        });
+        return sum;
+    }
+
+    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;
+    };
+
+    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);
+    }
+
+    //日期选择框
+    var fs='YYYY-MM-DD'
+            , ets=moment().subtract(1, 'days').format(fs)
+            , sts=moment().subtract(3, 'days').format(fs);
+    flatpickr('.ct_search_form_wrap [name=rq]', {
+        mode: "range", dateFormat: "Y-m-d","locale": "zh", defaultDate: [sts, ets]
+    });
+    var comps;
+    //构建公司级联下拉框
+    $.get('/user/companyData', function (rs) {
+        comps = rs;
+        var opts = '';
+        for(var i=0,obj;obj=comps[i++];){
+            opts += '<option value="'+obj.companyCode+'">'+obj.companyName+'</option>';
+        }
+        $('[name=gsBm_eq]', f).html(opts);
+        ep.emit('query_comps');
+    });
+
+    var lineMapps;
+    //加载线路信息
+    $.get('/line/all', {'destroy_eq': 0}, function (rs) {
+        rs.sort(function (a, b) {
+            return a.name.localeCompare(b.name);
+        });
+        lineMapps={};
+        var k;
+        $.each(rs, function () {
+            k = this.company+'_'+this.brancheCompany;
+            if(!lineMapps[k])
+                lineMapps[k]=[];
+            lineMapps[k].push(this);
+        });
+
+        ep.emit('query_lines');
+    });
+
+    $('[name=gsBm_eq]', f).on('change', function () {
+        var code = $(this).val(), subs=[];
+        $.each(comps, function () {
+            if(this.companyCode==code)
+                subs=this.children;
+        });
+
+        var opts='';
+        $.each(subs, function () {
+            opts += '<option value="'+this.code+'">'+this.name+'</option>';
+        });
+        $('[name=fgsBm_eq]', f).html(opts).trigger('change');
+    });
+
+    $('[name=fgsBm_eq]', f).on('change', function () {
+        var k = $('[name=gsBm_eq]', f).val() + '_' + $(this).val();
+        var array = lineMapps[k];
+        var opts = '';
+        if(array){
+            $.each(array, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+        }
+        $('[name=xlBm_eq]', f).html(opts);
+    });
+
+    //
+    //滚动条
+    $('.t_body_wrap').perfectScrollbar({suppressScrollX: true});
+
+    $(document).on('submit', 'form', function () {
+        return false;
+    });
+
+    $('#add_hours_icon').on('click', function () {
+        UIkit.notification('暂不开放！', 'danger');
+    });
+</script>
+</body>
+</html>
 \ No newline at end of file
@@ -18,24 +18,30 @@
             <div class="data_table_wrap head">
                 <table cellspacing="1" class="data_table">
                     <col  />
-                    <col  width="14%"/>
-                    <col  width="4%"/>
-                    <col  width="6%"/>
-                    <col  width="6%"/>
-                    <col  width="6%"/>
                     <col  width="5%"/>
                     <col  width="5%"/>
                     <col  width="5%"/>
+                    <col  width="13%"/>
+                    <col  width="4%"/>
                     <col  width="5%"/>
-                    <col  width="6%"/>
-                    <col  width="6%"/>
-                    <col  width="6%"/>
                     <col  width="5%"/>
                     <col  width="5%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
                     <col  width="5%"/>
                     <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
                     <tr>
                         <td rowspan="3">序号</td>
+                        <td rowspan="3">路牌</td>
+                        <td rowspan="3">车辆</td>
+                        <td rowspan="3">人员</td>
                         <td rowspan="3">发车站点</td>
                         <td rowspan="3">方向</td>
                         <td colspan="7">发车时间</td>
@@ -70,25 +76,31 @@
             <div class="data_table_wrap data" id="table_{{k}}">
                 <table cellspacing="1" class="data_table">
                     <col  />
-                    <col  width="14%"/>
-                    <col  width="4%"/>
-                    <col  width="6%"/>
-                    <col  width="6%"/>
-                    <col  width="6%"/>
                     <col  width="5%"/>
                     <col  width="5%"/>
                     <col  width="5%"/>
+                    <col  width="13%"/>
+                    <col  width="4%"/>
                     <col  width="5%"/>
-                    <col  width="6%"/>
-                    <col  width="6%"/>
-                    <col  width="6%"/>
                     <col  width="5%"/>
                     <col  width="5%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
                     <col  width="5%"/>
                     <col  width="5%"/>
+                    <col  width="5%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
+                    <col  width="4%"/>
                     {{each listMap[k] as obj i}}
                     <tr>
                         <td>{{i+1}}</td>
+                        <td>{{obj.lpName}}</td>
+                        <td>{{obj.nbbm}}</td>
+                        <td>{{obj.jsy}}</td>
                         <td>{{obj.stationName}}</td>
                         <td class="cell_dir_{{obj.upDown}}">{{obj.upDown==0?"上行":"下行"}}</td>
                         <td>{{obj.fcsj}}</td>
@@ -108,21 +120,21 @@
                     </tr>
                     {{/each}}
                     <tr>
-                        <td rowspan="4">合计：</td>
-                        <td colspan="8" class="count_col">发车：上行（计划快误点：<a class="c_c_0">{{countMap[k][0]['fast'][0]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][0]}}</a>  &nbsp;待发快误点：<a class="c_c_0">{{countMap[k][0]['fast'][1]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][1]}}</a>）</td>
-                        <td colspan="8" class="count_col">发车：下行（计划快误点：<a class="c_c_1">{{countMap[k][1]['fast'][0]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][0]}}</a>  待发快误点：<a class="c_c_1">{{countMap[k][1]['fast'][1]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][1]}}</a>）</td>
+                        <td rowspan="4" colspan="2">合计：</td>
+                        <td colspan="9" class="count_col">发车：上行（计划快误点：<a class="c_c_0">{{countMap[k][0]['fast'][0]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][0]}}</a>  &nbsp;待发快误点：<a class="c_c_0">{{countMap[k][0]['fast'][1]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][1]}}</a>）</td>
+                        <td colspan="9" class="count_col">发车：下行（计划快误点：<a class="c_c_1">{{countMap[k][1]['fast'][0]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][0]}}</a>  待发快误点：<a class="c_c_1">{{countMap[k][1]['fast'][1]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][1]}}</a>）</td>
                     </tr>
                     <tr>
-                        <td colspan="8" class="count_col">发车：上行（计划慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][0]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][0]}}</a>  &nbsp;待发慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][1]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][1]}}</a>）</td>
-                        <td colspan="8" class="count_col">发车：下行（计划慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][0]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][0]}}</a>  &nbsp;待发慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][1]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][1]}}</a>）</td>
+                        <td colspan="9" class="count_col">发车：上行（计划慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][0]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][0]}}</a>  &nbsp;待发慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][1]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][1]}}</a>）</td>
+                        <td colspan="9" class="count_col">发车：下行（计划慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][0]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][0]}}</a>  &nbsp;待发慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][1]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][1]}}</a>）</td>
                     </tr>
                     <tr>
-                        <td colspan="8" class="count_col">到达：上行（计划快误点：<a class="c_c_0">{{countMap[k][0]['fast'][2]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][2]}}</a>  &nbsp;待发快误点：<a class="c_c_0">{{countMap[k][0]['fast'][3]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][3]}}</a>）</td>
-                        <td colspan="8" class="count_col">到达：下行（计划快误点：<a class="c_c_1">{{countMap[k][1]['fast'][2]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][2]}}</a>  &nbsp;待发快误点：<a class="c_c_1">{{countMap[k][1]['fast'][3]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][3]}}</a>）</td>
+                        <td colspan="9" class="count_col">到达：上行（计划快误点：<a class="c_c_0">{{countMap[k][0]['fast'][2]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][2]}}</a>  &nbsp;待发快误点：<a class="c_c_0">{{countMap[k][0]['fast'][3]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['fast'][3]}}</a>）</td>
+                        <td colspan="9" class="count_col">到达：下行（计划快误点：<a class="c_c_1">{{countMap[k][1]['fast'][2]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][2]}}</a>  &nbsp;待发快误点：<a class="c_c_1">{{countMap[k][1]['fast'][3]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['fast'][3]}}</a>）</td>
                     </tr>
                     <tr>
-                        <td colspan="8" class="count_col">到达：上行（计划慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][2]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][2]}}</a>  &nbsp;待发慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][3]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][3]}}</a>）</td>
-                        <td colspan="8" class="count_col">到达：下行（计划慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][2]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][2]}}</a>  &nbsp;待发慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][3]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][3]}}</a>）</td>
+                        <td colspan="9" class="count_col">到达：上行（计划慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][2]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][2]}}</a>  &nbsp;待发慢误点：<a class="c_c_0">{{countMap[k][0]['slow'][3]}}</a>  &nbsp;累计时间：<a class="c_c_0">{{timeCountMap[k][0]['slow'][3]}}</a>）</td>
+                        <td colspan="9" class="count_col">到达：下行（计划慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][2]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][2]}}</a>  &nbsp;待发慢误点：<a class="c_c_1">{{countMap[k][1]['slow'][3]}}</a>  &nbsp;累计时间：<a class="c_c_1">{{timeCountMap[k][1]['slow'][3]}}</a>）</td>
                     </tr>
                 </table>
             </div>
@@ -91,19 +91,20 @@
         }
         .ct_rq_left{
-            width: 200px;
+            width: 130px;
             display: inline-block;
             vertical-align: top;
             height: calc(100% - 184px);
             position: fixed;
             left: 25px;
+            padding: 40px 15px;
         }
         .ct_right_tables{
-            width: calc(100% - 220px);
+            width: calc(100% - 160px);
             display: inline-block;
-            margin-left: 232px;
-            padding: 25px;
+            margin-left: 152px;
+            padding: 25px 0;
             margin-bottom: 18px;
         }
@@ -117,7 +118,7 @@
             width: 15px;
             border-top: 1px solid #1e87f0;
             z-index: 9;
-            right: 60px;
+            right: 40px;
             top: 15px;
         }
         .uk-nav-default>li.uk-active>a {
@@ -126,7 +127,7 @@
         }
         .data_table_wrap{
-            min-width: 1170px;
+            min-width: 1070px;
         }
         .ct_right_tables table{
@@ -156,7 +157,7 @@
         .data_table_wrap.head{
             position: fixed;
-            width: calc(100% - 300px);
+            width: calc(100% - 190px);
             top: 155px;
             padding-top: 25px;
             background: #fff;