Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents a539fb6f 40601a9f
Showing 32 changed files with 747 additions and 114 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleResults_output.java
src/main/java/com/bsth/service/traffic/impl/VehicleInoutStopServiceImpl.java
src/main/resources/rules/legacy/shiftloop_fb_2.drl
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/pages/base/stationroute/deletesection.html
src/main/resources/static/pages/base/stationroute/deletestation.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-reload.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/module.js
src/main/resources/static/pages/summary/work_hours/list.html
src/main/resources/static/pages/trafficManage/js/lineStationUploadRecord.js
src/main/resources/static/real_control_v2/css/handicapped_style.css
src/main/resources/static/real_control_v2/css/main.css
@@ -175,7 +175,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             dayOfSchedule.save(sch);
             //清理应发未发标记
-            LateAdjustHandle.remove(sch);
+            LateAdjustHandle.remove(sch.getClZbh());
             if(!gps.isService() && !dayOfSchedule.emptyService(sch)){
                 //切换成营运状态
@@ -482,7 +482,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         boolean limitPark = StringUtils.isNotEmpty(park);
-        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().equals(0))
+        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().intValue()==0)
                 && (!limitPark || park.equals(next.getZdzCode()))) {
             next.setFcsjActualAll(sch.getZdsjActualTime());
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=267";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=285";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -162,6 +162,15 @@ public class PilotReport {
             LineConfig conf = lineConfigData.get(sch.getXlBm());
             if (conf.getOutConfig() == 1) {
+
+                try{
+                    //最大允许时间阈值 2 小时
+                    if(Math.abs(d80.getTimestamp() - sch.getDfsjT()) > 1000 * 60 * 60 * 2)
+                        return;
+                }catch (Exception e){
+                    logger.error("", e);
+                }
+
                 //为相关班次写入请求出场时间
                 sch.setFcsjActualAll(d80.getTimestamp());
@@ -102,12 +102,25 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 sch.setLate2(false);
                 sch.setLateMinute(0);
                 sch.setDfAuto(false);
+
+                logger.info("移除误点调整 -" + sch.getClZbh());
             }
         }catch (Exception e){
             logger.error("", e);
         }
     }
+    public static void remove(String nbbm){
+        if(lateSchMap.containsKey(nbbm)){
+            ScheduleRealInfo sch = lateSchMap.get(nbbm);
+            sch.setLate2(false);
+            sch.setLateMinute(0);
+            sch.setDfAuto(false);
+
+            logger.info("移除误点调整 nbbm -" + nbbm);
+        }
+    }
+
     /**
      * 车辆到站
      * @param gps
@@ -127,10 +140,17 @@ public class LateAdjustHandle implements ApplicationContextAware{
                     /*&& sch.getLateMinute() > 0*/){
                 //自动调整待发 到达时间 + 停靠时间
                 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-                sch.setDfsjAll(dt);
-                sch.setDfAuto(true);
-                //取消应发未到标记
-                sch.setLate2(false);
+
+                //超过2小时最大阈值，放弃
+                if(Math.abs(dt - sch.getDfsjT()) > 1000 * 60 * 60 * 2){
+                    logger.info(sch.getClZbh() + " 超过误点调整阈值，放弃");
+                }
+                else{
+                    sch.setDfsjAll(dt);
+                    sch.setDfAuto(true);
+                    //取消应发未到标记
+                    sch.setLate2(false);
+                }
                 lateSchMap.remove(sch.getClZbh());
                 logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
@@ -48,6 +48,7 @@ public class ScheduleResults_output {
             groupRuleIdGuideBoardMap.get(s.getRuleId()).add(s);
         }
+        stringBuilder.append("\n");
         for (String ruleId : groupRuleIdGuideBoardMap.keySet()) {
             Collections.sort(groupRuleIdGuideBoardMap.get(ruleId), new Comparator<ScheduleResult_output>() {
                 @Override
@@ -4,6 +4,7 @@ import com.bsth.entity.traffic.VehicleInoutStop;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.traffic.VehicleInoutStopService;
 import com.bsth.util.DateUtils;
+import com.bsth.util.db.DBUtils_MS;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -51,17 +52,16 @@ public class VehicleInoutStopServiceImpl extends BaseServiceImpl&lt;VehicleInoutSto
 		String order = " order by report_date asc"+ " LIMIT "+page*size+","+size;
 		int dayNum = DateUtils.calcDaynumberInYear(reportDate_start.substring(0,8)) -1;
 		if(!lineId.equals("")){
-			sql.append(" and l.id = ").append(lineId);
+			sql.append(" and line_id = ").append(lineId);
 		}
 		if(!insideCode.equals("")){
-			sql.append(" and c.inside_code = ").append("'").append(insideCode.toUpperCase()).append("'");
+			sql.append(" and inside_code = ").append("'").append(insideCode.toUpperCase()).append("'");
 		}
 		if(!carPlate.equals("")){
-			sql.append(" and c.car_plate = ").append("'").append("沪").append(carPlate.substring(0,1)).append("-")
-					.append(carPlate.substring(1)).append("'");
+			sql.append(" and car_plate = ").append("'").append(carPlate).append("'");
 		}
 		sql.append(" and FROM_UNIXTIME(REPORT_DATE/1000,'%Y%m%d%H') between '").append(reportDate_start).
-				append("' and '").append(reportDate_end).append("'").append(" and r.day_year = ").append(dayNum);
+				append("' and '").append(reportDate_end).append("'").append(" and day_year = ").append(dayNum);
 		if(flag.equals("count")){
 			return sql.toString();
 		}else{
@@ -75,13 +75,13 @@ public class VehicleInoutStopServiceImpl extends BaseServiceImpl&lt;VehicleInoutSto
 	 * @return
 	 */
 	public List<Map<String, Object>> getVehicleInoutStopByParam(Map<String,Object> map){
-		String sql = "SELECT c.branche_company,c.company,l.name,l.shanghai_linecode,inside_code,equipment_code,car_plate," +
-				"if( r.service_state= 0,'营运','停运') as service_state ," +
-				"if( r.up_down= 0,'上行','下行') as up_down ," +
-				"if( r.in_out_stop= 0,'站内','站外') as in_out_stop , " +
-				"r.stop,r.report_date FROM bsth_c_shreal r LEFT JOIN bsth_c_cars c on r.cars = c.id " +
-				"LEFT JOIN bsth_c_line l on r.line = l.id" + packageParam(map,"") ;
-		List<Map<String, Object>> result = jdbcTemplate.queryForList(sql);
+		JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
+		String sql = "SELECT branche_company,company,name,shanghai_linecode,inside_code,equipment_code,car_plate," +
+				"if( service_state= 0,'营运','停运') as service_state ," +
+				"if( up_down= 0,'上行','下行') as up_down ," +
+				"if( in_out_stop= 0,'站内','站外') as in_out_stop , " +
+				"stop,report_date FROM bsth_c_shreal " + packageParam(map,"") ;
+		List<Map<String, Object>> result = jdbcTemp.queryForList(sql);
 		return result;
 	}
@@ -91,9 +91,9 @@ public class VehicleInoutStopServiceImpl extends BaseServiceImpl&lt;VehicleInoutSto
 	 * @return
 	 */
 	public long getVehicleInoutStopCountByParam(Map<String,Object> map){
-		String sql = "SELECT count(1) COUNT FROM bsth_c_shreal r LEFT JOIN bsth_c_cars c on r.cars = c.id " +
-				"LEFT JOIN bsth_c_line l on r.line = l.id" + packageParam(map,"count");
-		long result = Long.valueOf(jdbcTemplate.queryForMap(sql).get("COUNT")+"");
+		JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
+		String sql = "SELECT count(1) COUNT FROM bsth_c_shreal" + packageParam(map,"count");
+		long result = Long.valueOf(jdbcTemp.queryForMap(sql).get("COUNT")+"");
 		return result;
 	}
 }
+package com.bsth.service.schedule.shiftloop;
+
+import org.joda.time.*;
+import java.util.*;
+
+import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+
+import com.bsth.service.schedule.utils.Md5Util;
+
+import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+
+import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
+
+import com.bsth.service.schedule.rules.ScheduleRuleService;
+
+import org.slf4j.Logger;
+
+global Logger log;
+global ScheduleResults_output scheduleResult;
+global ScheduleRuleService scheduleRuleService;
+
+/*
+    存在（翻班格式）
+*/
+
+//------------------------- 第一阶段、计算规则准备数据（天数） ----------------------------//
+
+declare Calcu_days_result_pre
+    ruleId: String // 规则Id
+    ruleMd5: String // 规则md5
+    ruleEcCount: Integer // 人员范围个数
+
+    calcu_index_lp : Integer // 计算之后路牌的起始索引
+    calcu_index_ry : Integer // 计算之后人员的起始索引
+
+    // 1、第一部分循环需要用到的数据（当开始日期大于启用日期的时候才有）
+    calcu_start_date_1: DateTime // 第一部分开始计算日期
+    calcu_end_date_1: DateTime // 第一部分结束计算日期
+
+    // 2、第二部分循环需要用到的数据
+    sdays : Integer // 总共需要排班的天数
+    calcu_start_date_2 : DateTime // 开始计算日期
+    calcu_end_date_2 : DateTime // 结束计算日期
+
+end
+
+/*
+    计算启用日期，开始计算日期，结束计算日期，相差天数
+    1、规则启用日期小于开始计算日期
+    2、规则启用日期大于等于开始日期，小于等于结束日期
+*/
+// 1、启用日期 < 开始日期
+rule "calcu_days_1_"
+    salience 1000
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate,
+            $xlId: xlId
+        )
+        $sri: ScheduleRule_input(
+            $ruleId : ruleId, $qyrq : qyrq,
+            $lpindex : startGbdIndex, $ryindex: startEIndex)
+        eval($qyrq.isBefore($fromDate))
+    then
+        scheduleResult.setXlid($xlId);
+
+        // 构造Calcu_days_result_pre，用于路牌
+        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
+        cdrp.setRuleId($ruleId);
+        cdrp.setCalcu_index_lp($lpindex);
+        cdrp.setCalcu_index_ry($ryindex);
+        cdrp.setCalcu_start_date_1($qyrq);
+        cdrp.setCalcu_end_date_1($fromDate);
+        Period p2 = new Period($fromDate, $toDate, PeriodType.days());
+        cdrp.setSdays(p2.getDays() + 1);
+        cdrp.setCalcu_start_date_2($fromDate);
+        cdrp.setCalcu_end_date_2($toDate);
+
+        /**
+         * 规则md5值（不使用id判定，使用md5判定）
+         * 使用，启用日期，路牌范围，结合生成md5编码
+         */
+        String ruleMd5 = Md5Util.getMd5(
+            String.valueOf($qyrq.getMillis()) +
+            "_" +
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
+        );
+        cdrp.setRuleMd5(ruleMd5);
+        // 人员范围个数
+        cdrp.setRuleEcCount($sri.getEmployeeConfigIds().size());
+
+        insert(cdrp);
+
+//        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $fromDate, $toDate);
+
+end
+
+// 启用日期 属于 [开始日期，结束日期]
+rule "calcu_days_2_"
+    salience 1000
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate,
+            $xlId: xlId
+        )
+        $sri: ScheduleRule_input(
+            $ruleId : ruleId, $qyrq : qyrq,
+            $lpindex : startGbdIndex, $ryindex: startEIndex)
+        eval((!$qyrq.isBefore($fromDate)) && (!$qyrq.isAfter($toDate)))
+    then
+        scheduleResult.setXlid($xlId);
+
+        // 构造Calcu_days_result_pre，用于路牌
+        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
+        cdrp.setRuleId($ruleId);
+        cdrp.setCalcu_index_lp($lpindex);
+        cdrp.setCalcu_index_ry($ryindex);
+        cdrp.setCalcu_start_date_1($qyrq);
+        cdrp.setCalcu_end_date_1($qyrq);
+        Period p2 = new Period($qyrq, $toDate, PeriodType.days());
+        cdrp.setSdays(p2.getDays() + 1);
+        cdrp.setCalcu_start_date_2($qyrq);
+        cdrp.setCalcu_end_date_2($toDate);
+
+        /**
+         * 规则md5值（不使用id判定，使用md5判定）
+         * 使用，启用日期，路牌范围，结合生成md5编码
+         */
+        String ruleMd5 = Md5Util.getMd5(
+            String.valueOf($qyrq.getMillis()) +
+            "_" +
+            $sri.getSelf().getLpIds() +
+            "_" +
+            $sri.getSelf().getLpStart().toString()
+        );
+        cdrp.setRuleMd5(ruleMd5);
+        // 人员范围个数
+        cdrp.setRuleEcCount($sri.getEmployeeConfigIds().size());
+
+        insert(cdrp);
+
+//        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $qyrq, $toDate);
+
+end
+
+// 使用已经排过班的数据修正Calcu_days_result_pre
+// 1、避免每次从规则的启用日期开始算
+// 2、时刻表会不停的修正，如果每次都从规则启用日期开始算，会出错
+
+declare SchedulePlanRuleResult_wrap
+    ruleId: String // 规则Id
+    ruleMd5: String // 规则md5编码
+    scheduleDate: DateTime // 排班日期
+
+    isUsed: Boolean = false // 是否被使用过
+
+    self: SchedulePlanRuleResult; // 原始对象数据
+end
+
+rule "Calcu_SchedulePlanRuleResult_wrap"
+    salience 950
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate,
+            $xlId: xlId,
+            $self: schedulePlan
+        )
+        eval($self.getIsHistoryPlanFirst() == true) // 是否使用历史排班标识
+        $sprr: SchedulePlanRuleResult() from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
+        eval($sprr.getQyrq() != null)
+
+    then
+        // 创建班序历史结果数据
+        SchedulePlanRuleResult_wrap schedulePlanRuleResult_wrap = new SchedulePlanRuleResult_wrap();
+        schedulePlanRuleResult_wrap.setRuleId($sprr.getRuleId());
+        schedulePlanRuleResult_wrap.setScheduleDate(new DateTime($sprr.getScheduleDate()));
+        schedulePlanRuleResult_wrap.setSelf($sprr);
+
+        // 规则Md5编码
+        String md5 = Md5Util.getMd5(
+            String.valueOf($sprr.getQyrq().getTime()) +
+            "_" +
+            $sprr.getGids() +
+            "_" +
+            $sprr.getOrigingidindex()
+        );
+
+//        System.out.println("修改后的md5：" + md5 + "车辆：" + $sprr.getCcZbh());
+
+        schedulePlanRuleResult_wrap.setRuleMd5(md5);
+
+        insert(schedulePlanRuleResult_wrap);
+end
+
+
+// 1、启用日期 < 开始日期
+// 2、如果最近的排班规则历史时间在 (启用日期，开始日期) 之间，需要重新修正预处理数据
+rule "calcu_days_1_with_result"
+    no-loop
+    salience 960
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_start_date_2),
+            $ruleId: ruleId,
+            $ruleMd5: ruleMd5,
+            $ruleEcCount: ruleEcCount
+        )
+        $srrr_wrap: SchedulePlanRuleResult_wrap(
+//            ruleId == $ruleId,
+            ruleMd5 == $ruleMd5,
+            scheduleDate.isAfter($cdrp.calcu_start_date_1),
+            scheduleDate.isBefore($cdrp.calcu_start_date_2),
+            isUsed == false,
+            $scheduleDate: scheduleDate,
+            $self: self
+        )
+    then
+        // 修正排班数据
+//        log.info("准备修正 ruleId={} historyDate={}", $ruleId, $scheduleDate);
+
+        // 路牌范围起始index使用历史数据
+        $cdrp.setCalcu_index_lp(Integer.valueOf($self.getGidindex()));
+        // 人员范围起始index，需要判定，如果长度都是一样的，使用历史的，否则不更新，使用最新的
+        String history_ecids = $self.getEcids();
+        if ($ruleEcCount == history_ecids.split(",").length) {
+            $cdrp.setCalcu_index_ry(Integer.valueOf($self.getEcindex()));
+        }
+
+        $cdrp.setCalcu_start_date_1($scheduleDate);
+        update($cdrp);
+
+        $srrr_wrap.setIsUsed(true);
+        update($srrr_wrap);
+
+end
+
+
+
+//------------------------- 第二阶段、计算规则准备数据2（第一组循环） ----------------------------//
+rule "Calcu_loop1_1_" // 路牌在时刻表中存在，就翻
+    salience 900
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_end_date_1),
+            $csd1: calcu_start_date_1,
+            $ced1: calcu_end_date_1,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $gids: guideboardIds,
+            $lprangesize : guideboardIds.size(),
+            $ryrangesize: employeeConfigIds.size()
+        )
+        $liro: LpInfoResult_output(
+            dateTime.isEqual($csd1),
+            $gids.get($lpindex) == lpId,
+            $lpId: lpId
+        )
+    then
+        $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
+        $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
+        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
+
+//        log.info("Calcu_loop1_1_ ruleId={}, calcu_index_lp/ry={}/{}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+
+        update($cdrp);
+end
+
+rule "Calcu_loop1_2_" // 路牌在时刻表中不存在，就不翻
+    salience 900
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_end_date_1),
+            $csd1: calcu_start_date_1,
+            $ced1: calcu_end_date_1,
+            $ruleId: ruleId
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $rangesize : guideboardIds.size()
+        )
+    then
+        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
+
+//        log.info("Calcu_loop1_2_ ruleId={}, calcu_index_lp/ry={}/{}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+
+        update($cdrp);
+end
+
+//------------------------- 第三阶段、计算规则准备数据2（第二组循环） ----------------------------//
+rule "Calcu_loop2_1_" // 路牌在时刻表中存在，就翻
+    salience 800
+    when
+        ScheduleCalcuParam_input($sp: schedulePlan, $xlid: xlId)
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isEqual(calcu_end_date_1),
+            calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
+            $csd2: calcu_start_date_2,
+            $ced2: calcu_end_date_2,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $cid: carConfigId,
+            $gids: guideboardIds,
+            $eids: employeeConfigIds,
+            $lprangesize : guideboardIds.size(),
+            $ryrangesize: employeeConfigIds.size(),
+            $srf: self
+        )
+        $liro: LpInfoResult_output(
+            dateTime.isEqual($csd2),
+            $gids.get($lpindex) == lpId,
+            $lpId: lpId,
+            $ttinfoId: ttInfoId,
+            $ttinfoName: ttInfoName
+        )
+    then
+        ScheduleResult_output ro = new ScheduleResult_output();
+        ro.setRuleId($ruleId);
+        ro.setSd($csd2);
+        ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
+        ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
+        ro.setCarConfigId($cid);
+        ro.setXlId($xlid);
+
+        // 类型
+        ro.setsType($sri.getsType());
+
+        scheduleResult.getResults().add(ro);
+
+//        log.info("gogoogogogogo");
+
+        $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
+        $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
+        $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+        if ($sri.getsType() == ScheduleRule_Type.NORMAL) {
+            // 保存排班规则循环结果 --> SchedulePlanRuleResult
+            SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
+//        schedulePlanRuleResult.setXlId(String.valueOf($srf.getXl().getId()));
+            schedulePlanRuleResult.setXlId($srf.getXl().getId());
+            schedulePlanRuleResult.setXlName($srf.getXl().getName());
+            schedulePlanRuleResult.setRuleId($ruleId);
+            schedulePlanRuleResult.setCcId($cid);
+            schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
+            schedulePlanRuleResult.setGids($srf.getLpIds()); // 参与md5计算
+            schedulePlanRuleResult.setGnames($srf.getLpNames());
+            schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
+            schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
+            schedulePlanRuleResult.setEcdbbms($srf.getRyDbbms());
+            schedulePlanRuleResult.setEcindex(String.valueOf($ryindex));
+            schedulePlanRuleResult.setScheduleDate($csd2.toDate());
+            schedulePlanRuleResult.setTtinfoId($ttinfoId);
+            schedulePlanRuleResult.setTtinfoName($ttinfoName);
+            schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate()); // 参与md5计算
+            schedulePlanRuleResult.setOrigingidindex(String.valueOf($sri.getSelf().getLpStart())); // 参与md5计算
+
+            scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
+        }
+
+
+
+//        log.info("Calcu_loop2_1_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
+        update($cdrp);
+end
+
+rule "Calcu_loop2_2_" // 路牌在时刻表中不存在，就不翻
+    salience 800
+    when
+        ScheduleCalcuParam_input($sp: schedulePlan, $xlid: xlId)
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isEqual(calcu_end_date_1),
+            calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
+            $csd2: calcu_start_date_2,
+            $ced2: calcu_end_date_2,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $cid: carConfigId,
+            $gids: guideboardIds,
+            $eids: employeeConfigIds,
+            $srf: self
+        )
+    then
+        ScheduleResult_output ro = new ScheduleResult_output();
+        ro.setRuleId($ruleId);
+        ro.setSd($csd2);
+        ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
+        ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
+        ro.setCarConfigId($cid);
+        ro.setXlId($xlid);
+
+        // 类型
+        ro.setsType($sri.getsType());
+
+        scheduleResult.getResults().add(ro);
+
+        $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+//        // 保存排班规则循环结果 --> SchedulePlanRuleResult
+//        SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
+//        schedulePlanRuleResult.setXlId(String.valueOf($srf.getXl().getId()));
+//        schedulePlanRuleResult.setXlName($srf.getXl().getName());
+//        schedulePlanRuleResult.setRuleId($ruleId);
+//        schedulePlanRuleResult.setCcId($cid);
+//        schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
+//        schedulePlanRuleResult.setGids($srf.getLpIds());
+//        schedulePlanRuleResult.setGnames($srf.getLpNames());
+//        schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
+//        schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
+//        schedulePlanRuleResult.setEcdbbms($srf.getRyDbbms());
+//        schedulePlanRuleResult.setEcindex(String.valueOf($ryindex));
+//        schedulePlanRuleResult.setScheduleDate($csd2.toDate());
+//
+//        scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
+
+//        log.info("Calcu_loop2_2_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
+        update($cdrp);
+end
+
+
+
+
+
+
@@ -254,6 +254,10 @@ rule &quot;calcu_days_1_with_result&quot;
             $cdrp.setCalcu_index_ry(Integer.valueOf($self.getEcindex()));
         }
+        // 翻班格式利用路牌的历史index更新
+        int fb_temp = Integer.valueOf($self.getGidindex()) % $cdrp.getFbweeks().size();
+        $cdrp.setFbgs_index(fb_temp);
+
         $cdrp.setCalcu_start_date_1($scheduleDate);
         update($cdrp);
@@ -266,7 +270,7 @@ end
 //------------------------- 第二阶段、计算规则准备数据2（第一组循环） ----------------------------//
-function void calcu_loop1_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sri) {
+function void calcu_loop1_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sri, Logger log) {
     Integer $lpindex = $cdrp.getCalcu_index_lp();
     Integer $lprangesize = $sri.getGuideboardIds().size();
     Integer $ryindex = $cdrp.getCalcu_index_ry();
@@ -274,6 +278,8 @@ function void calcu_loop1_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sr
     Integer $fbindex = $cdrp.getFbgs_index();
     Integer $fbfangesize = $sri.getWeekdays().size();
     DateTime $csd1 = $cdrp.getCalcu_start_date_1();
+    DateTime $ced1 = $cdrp.getCalcu_end_date_1();
+
     String $ruleId = $cdrp.getRuleId();
     $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
@@ -282,19 +288,21 @@ function void calcu_loop1_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sr
     $cdrp.setFbgs_index(($fbindex + 1) % $fbfangesize);
     $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
-//    log.info("calcu_loop1_fb ruleId={}, calcu_index_lp/ry={}/{}",
-//        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+//    log.info("calcu_loop1_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd1, $ced1);
+
 }
-function void calcu_loop1_not_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sri) {
+function void calcu_loop1_not_fb(Calcu_days_result_pre $cdrp, ScheduleRule_input $sri, Logger log) {
     DateTime $csd1 = $cdrp.getCalcu_start_date_1();
+    DateTime $ced1 = $cdrp.getCalcu_end_date_1();
     Integer $fbindex = $cdrp.getFbgs_index();
     Integer $fbfangesize = $sri.getWeekdays().size();
     $cdrp.setFbgs_index(($fbindex + 1) % $fbfangesize);
     $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
-//    log.info("calcu_loop1_not_fb ruleId={}, calcu_index_lp/ry={}/{}",
-//        $cdrp.getRuleId(), $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+//    log.info("calcu_loop1_not_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//        $cdrp.getRuleId(), $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd1, $ced1);
 }
@@ -312,7 +320,7 @@ rule &quot;Calcu_loop1_fbtype_with_0_&quot; // 翻班模式为 type=1 使用翻班格式
             weekdays[$fbindex] == false
         )
     then
-        calcu_loop1_not_fb($cdrp, $sri);
+        calcu_loop1_not_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -337,7 +345,7 @@ rule &quot;Calcu_loop1_fbtype_with_1_lp_&quot; // 翻班模式为 type=1 使用翻班格
             $gids[$lpindex] == lpId
         )
     then
-        calcu_loop1_fb($cdrp, $sri);
+        calcu_loop1_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -357,7 +365,7 @@ rule &quot;Calcu_loop1_fbtype_with_1_no_lp_&quot; // 翻班模式为 type=1 使用翻班
             weekdays[$fbindex] == true
         )
     then
-        calcu_loop1_not_fb($cdrp, $sri);
+        calcu_loop1_not_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -381,7 +389,7 @@ rule &quot;Calcu_loop1_timetabletype_with_lp_&quot; // 翻班模式为 type=0 使用时刻
             $gids[$lpindex] == lpId
         )
     then
-        calcu_loop1_fb($cdrp, $sri);
+        calcu_loop1_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -398,7 +406,7 @@ rule &quot;Calcu_loop1_timetabletype_with_no_lp_&quot; // 翻班模式为 type=0 使用时
             ruleId == $ruleId
         )
     then
-        calcu_loop1_not_fb($cdrp, $sri);
+        calcu_loop1_not_fb($cdrp, $sri, log);
         update($cdrp);
 end
@@ -477,18 +485,20 @@ function void calcu_loop2_fb(
-    log.info("calcu_loop2_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
-        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+//    log.info("calcu_loop2_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
 }
 function void calcu_loop2_not_fb(
         Calcu_days_result_pre $cdrp,
         ScheduleRule_input $sri,
-        ScheduleResults_output rs) {
+        ScheduleResults_output rs,
+        Logger log) {
     String $ruleId = $cdrp.getRuleId();
     DateTime $csd2 = $cdrp.getCalcu_start_date_2();
+    DateTime $ced2 = $cdrp.getCalcu_end_date_2();
     Integer $lpindex = $cdrp.getCalcu_index_lp();
     List $gids = $sri.getGuideboardIds();
     Integer $ryindex = $cdrp.getCalcu_index_ry();
@@ -514,6 +524,10 @@ function void calcu_loop2_not_fb(
     $cdrp.setFbgs_index(($fbindex + 1) % $fbfangesize);
     $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+//    log.info("calcu_loop2_not_fb ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+//        $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
 }
 rule "Calcu_loop2_fbtype_with_0_" // 翻班模式为 type=1 使用翻班格式翻，当天翻班格式是false，就跳过
@@ -532,7 +546,7 @@ rule &quot;Calcu_loop2_fbtype_with_0_&quot; // 翻班模式为 type=1 使用翻班格式
             weekdays[$fbindex] == false
         )
     then
-        calcu_loop2_not_fb($cdrp, $sri, scheduleResult);
+        calcu_loop2_not_fb($cdrp, $sri, scheduleResult, log);
         update($cdrp);
 end
@@ -580,7 +594,7 @@ rule &quot;Calcu_loop2_fbtype_with_1_no_lp_&quot; // 翻班模式为 type=1 使用翻班
             weekdays[$fbindex] == true
         )
     then
-        calcu_loop2_not_fb($cdrp, $sri, scheduleResult);
+        calcu_loop2_not_fb($cdrp, $sri, scheduleResult, log);
         update($cdrp);
 end
@@ -626,7 +640,7 @@ rule &quot;Calcu_loop2_timetabletype_with_no_lp_&quot; // 翻班模式为 type=0 使用时
             ruleId == $ruleId
         )
     then
-        calcu_loop2_not_fb($cdrp, $sri, scheduleResult);
+        calcu_loop2_not_fb($cdrp, $sri, scheduleResult, log);
         update($cdrp);
 end
@@ -5,7 +5,7 @@
 	<div class="page-title">
 		<h1>线路信息</h1>
 	</div>
-
+</div>
 <!-- 片段标题 END -->
 <!-- 线路信息导航栏组件 START -->
@@ -154,7 +154,6 @@
 		</div>
 	</div>
 </div>
-</div>
 <!-- 
 			<td style="vertical-align: middle;">
@@ -136,7 +136,6 @@ $(&#39;#delete_section_mobal&#39;).on(&#39;deleteSectionMobal.show&#39;,function(e, ajaxd, line,
 			//ids.push($(this).val()); 
 		});
 		if (ids != "" && ids != null && ids != undefined) {
-			console.log("ids:" + ids);
 			ids = ids.substr(1, ids.length - 1);
 			var params = {};
 			params.ids = ids;
@@ -224,6 +223,8 @@ $(&#39;#delete_section_mobal&#39;).on(&#39;deleteSectionMobal.show&#39;,function(e, ajaxd, line,
 	 * 
 	 */
 	function loadTableDate(param, isPon) {
+		// 初始化全选按钮
+		document.getElementById('scetionCheckItems').checked = null;
 		// 搜索参数
 		var params = {};
 		if (param)
@@ -225,6 +225,8 @@ $(&#39;#delete_station_mobal&#39;).on(&#39;deleteStationMobal.show&#39;,function(e, ajaxd, line,
 	 * 
 	 */
 	function loadTableDate(param, isPon) {
+		// 初始化全选按钮
+		document.getElementById('stationCheckItems').checked = null;
 		// 搜索参数
 		var params = {};
 		if (param)
@@ -277,6 +277,7 @@ var PublicFunctions = function () {
 			/** @param directionV_ ：方向 */
 			stationRevoke : function(directionV_) {
+				debugger
 				// 获取树选中节点对象
 				var obj = PublicFunctions.getCurrSelNode(directionV_);
 				// 是否选中，选中节点是否为站点
@@ -298,9 +299,9 @@ var PublicFunctions = function () {
 						 // 关闭弹出框
 						 layer.close(index);
 						 if(result.status=='SUCCESS'){
-							 layer.msg('撤销上行站点【'+obj[0].text+'】成功！');	
+							 layer.msg('撤销'+(directionV_==0?"上行":"下行")+'站点【'+obj[0].text+'】成功！');	
 						 }else{
-							 layer.msg('撤销上行站点【'+obj[0].text+'】失败！');
+							 layer.msg('撤销'+(directionV_==0?"上行":"下行")+'站点【'+obj[0].text+'】失败！');
 						 }
 						 WorldsBMap.clearMarkAndOverlays();
 						 var Line = LineObj.getLineObj();
@@ -58,16 +58,12 @@ $(function(){
 			/** 初始化下行树 @param：<Line.id：线路Id；1:下行> */
 			PublicFunctions.TreeUpOrDown(Line.id,'1');
-			var start =new Date();
-			console.log(start);
 			/** 查询路段信息 @param:<Line.id：线路Id；dir：方向> @return：data：路段数据 */
 			GetAjaxData.getSectionRouteInfo(Line.id,dir,function(data) {
 				/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */ 
 				PublicFunctions.linePanlThree(Line.id,data,dir);
 			});
-			var finish =new Date();
-			console.log(finish);
 		},500);
 	}else {
-//所有模块service配置
+//所有模块service配置
 // 车辆信息service
 angular.module('ScheduleApp').factory(
     'BusInfoManageService_g',
@@ -79,7 +79,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
+);
 // 车辆设备信息service
 angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
     return $resource(
@@ -119,7 +119,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;DeviceInfoManageService_g&#39;, [&#39;$resource&#39;,
             }
         }
     );
-}]);
+}]);
 // 人员信息service
 angular.module('ScheduleApp').factory(
     'EmployeeInfoManageService_g',
@@ -183,7 +183,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
 );
-
+
 // 车辆配置service
 angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserPrincipal', function($resource, UserPrincipal) {
     return {
@@ -238,7 +238,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
             }
         )
     };
-}]);
+}]);
 // 线路运营统计service
 angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {
     return $resource(
@@ -254,7 +254,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusLineInfoStatService_g&#39;, [&#39;$resource&#39;, 
         }
     );
 }]);
-
+
 // 人员配置service
 angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) {
     return {
@@ -338,7 +338,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
             }
         )
     };
-}]);
+}]);
 // 路牌管理service
 angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) {
     return {
@@ -411,7 +411,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
             }
         )
     };
-}]);
+}]);
 // 套跑管理service
 angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', function($resource) {
     return {
@@ -453,7 +453,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;rerunManageService_g&#39;, [&#39;$resource&#39;, func
             }
         )
     };
-}]);
+}]);
 // 排班计划管理service
 angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) {
     return {
@@ -612,13 +612,13 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     };
-}]);
+}]);
 // 排班管理service
 angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource', function($resource) {
     return {
         rest: $resource(
             '/sr1fc/:id',
-            {order: 'xl.id,updateDate,carConfigInfo.cl.insideCode', direction: 'ASC,DESC,ASC', id: '@id'},
+            {order: 'xl.id,fbtype,updateDate,carConfigInfo.cl.insideCode', direction: 'ASC,DESC,DESC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -671,7 +671,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService_g&#39;, [&#39;$resource
         )
     };
 }]);
-
+
 // 时刻表管理service
 angular.module('ScheduleApp').factory(
     'TTInfoManageService_g',
@@ -838,7 +838,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
+);
 // 项目通用的全局service服务，供不同的controller使用，自定义指令不使用
 // 文件下载服务
@@ -56,7 +56,8 @@
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
+            <tr ng-repeat="info in ctrl.page()['content']"
+                ng-class="{odd: true, gradeX: true, info: ctrl.isFBGSMODE(info.fbtype), 'row-active': ctrl.isFBGSMODE(info.fbtype)}">
                 <td>
                     <div>
                         <a href="#">
@@ -107,7 +108,7 @@
                 <td>
                     <a href="#"
                        tooltip-animation="false"
-                       tooltip-placement="top"
+                       tooltip-placement="left-top"
                        uib-tooltip="{{info.ryDbbms}}"
                        tooltip-class="headClass">
                         {{info.ryDbbms}}
@@ -116,7 +117,7 @@
                 <td>
                     <a href="#"
                        tooltip-animation="false"
-                       tooltip-placement="top"
+                       tooltip-placement="left-top"
                        uib-tooltip="{{info.fbgs}}"
                        tooltip-class="headClass">
                         {{info.fbgs}}
@@ -245,6 +245,11 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.doPage();
+            // 是否是翻班格式模式
+            self.isFBGSMODE = function(type) {
+                return type == "FBGSMODE";
+            }
+
         }
     ]
 );
@@ -263,8 +263,8 @@
     }
     //日期选择器
-    $('[name=rq_eq]', f).val('2017-09-24');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-09-24', minDate: '2017-07-01'});
+    $('[name=rq_eq]', f).val('2017-10-10');
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-10', minDate: '2017-07-01'});
     var comps;
     //构建公司级联下拉框
@@ -99,6 +99,9 @@
             alert("请选择时间");
             return ;
         }
+        if(pagination){
+            page = 0;
+        }
         var params = {};
         // 排序（按方向与序号）
         params['order'] = 'reportDate';
+/** 为残疾人提供的一份样式  , .ct_table.line-schedule-table dl dt*/
+
+.ct_table.line-schedule-table dl dd{
+    border-right-color: #000000 !important;
+    border-top: 1px solid #000000 !important;
+    color: #000000;
+}
+
+.schedule-body .ct_table.line-schedule-table dl:nth-child(even){
+    background: rgba(114, 197, 210, 0.33) !important;
+}
+
+.tl-yzx{
+    background: rgb(151, 151, 223) !important;
+}
+
+.tl-zzzx {
+    background: rgb(152, 217, 54) !important;
+}
+
+.tl-xxfc {
+    background: rgb(15, 220, 220) !important;
+}
+
+.ct_table>.ct_table_body{
+    border-bottom: 1px solid #000000 !important;
+}
@@ -1411,10 +1411,11 @@ ul.left_tabs_lg li{
     border-bottom: none;
 }
-.add_range_wrap>.err_panel{
-    font-size: 16px;
-    color: #a44a4a;
+.err_panel{
+    font-size: 12px;
+    color: #7e7d7d;
     font-family: 微软雅黑;
+    margin-top: 5px;
 }
 #schedule-lp_change-modal .ct_table dl{
@@ -1458,6 +1459,16 @@ ul.left_tabs_lg li{
     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;
@@ -1699,4 +1710,13 @@ dl.active&gt;dd.disabled{
 .display_hide{
     display: none;
+}
+
+.ct_eye_icon{
+    font-size: 16px;
+    cursor: pointer;
+}
+
+.ct_eye_icon.active{
+    color: #444;
 }
 \ No newline at end of file
@@ -197,15 +197,19 @@
                         return;
                     }
-                    if(!data.adjustExps && (data.status==-1
-                        || (data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out'))){
+                    //正常班次里程修改为0
+                    var normalDestory = data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out';
+                    //修改里程
+                    var editJhlc = data.jhlc != sch.jhlc && data.jhlc != 0;
+                    if(!data.adjustExps && (data.status==-1 || normalDestory || editJhlc)){
                         notify_err("当前操作需要选择调整原因！");
                         return;
                     }
                     //里程有修改
-                    if(data.jhlc != sch.jhlc && data.jhlc != 0){
-                        var confHtml = '<h4 style="color: #c04c4c;margin-bottom: 9px;">确认要将班次里程由'+sch.jhlc+' 修改为'+data.jhlc+' </h4><small>备注：</small>';
+                    //if(data.jhlc != sch.jhlc && data.jhlc != 0){
+
+                        /*var confHtml = '<h4 style="color: #c04c4c;margin-bottom: 9px;">确认要将班次里程由'+sch.jhlc+' 修改为'+data.jhlc+' </h4><small>备注：</small>';
                         UIkit.modal.prompt(confHtml, data.remarks, function(remarks){
                             if(remarks){
                                 //在这里写操作日志
@@ -221,10 +225,10 @@
                                 Ok: '确定修改公里并保存',
                                 Cancel: '取消'
                             }
-                        });
-                    }
-                    else
-                        postData(data);
+                        });*/
+                    //}
+                    //else
+                    postData(data);
                 });
                 var postData = function (data) {
@@ -3,7 +3,7 @@
     <span class="plus_icon_span">
         <i class="uk-icon-plus"></i>
     </span>
-    <form class="uk-form remarks_form">
+<!--    <form class="uk-form remarks_form">
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
@@ -14,7 +14,7 @@
                 </div>
             </div>
         </div>
-    </form>
+    </form>-->
     <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
         <button type="button" class="uk-button uk-modal-close">取消</button>
         <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
@@ -76,7 +76,7 @@
                 e.preventDefault();
                 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
-                        , {remarks: $('#form-s-t',wrap).val(), 'schedule.id': sch.id}));
+                        , {/*remarks: $('#form-s-t',wrap).val(), */'schedule.id': sch.id}));
                 $(this).data('valid', true);
                 if(allValidSuccess()){
@@ -93,21 +93,21 @@
                         }
                         var data = dataArray[i];
                         //营运里程为0的不保存
-                        if(data.mileageType == 'service' && data.mileage==0){
+                        /*if(data.mileageType == 'service' && data.mileage==0){
                             i++;
                             f();
                         }
-                        else{
+                        else{*/
                             //营运子任务不写备注
-                            if(data.mileageType == 'service' && !data.destroy)
-                                data.remarks = '';
+                            /*if(data.mileageType == 'service' && !data.destroy)
+                                data.remarks = '';*/
                             gb_common.$post('/childTask', data, function (rs) {
                                 notify_succ('子任务添加成功');
                                 rst = rs.t;
                                 i++;
                                 f();
                             });
-                        }
+                        //}
                     })();
                 }
             });
 <div class="add_inOut_wrap">
     <div class="forms"></div>
-    <form class="uk-form remarks_form">
+<!--    <form class="uk-form remarks_form">
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
@@ -11,7 +11,7 @@
                 </div>
             </div>
         </div>
-    </form>
+    </form>-->
     <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
         <button type="button" class="uk-button uk-modal-close">取消</button>
         <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
@@ -276,7 +276,7 @@
                 e.preventDefault();
                 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
-                        , {remarks: $('#form-s-t',wrap).val(), 'schedule.id': sch.id}));
+                        , {/*remarks: $('#form-s-t',wrap).val(), */'schedule.id': sch.id}));
                 $(this).data('valid', true);
                 if(allValidSuccess()){
@@ -299,8 +299,8 @@
                         }
                         else{
                             //营运子任务不写备注
-                            if(data.mileageType == 'service' && !data.destroy)
-                                data.remarks = '';
+                            /*if(data.mileageType == 'service' && !data.destroy)
+                                data.remarks = '';*/
                             gb_common.$post('/childTask', data, function (rs) {
                                 notify_succ('子任务添加成功');
                                 rst = rs.t;
+<!-- 区间变全程 -->
+<div class="add_range_2_normal">
+    <div class="err_panel">暂不开放使用</div>
+    <!--<div class="forms"></div>
+
+    <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
+        <button type="button" class="uk-button uk-modal-close">取消</button>
+        <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+    </div>
+    <script>
+        (function () {
+            var wrap = '#add-sub-task-main-modal .add_range_2_normal',
+                    sch,f1,tf1;
+
+            $(wrap).on('init', function (e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+
+                f1 = addTaskForm();
+                tf1 = addTaskForm();
+                tf1.addClass('temp_service');
+            });
+
+            function addTaskForm() {
+                var htmlStr = template('sub-task-v2-form-temp', {sch: sch});
+                var f = $(htmlStr);
+                $('.forms', wrap).append(f);
+                //字典转换
+                dictionaryUtils.transformDom($('.nt-dictionary', f));
+
+                //班次类型切换
+                $('select[name=type2]', f).trigger('change');
+
+                //滚动条到底
+                $('.forms', wrap).scrollTop($('.forms', wrap)[0].scrollHeight);
+
+                f.formValidation({
+                    framework: 'uikit',
+                    locale: 'zh_CN'
+                }).on('add_reason_field', function () {
+                    $(this).formValidation('addField', 'reason');
+                });
+                return f;
+            }
+        })();
+    </script>-->
+</div>
 \ No newline at end of file
@@ -30,7 +30,7 @@
     </div>
     <div class="forms"></div>
-    <form class="uk-form remarks_form">
+<!--    <form class="uk-form remarks_form">
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
@@ -41,7 +41,7 @@
                 </div>
             </div>
         </div>
-    </form>
+    </form>-->
     <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
         <button type="button" class="uk-button uk-modal-close">取消</button>
         <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
@@ -55,9 +55,9 @@
             $(wrap).on('init', function (e, data) {
                 e.stopPropagation();
                 sch = data.sch;
-                nextSch = gb_schedule_table.getNextNormalSch(sch);
-                if(!nextSch || nextSch.bcType!='normal'){
-                    $(wrap).html('<div class="err_panel">无法做区间调头，原因是没有找到返程班次！</div>');
+                nextSch = gb_schedule_table.getNextSch(sch);
+                if(!nextSch || nextSch.bcType=='in' || nextSch.bcType=='out'){
+                    $(wrap).html('<div class="err_panel">当前班次类型不支持直接应用区间调头模板！</div>');
                     return;
                 }
@@ -67,7 +67,7 @@
                 }), 'directions');
                 //第一段营运
                 f1 = addTaskForm();
-                $f('startStation', f1).trigger('change');
+                $f('startStation', f1).val(sch.qdzCode).trigger('change');
                 disabled_form(f1);
                 $('.domains', f1).empty();
@@ -247,7 +247,7 @@
                 e.preventDefault();
                 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
-                        , {remarks: $('#form-s-t',wrap).val()}));
+                        /*, {remarks: $('#form-s-t',wrap).val()}*/));
                 $(this).data('valid', true);
                 if (allValidSuccess()) {
@@ -267,8 +267,8 @@
                         }
                         var data = dataArray[i];
                         //营运子任务不写备注
-                        if(data.mileageType == 'service' && !data.destroy)
-                            data.remarks = '';
+                        /*if(data.mileageType == 'service' && !data.destroy)
+                            data.remarks = '';*/
                         gb_common.$post('/childTask', data, function (rs) {
                             notify_succ('子任务添加成功');
                             gb_schedule_table.updateSchedule(rs.t);
@@ -10,7 +10,7 @@
                     <li name="normal"><a>1、子任务</a></li>
                     <li name="in_out"><a>2、进出场</a></li>
                     <li name="range_turn"><a>3、区间调头</a></li>
-                    <!--<li name="range_to_normal"><a>4、区间变全程</a></li>-->
+                    <li name="range_to_normal"><a>4、区间变全程</a></li>
                 </ul>
             </div>
             <div class="uk-width-8-10">
@@ -18,7 +18,7 @@
                     <li class="tab_cont normalCont"></li>
                     <li class="tab_cont inOutCont"></li>
                     <li class="tab_cont rangeTurnCont"></li>
-                    <!--<li class="tab_cont rangeToNormal"></li>-->
+                    <li class="tab_cont rangeToNormal"></li>
                 </ul>
             </div>
         </div>
@@ -95,10 +95,12 @@
                 </div>
                 <div class="uk-width-1-3">
                     <div class="uk-form-row">
-                        <label class="uk-form-label">公里数</label>
+                        <label class="uk-form-label">公里</label>
                         <div class="uk-form-controls">
                             <input class="form-control" name="mileage" max=222 data-fv-lessthan-inclusive="false"
-                                   required>
+                                   required style="width: 42%;">
+                            <select class="form-control nt-dictionary" required name="mileageType"
+                                    data-group="MileageType" style="width: 52%;"></select>
                         </div>
                     </div>
                 </div>
@@ -108,10 +110,10 @@
                 <div class="uk-width-2-3 domains"></div>
                 <div class="uk-width-1-3">
                     <div class="uk-form-row">
-                        <label class="uk-form-label">里程类型</label>
+                        <label class="uk-form-label">备注</label>
                         <div class="uk-form-controls">
-                            <select class="form-control nt-dictionary" required name="mileageType"
-                                    data-group="MileageType"></select>
+                            <!--<select class="form-control nt-dictionary" required name="remarks"></select>-->
+                            <input class="form-control" name="remarks" data-fv-stringlength-max="50" data-fv-stringlength="true">
                         </div>
                     </div>
                 </div>
@@ -245,6 +247,8 @@
                     $('.rangeTurnCont', modal).html(st_doms.range_dom);
                     $('.add_range_wrap', modal).trigger('init', data);
                     //区间变全程
+                    $('.rangeToNormal', modal).html(st_doms.range_2_normal_dom);
+                    //$('.add_range_2_normal', modal).trigger('init', data);
                 }
             });
@@ -505,7 +509,7 @@
                 }
                 else {
                     var cont = f.parents('li.tab_cont'),
-                            remInput = $('.remarks_form [name=remarks]', cont);
+                            remInput = $('[name=remarks]', cont);
                     if(remInput.val()==reason + ',')
                         return;
@@ -23,6 +23,7 @@
                         </a>
                     </div>
                 </div>
+                <i class="uk-icon-eye uk-icon-hover ct_eye_icon"></i>
                 <div class="search_sch_panel">
                     <form class="uk-form" onsubmit="javascript:return false;">
                         <div class="uk-autocomplete sch-search-autocom">
@@ -19,6 +19,9 @@ var gb_schedule_context_menu = (function () {
     $.get(folder + '/sub_task_v2/add_range_turn.html', function (dom) {
         st_doms.range_dom=dom;
     });
+    $.get(folder + '/sub_task_v2/add_range_normal.html', function (dom) {
+        st_doms.range_2_normal_dom=dom;
+    });
     //提前缓存临加的片段页面
     var add_sch_doms={};
     $.get(folder + '/temp_sch/add_normal.html', function (dom) {
@@ -8,7 +8,7 @@ var gb_sch_legend = (function () {
     var animationend = 'webkitAnimationEnd animationend';
     var initLegend = function (cont) {
         //双击展开
-        $('.schedule-wrap i.uk-icon-question-circle', cont).dblclick(openLegend);
+        /*$('.schedule-wrap i.uk-icon-question-circle', cont).dblclick(openLegend);
         //关闭事件
         $('.schedule-wrap .fixed_legend_close', cont).on('click', function () {
@@ -35,13 +35,34 @@ var gb_sch_legend = (function () {
         var flag=storage.getItem(locaKey);
         if(flag && flag==1)
-            openLegend();
+            openLegend();*/
+
+        //eye init
+        var eyeState = storage.getItem('eye_state');
+        if(eyeState && eyeState==1)
+            $(eye_dom).eq(0).trigger('click');
     };
+    var eye_dom = '.schedule-wrap i.ct_eye_icon';
+    $(document).on('click', eye_dom, changeHandicappedStyle);
+    function changeHandicappedStyle() {
+        if($(this).hasClass('active')){
+            $(eye_dom).removeClass('active');
+            $('#handicappedStyleLink', 'head').remove();
+            storage.setItem('eye_state', 0);
+        }
+        else{
+            $(eye_dom).addClass('active');
+            $("<link>").attr({rel: "stylesheet", type: "text/css", href: "/real_control_v2/css/handicapped_style.css",
+                    id: 'handicappedStyleLink'
+                }).appendTo("head");
+            storage.setItem('eye_state', 1);
+        }
+    }
     //展开图例
     var openLegend = function () {
-        $('.qtip.sch-tl-tip').qtip('destroy', true);
+        /*$('.qtip.sch-tl-tip').qtip('destroy', true);
         //隐藏ICON
         $('.schedule-wrap i.uk-icon-question-circle').hide();
@@ -58,7 +79,7 @@ var gb_sch_legend = (function () {
         $('.schedule-wrap .fixed_legend').css('display', 'inline-block');
         //记录状态
-        storage.setItem(locaKey, 1);
+        storage.setItem(locaKey, 1);*/
     };
     return {
@@ -105,8 +105,10 @@ var gb_schedule_table = (function () {
                 //标记路牌最后一个班次
                 markerLastByLine(lineCode);
                 //初始化图例相关，dbclick 不能代理事件
-                gb_sch_legend.init(this);
+                //gb_sch_legend.init(this);
             });
+            //初始化图例
+            gb_sch_legend.init();
             var content = $('.line_schedule .ct_table_wrap');
             //初始化滚动条
             content.perfectScrollbar({suppressScrollX: true});
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            showUpdateDescription();
+            //showUpdateDescription();
         });
         function g_emit(id) {
@@ -49,7 +49,7 @@ var gb_ct_table = (function() {
         $tbody.empty().append(dls);
         //console.log('replaceAfter..', replaceAfter);
         replaceAfter && replaceAfter($tbody);
-    }
+    };
     function toggleOrder(that) {
         var order = $(that).data('order');