Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents 3076d693 0d33b44d
Showing 31 changed files with 304 additions and 202 deletions
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_line_state/LineStateHandle.java
src/main/java/com/bsth/data/schedule/auto_exec/RealScheduleAutoExecHandler.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/entity/LineVersions.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/service/LineVersionsService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.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/impl/LineVersionsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/base/line/editRoute.html
src/main/resources/static/pages/base/line/map.html
src/main/resources/static/pages/base/line/submit_select.html
src/main/resources/static/pages/base/lineversions/add.html
src/main/resources/static/pages/base/lineversions/js/lineversions-add-from.js
 package com.bsth.controller;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -11,7 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
 import com.bsth.service.LineService;
+import com.bsth.service.LineVersionsService;
 import com.bsth.util.GetUIDAndCode;
 /**
@@ -36,6 +41,9 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	@Autowired
 	private LineService service;
+	@Autowired
+	private LineVersionsService lineVersionsService;
+	
 	/**
 	 * 获取线路编码与ID
 	 * 
@@ -74,13 +82,31 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 			map.put("status", ResponseCode.ERROR); 
 			return map;
 		}
-		return service.save(t);
+		// 添加线路版本
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			Date endDate = simpleDateFormat.parse("2088-08-08 00:00:00");
+			LineVersions lineVersions = new LineVersions();
+			lineVersions.setName("原始版本");
+			lineVersions.setLine(t);
+			lineVersions.setLineCode(t.getLineCode());
+			lineVersions.setStartDate(t.getCreateDate());
+			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));// 2088-8-8 00:00:00
+			lineVersions.setVersions(1);
+			lineVersions.setStatus(1);
+			// 先添加线路再添加版本
+			service.save(t);
+			return lineVersionsService.save(lineVersions);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			map.put("status", ResponseCode.ERROR); 
+			return map;
+		}
 	} 
 	/**
-	 * 
 	 * 更改
-	 * 
 	 */
 	@RequestMapping(value="/update", method = RequestMethod.POST)
 	public Map<String, Object> update(Line l){
@@ -12,16 +12,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.bsth.data.LineVersionsData;
 import com.bsth.entity.Line;
 import com.bsth.entity.LineVersions;
-import com.bsth.entity.LsStationRoute;
-import com.bsth.entity.StationRoute;
 import com.bsth.repository.LineRepository;
-import com.bsth.repository.LsStationRouteRepository;
 import com.bsth.service.LineVersionsService;
 /**
@@ -46,8 +39,15 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 	@Autowired
 	LineRepository lineRepository;
-	  @Autowired
-	    LsStationRouteRepository  lsStationRouteRepository ;
+	
+	/**
+	 * 获取线路所有版本
+	 */
+	@RequestMapping(value = "findLineVersionsMax", method = RequestMethod.GET)
+	public LineVersions findLineVersionsMax(@RequestParam(defaultValue = "lineId") int lineId) {
+		return service.findLineVersionsMax(lineId);
+	}
+	
 	/**
 	 * 获取线路所有版本
 	 * 
@@ -63,7 +63,6 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 	 */
 	@RequestMapping(value = "findById", method = RequestMethod.GET)
 	public LineVersions findOne(@RequestParam(defaultValue = "id") int id) {
-		service.lineUpdate();
 		return service.findById(id);
 	}
@@ -85,6 +84,7 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 			Date startDate = simpleDateFormat.parse(map.get("startDate").toString());
 			Date endDate = simpleDateFormat.parse(map.get("endDate").toString());
 			Line line = lineRepository.findOne(Integer.valueOf(map.get("lineId").toString())); 
+			lineVersions.setName(map.get("name").toString());
 			lineVersions.setLine(line);
 			lineVersions.setLineCode(map.get("lineCode").toString());
 			lineVersions.setStartDate(new java.sql.Date(startDate.getTime()));
@@ -92,6 +92,8 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 			lineVersions.setVersions(Integer.valueOf(map.get("versions").toString()));
 			lineVersions.setStatus(Integer.valueOf(map.get("status").toString()));
 			lineVersions.setRemark(map.get("remark").toString());
+			
+			
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -165,11 +165,11 @@ public class DirectiveController {
 	 * @throws
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Map<String, Object> findDirective(String nbbm,@RequestParam int dType
+	public Map<String, Object> findDirective(String nbbms,@RequestParam int dType
 							, @RequestParam(defaultValue = "0") int page,
 							@RequestParam(defaultValue = "10") int size){
-		return directiveService.findDirective(nbbm, dType, page, size);
+		return directiveService.findDirective(nbbms, dType, page, size);
 	}
 	@RequestMapping(value = "/c0a4", method = RequestMethod.POST)
@@ -31,7 +31,7 @@ public class LineStateHandle {
     /** 重发次数 */
     private final static int MAX_SEND_COUNT=3;
     /** 重发间隔 */
-    private final static int SEND_SPACE=1000 * 60 * 4;
+    private final static int SEND_SPACE=1000 * 60 * 6;
     /** 最大有效时间 */
     private final static int MAX_AVAIL_TIME=1000 * 60 * 60 * 2;
 package com.bsth.data.schedule.auto_exec;
+import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.websocket.handler.SendUtils;
@@ -21,6 +22,8 @@ public class RealScheduleAutoExecHandler {
     @Autowired
     DayOfSchedule dayOfSchedule;
+    @Autowired
+    GpsStatusManager gpsStatusManager;
     public void exec(ScheduleRealInfo sch) {
         boolean flag = false;
@@ -33,13 +36,24 @@ public class RealScheduleAutoExecHandler {
         if (sch.getZdsjT() < t) {
             sch.setZdsjActualAll(sch.getZdsjT());
-            ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
-            if (null != next) {
-                next.setQdzArrDatesj(sch.getZdsjActual());
+
+            //准备执行下一个班次
+            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            if (next != null) {
+                //套跑  -下发线路切换指令
+                if(!next.getXlBm().equals(sch.getXlBm())){
+                    gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                }
+            }
+
+            //路牌的下一个班次，线调页面显示
+            ScheduleRealInfo nextLp = dayOfSchedule.nextByLp(sch);
+            if (null != nextLp) {
+                nextLp.setQdzArrDatesj(sch.getZdsjActual());
                 List<ScheduleRealInfo> refs = new ArrayList<>();
                 refs.add(sch);
-                refs.add(next);
+                refs.add(nextLp);
                 sendUtils.refreshSch(refs);
                 return;
             }
@@ -49,8 +49,8 @@ public class LateAdjustHandle implements ApplicationContextAware{
      */
     public static void putLate(ScheduleRealInfo sch){
         try {
-            //进出场班次不需要
-            if(sch.getBcType().equals("in") || sch.getBcType().equals("out"))
+            //出场班次不需要
+            if(/*sch.getBcType().equals("in") || */sch.getBcType().equals("out"))
                 return;
             //线路配置
             LineConfig config = lineConfigData.get(sch.getXlBm());
@@ -32,6 +32,11 @@ public class LineVersions{
 	/** ID 主键(唯一标识符) int length(11) */
 	private Integer id;
+	/** 线路版本名字 varchar length(50)
+	 * 	给排版人员选版本使用
+	 *  */ 
+	private String name;
+	
 	/** 线路ID  int length(11) */
 	@ManyToOne
 	private Line line;
@@ -71,6 +76,14 @@ public class LineVersions{
 	public void setId(Integer id) {
 		this.id = id;
 	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 	public Line getLine() {
 		return line;
@@ -59,5 +59,12 @@ public interface LineVersionsRepository extends BaseRepository&lt;LineVersions, Int
 	@Modifying
 	@Query(value = "UPDATE LineVersions lv set lv.status=1 where lv.line.id=?1 and lv.lineCode=?2 and lv.versions=?3")
 	public void updateNewVersions(Integer lineId, String lineCode, Integer versions);
+
+	
+	/**
+	 * 查询线路最大线路版本
+	 */
+	@Query(value = "select lv2 from LineVersions lv2 where lv2.line.id =?1 and lv2.versions=(SELECT max(lv.versions) FROM LineVersions lv where lv.line.id = ?1) ")
+	public LineVersions findLineVersionsMax(int lineId);
 }
@@ -32,4 +32,6 @@ public interface LineVersionsService extends BaseService&lt;LineVersions, Integer&gt; 
 	List<LineVersions> lineUpdate();
+	LineVersions findLineVersionsMax(int lineId);
+
 }
@@ -256,7 +256,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
         // 入库
         d64.setHttpCode(code);
-        d64.getData().setTxtContent("切换线路[" + lineCode + "]");
+        d64.getData().setTxtContent("切换线路[" + BasicData.lineCode2NameMap.get(lineCode) + "]");
         dayOfDirectives.put64(d64);
         // 通知设备刷新线路文件，忽略结果
@@ -365,11 +365,21 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     }
     @Override
-    public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
+    public Map<String, Object> findDirective(String nbbms, int dType, int page, int size) {
         Map<String, Object> rsMap = new HashMap<>();
         try{
-            List<Directive> list = new ArrayList<>();
+            List<String> carArray = new ArrayList<>(), deviceArray=new ArrayList<>();
+            if(StringUtils.isNotEmpty(nbbms)){
+                carArray = Splitter.on(",").splitToList(nbbms);
+                //转换成设备号
+                Map<String, String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+                for(int i = 0, len=carArray.size(); i < len; i++){
+                    deviceArray.add(nbbm2deviceMap.get(carArray.get(i)));
+                }
+            }
+
+            List<Directive> list = new ArrayList<>();
             switch (dType) {
                 case -1:
                     //所有指令
@@ -409,18 +419,22 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             // 时间倒序
             Collections.sort(list, new DayOfDirectives.DComparator());
-            if (StringUtils.isNotBlank(nbbm)) {
-                String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-                //按车辆过滤
+            if(deviceArray.size() > 0){
+                //按设备号过滤
                 List<Directive> subList = new ArrayList<>();
                 for (Directive d : list) {
-                    if (d.getDeviceId().equals(deviceId)) {
+                    if (deviceArray.contains(d.getDeviceId())) {
                         subList.add(d);
                     }
                 }
                 list = subList;
             }
+            for(Directive d : list){
+                d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
+                d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
+            }
+
             int count = list.size();
             // 分页
             int s = page * size, e = s + size;
@@ -429,15 +443,6 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 e = count;
             List<Directive> rs = list.subList(s, e);
-
-            // 时间格式化，车辆自编号转换
-            for (Directive d : rs) {
-                if (d.getTimeHHmm() == null)
-                    d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
-                if (d.getNbbm() == null)
-                    d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
-            }
-
             rsMap.put("list", rs);
             rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
             rsMap.put("page", page);
@@ -450,51 +455,6 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     @Override
     public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
-        /*List<D80> d80s = new ArrayList<>();
-
-        Object nbbm = map.get("nbbm");
-        if (null != nbbm && StringUtils.isNotEmpty(nbbm.toString())) {
-            d80s.addAll(pilotReport.findByCar(nbbm.toString()));
-        } else {
-            d80s.addAll(pilotReport.findAll());
-        }
-
-        Short requestCode = Short.parseShort(map.get("requestCode").toString());
-        if (requestCode != -1) {
-            List<D80> temps = new ArrayList<>();
-            for (D80 d80 : d80s) {
-                if (d80.getData().getRequestCode().equals(requestCode))
-                    temps.add(d80);
-            }
-            d80s = temps;
-        }
-
-        //排序
-        Collections.sort(d80s, new Comparator<D80>() {
-            @Override
-            public int compare(D80 o1, D80 o2) {
-                return (int) (o2.getTimestamp() - o1.getTimestamp());
-            }
-        });
-
-        //分页
-        int count = d80s.size();
-        // 分页
-        int s = page * size, e = s + size;
-
-        if (e > count)
-            e = count;
-
-        //SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-        List<D80> rs = d80s.subList(s, e);
-        for (D80 d80 : rs) {
-            d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
-        }
-
-        Map<String, Object> rsMap = new HashMap<>();
-        rsMap.put("list", rs);
-        rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
-        rsMap.put("page", page);*/
         List all = ListFilterUtils.filter(pilotReport.findAll(), map, D80.class);
         //排序
@@ -1099,7 +1099,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);
 							}
 						}
@@ -1184,7 +1184,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);
 						}
 					}
@@ -418,7 +418,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				for(ScheduleRealInfo schedule : keyMap2.get(date)){
 					if(schedule.getFcsjT() != null && !schedule.isSflj())
 						fcsjs.add(schedule.getFcsjT());
-					if(schedule.getFcsjActualTime() != null && schedule.getStatus() != -1)
+					if(schedule.getFcsjActualTime() != null && schedule.getZdsjActualTime() != null
+							&& schedule.getStatus() != -1)
 						fcsjAs.add(schedule.getFcsjActualTime());
 				}
 				Collections.sort(fcsjs);
@@ -1686,7 +1687,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					jhbc++;
 					jhlc = jhlc.add(lc);
 				}
-				if(schedule.getStatus() != -1 && !schedule.isCcService()){
+				if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null
+						&& schedule.getStatus() != -1 && !schedule.isCcService()){
 					sjbc++;
 					sjlc = sjlc.add(lc);
 				} else if(schedule.getStatus() == -1 && !schedule.isCcService()){
@@ -1920,8 +1922,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
-						&& !schedule.isCcService()){
+				if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null
+						&& schedule.getStatus() != -1 && !schedule.isCcService()){
 					sjbc++;
 					if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
 						flag = true;
@@ -9,7 +9,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.drools.core.time.impl.PseudoClockScheduler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -141,9 +140,8 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
     			jdbcTemplate.update("delete from bsth_c_stationroute where line = ?  and line_code = ?", lineId, lineCode);
     			String stationSql ="insert into bsth_c_stationroute(id,line,station,station_name,station_route_code,"
-    					+ "line_code,station_code,station_mark,out_station_nmber,directions,distances,"
-    					+ "to_time,first_time,end_time,descriptions,destroy,versions,create_by,create_date,"
-    					+ "update_by,update_date) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    					+ "line_code,station_code,station_mark,directions,distances,to_time,destroy,versions,"
+    					+ "create_date,update_date) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
     			jdbcTemplate.batchUpdate(stationSql, new BatchPreparedStatementSetter() {
 					@Override
@@ -158,19 +156,13 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 						ps.setString(6, sRoute.getLineCode());
 						ps.setString(7, sRoute.getStationCode());
 						ps.setString(8, sRoute.getStationMark());
-						ps.setInt(9, sRoute.getOutStationNmber()==null ? 0:sRoute.getOutStationNmber());
-						ps.setInt(10, sRoute.getDirections());
-						ps.setDouble(11, sRoute.getDistances());
-						ps.setDouble(12, sRoute.getToTime());
-						ps.setString(13, sRoute.getFirstTime()==null ? "":sRoute.getFirstTime());
-						ps.setString(14, sRoute.getEndTime()==null ? "":sRoute.getEndTime());
-						ps.setString(15, sRoute.getDescriptions()==null ? "":sRoute.getDescriptions());
-						ps.setInt(16, sRoute.getDestroy());
-						ps.setInt(17, sRoute.getVersions());
-						ps.setInt(18, sRoute.getCreateBy()==null ? 0:sRoute.getCreateBy());
-						ps.setDate(19, new java.sql.Date(sRoute.getCreateDate().getTime()));
-						ps.setInt(20, sRoute.getUpdateBy()==null ? 0:sRoute.getUpdateBy());
-						ps.setDate(21, new java.sql.Date(sRoute.getUpdateDate().getTime()));						
+						ps.setInt(9, sRoute.getDirections());
+						ps.setDouble(10, sRoute.getDistances());
+						ps.setDouble(11, sRoute.getToTime());
+						ps.setInt(12, sRoute.getDestroy());
+						ps.setInt(13, sRoute.getVersions());
+						ps.setDate(14, new java.sql.Date(sRoute.getCreateDate().getTime()));
+						ps.setDate(15, new java.sql.Date(sRoute.getUpdateDate().getTime()));						
 					}
 					@Override
@@ -182,8 +174,8 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
     			jdbcTemplate.update("delete from bsth_c_sectionroute where line = ?  and line_code = ?", lineId, lineCode);
     			String sectionSql ="insert into bsth_c_sectionroute(id,line_code,section_code,sectionroute_code,"
-    					+ "directions,line,section,descriptions,create_by,create_date,update_by,update_date,versions,"
-    					+ "destroy,is_roade_speed) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    					+ "directions,line,section,create_date,update_date,versions,"
+    					+ "destroy) values(?,?,?,?,?,?,?,?,?,?,?)";
     			jdbcTemplate.batchUpdate(sectionSql, new BatchPreparedStatementSetter() {
 					@Override
@@ -196,14 +188,10 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 						ps.setInt(5, sRoute.getDirections());
 						ps.setInt(6, sRoute.getLine().getId());
 						ps.setInt(7, sRoute.getSection().getId());
-						ps.setString(8, sRoute.getDescriptions()==null ? "":sRoute.getDescriptions());
-						ps.setInt(9, sRoute.getCreateBy()==null ? 0:sRoute.getCreateBy());
-						ps.setDate(10, new java.sql.Date(sRoute.getCreateDate().getTime()));
-						ps.setInt(11, sRoute.getUpdateBy()==null ? 0:sRoute.getUpdateBy());
-						ps.setDate(12, new java.sql.Date(sRoute.getUpdateDate().getTime()));
-						ps.setInt(13, sRoute.getVersions());
-						ps.setInt(14, sRoute.getDestroy());
-						ps.setInt(15, sRoute.getIsRoadeSpeed()==null ? 0:sRoute.getIsRoadeSpeed());
+						ps.setDate(8, new java.sql.Date(sRoute.getCreateDate().getTime()));
+						ps.setDate(9, new java.sql.Date(sRoute.getUpdateDate().getTime()));
+						ps.setInt(10, sRoute.getVersions());
+						ps.setInt(11, sRoute.getDestroy());
 					}
 					@Override
@@ -231,5 +219,10 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 		}
     	return list;
 	}
+
+	@Override
+	public LineVersions findLineVersionsMax(int lineId) {
+		return repository.findLineVersionsMax(lineId);
+	}
 }
@@ -283,10 +283,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //重新计算是否误点
             schedule.reCalcLate();
             //取消应发未到标记，不再自动调整待发
-            if(schedule.isLate2()){
-                schedule.setLate2(false);
-                LateAdjustHandle.remove(schedule);
-            }
+            //if(schedule.isLate2()){
+            //    schedule.setLate2(false);
+            LateAdjustHandle.remove(schedule);
+            //}
             try {
                 if(!schedule.getDirectiveState().equals(-1) && schedule.getStatus()==0){
@@ -1200,11 +1200,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             sch.setFcsjActualAll(fcsjActual);
             sch.addRemarks(remarks);
             sch.calcStatus();
-            if(sch.isLate2()){
+            //if(sch.isLate2()){
                 //取消应发未到标记
-                sch.setLate2(false);
-                LateAdjustHandle.remove(sch);
-            }
+           //     sch.setLate2(false);
+            LateAdjustHandle.remove(sch);
+            //}
             dayOfSchedule.save(sch);
@@ -1431,10 +1431,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 fLog.log("调整实发时间", sch.getFcsjActual(), fcsjActual);
                 sch.setFcsjActualAll(t);
                 //取消应发未到标记
-                if(sch.isLate2()){
-                    sch.setLate2(false);
+                //if(sch.isLate2()){
+                //    sch.setLate2(false);
                     LateAdjustHandle.remove(sch);
-                }
+                //}
             } else if (StringUtils.isNotEmpty(sch.getFcsjActual()) && StringUtils.isEmpty(fcsjActual)){
                 fLog.log("撤销实发时间", sch.getFcsjActual(), "");
                 //撤销实发
@@ -1463,6 +1463,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 //重新计算车辆执行班次
                 dayOfSchedule.reCalcExecPlan(sch.getClZbh());
+                //取消应发未到标记
+                LateAdjustHandle.remove(sch);
             } else if(StringUtils.isNotEmpty(sch.getZdsjActual()) && StringUtils.isEmpty(zdsjActual)){
                 //清除实达时间
                 fLog.log("撤销实达时间", sch.getZdsjActual(), "");
@@ -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.setSflj(rs.getBoolean("sflj"));
 					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
@@ -224,8 +225,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		//分组计算路程公里
 		for(SchedulePlanInfo schedule : list){
+			if(schedule.getsName() != null && schedule.getsName().trim().equals("")){
+				schedule.setsName(null);
+			}
 			String key = schedule.getXlName() + "/" + schedule.getLpName() + "/" +
 					schedule.getClZbh() + "/" + schedule.getjName() + "/" + schedule.getsName();
+			key = key.trim();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<SchedulePlanInfo>());
 			keyMap.get(key).add(schedule);
@@ -273,10 +278,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					str += (int)lp.charAt(i);
 				}
 				Long i = Long.valueOf(str);
-				if(!tempList.containsKey(i))
+				if(!tempList.containsKey(i)){
 					tempList.put(i, new ArrayList<Map<String, Object>>());
+					keyList.add(i);
+				}
 				tempList.get(i).add(m);
-				keyList.add(i);
 			}
 			Collections.sort(keyList);
 			for(Long i : keyList){
@@ -387,14 +393,22 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 				//班次数和出场数
-				jhbc++;
-				if(schedule.getBcType().equals("out"))
-					jhcc++;
+				if(!schedule.isSflj() && schedule.getFcsj() != null && schedule.getZdsj() != null){
+					if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")){
+						jhbc++;
+						System.out.print((""+schedule.isSflj()).equals("false")?"":"X" + " ");
+					}
+					if(schedule.getBcType().equals("out"))
+						jhcc++;
+				}
+				if(schedule.getStatus() != -1 && schedule.getBcType().equals("out"))
+					sjcc++;
+				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")
+						&& schedule.getFcsjActual() != null && schedule.getZdsjActual() != null && schedule.getStatus() != -1){
+				
 				//发出时间快慢
 				if(schedule.getFcsjActual() != null){
-					if(schedule.getBcType().equals("out"))
-						sjcc++;
 //					schedule.setFcsjActualAll(schedule.getFcsjActual());
 					if(schedule.getFcsjActualTime() - schedule.getFcsjT() < -1){
 						if(schedule.getXlDir().equals("0"))
@@ -434,14 +448,15 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					}
 				}
-				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")
-						&& !schedule.getBcType().equals("ldks") && schedule.getFcsjActual() != null){
+				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")
+						&& schedule.getFcsjActual() != null && schedule.getZdsjActual() != null){
 //					String clZbh = schedule.getClZbh();
 					String xlDir = schedule.getXlDir();
 					if(!listMap.containsKey(xlDir))
 						listMap.put(xlDir, new ArrayList<ScheduleRealInfo>());
 					listMap.get(xlDir).add(schedule);
 				}
+				}
 			}
 			//求首末班准点率
@@ -57,7 +57,7 @@
 							<p>
 								<span class="help-block" style="color: #1bbc9b;">
 									&nbsp;请在文本域中按顺序依次输坐标点,每行中的数据之间用【Tab】键隔开（如果是站点，请将在坐标后面加 stop;没有
-									stop默认是路段点）,每输入完一个坐标时请按回车键【Enter】换行. 例如：<!-- <br> 121.715623
+									stop默认是路段点，连续带stop的坐标认为是同一个站点）,每输入完一个坐标时请按回车键【Enter】换行. 例如：<!-- <br> 121.715623
 									31.224058 042408.000<br> 121.715623 31.224065 042409.000
 									Stop<br> 121.715623 31.224065 042410.000<br> -->
 									<br>121.511870	31.180638	043703.000
@@ -175,7 +175,7 @@ $(function(){
 			WorldsBMapLine.deleteCutSectionPoint(firstPoint);
 			WorldsBMapLine.setIsCutSection(false);
 		} else {
-			layer.msg("没有截取路段，不可以删除！！！");
+			layer.msg("没有截取路段，不可以撤销！！！");
 		}
 	});	
 	// 滚动轴监听事件
@@ -23,9 +23,9 @@
 				</form>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn default" data-dismiss="modal">取消</button>
 				<button type="button" class="btn btn-primary"
 					id="submitSelectnextButton">提交</button>
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
 			</div>
 		</div>
 	</div>
@@ -50,9 +50,9 @@
 				}
 				if(this.status==1){
 					//当前版本为默认
-					options += '<option value="'+this.versions+','+this.status+','+startDate+'"  > 版本'+this.versions+' 启用时间：'+startDate+' 当前版本</option>';
+					options += '<option value="'+this.versions+','+this.status+','+startDate+'" selected = "selected" > 版本'+this.versions+' 启用时间：'+startDate+' 当前版本</option>';
 				} else if(this.status==2){
-					options += '<option value="'+this.versions+','+this.status+','+startDate+'" selected = "selected"> 版本'+this.versions+' 启用时间：'+startDate+' 待更新版本</option>';
+					options += '<option value="'+this.versions+','+this.status+','+startDate+'"> 版本'+this.versions+' 启用时间：'+startDate+' 待更新版本</option>';
 				}
 			});
 			$('#lineVersions').html(options);
 <!-- 片段标题 START -->
 <div class="page-head">
 	<div class="page-title">
-		<h1>修改添加信息</h1>
+		<h1>添加线路版本</h1>
 	</div>
 </div>
 <!-- 片段标题 END -->
-<!-- 线路信息导航栏组件 START -->
+<!-- 线路版本信息导航栏组件 START -->
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
-	<li><a href="/pages/base/line/list.html" data-pjax>线路信息</a> <i class="fa fa-circle"></i></li>
+	<li><a href="/pages/base/lineversions/list.html" data-pjax>线路版本信息</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">修改添加信息</span></li>
 </ul>
-<!-- 线路信息导航栏组件 END -->
+<!-- 线路版本信息导航栏组件 END -->
 <!-- 信息容器组件 START -->
 <div class="portlet light bordered">
@@ -22,7 +22,7 @@
 	<div class="portlet-title">
 		<div class="caption">
 			<i class="icon-equalizer font-red-sunglo"></i> 
-			<span class="caption-subject font-red-sunglo bold uppercase">添加线路信息</span>
+			<span class="caption-subject font-red-sunglo bold uppercase">添加线路版本信息</span>
 		</div>
 	</div>
 	<!-- 信息容器组件标题 END -->
@@ -48,6 +48,17 @@
                  <!-- 表单分组组件 form-group START -->
 				<div class="form-group">
 						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路版本名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input name="name" class="form-control" style="width:100%" id="nameInput" placeholder="请填写更换版本原因，方便排班人员操作！" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                 <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
           					<span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     	</label>
 	                    <div class="col-md-4">
@@ -105,9 +116,9 @@
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
-					<label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+					<label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                    	<div class="col-md-4">
-                    		<textarea class="form-control" rows="3" name="remark" id="remarkTextarea" placeholder="请填写更换版本原因，方便排班人员操作！"></textarea>
+                    		<textarea class="form-control" rows="3" name="remark" id="remarkTextarea" placeholder="描述/说明"></textarea>
                    	</div>
                 </div>
                 <!-- 表单分组组件 form-group END -->
@@ -130,5 +141,5 @@
 </div>
 <!-- 信息容器组件 END -->
-<!-- 线路信息添加片段JS模块 -->
+<!-- 线路版本信息添加片段JS模块 -->
 <script src="/pages/base/lineversions/js/lineversions-add-from.js"></script>
 \ No newline at end of file
@@ -70,6 +70,9 @@
 			$('#lineIdInput').val('');// 设值线路ID.
 		}else {
 			var lineSelectValueArray = lineSelectValue.split('_');// 切割线路名称值.
+			$.get('/lineVersions/findLineVersionsMax',{'lineId':lineSelectValueArray[1]}, function(lineVersionsMax){
+				$('#versionsInput').val(++lineVersionsMax.versions);// 设值线路编码.
+			});
 			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
 			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
 		}
@@ -110,6 +113,7 @@
 		focusInvalid : true, 
 		// 需要验证的表单元素
 		rules : {
+			'name' : {required : true,maxlength: 30},// 线路名称 必填项、最大长度.
 			'line' : {required : true,maxlength: 30},// 线路名称 必填项、最大长度.
 			'startDate' : {required : true},// 启用时间 不为空.
 			'endDate' : {required : true},// 结束时间.
@@ -124,6 +124,10 @@ $(&#39;#edit_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,drw,ajaxd,ed
 				// 打开绘制工具
 				drw.openDrawingManager();
 				map_.localtionPoint(editStationName); 
+				layer.open({
+					  title: '友情提示'
+					  ,content: '重绘站点，会修改站点编码，影响已做好的排班和线路文件。请谨慎使用，谢谢！'
+					}); 
 			}else if(params.editselect==1){
 				// 弹出添加失败提示消息,2秒关闭（如果不配置，默认是3秒）
 				var mindex = layer.msg('编辑完图形后,请双击图形区域保存',{ offset: '126px',
@@ -308,7 +308,7 @@
 // 			$(".hidden").removeClass("hidden");
 			$get('/busInterval/interval', params, function(result){
 				// 把数据填充到模版中
-				var tbodyHtml = template('list_workDaily',{list:result,statu:statu});
+				var tbodyHtml = template('list_busInteval',{list:result,statu:statu});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms').html(tbodyHtml);
 				_w_table_rowspan("#forms tbody", 1);
@@ -440,7 +440,7 @@
 	});
 </script>
-<script type="text/html" id="list_workDaily">
+<script type="text/html" id="list_busInteval">
 <thead>
 	<tr>
 		<th>日期</th>
@@ -257,7 +257,7 @@
 			$(".hidden").removeClass("hidden");
 			$get('/pcpc/scheduleAnaly_sum', params, function(result){
 				// 把数据填充到模版中
-				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList, companyName:companyName, subCompanyName:subCompanyName});
+				var tbodyHtml = template('list_scheduleAnaly_sum',{list:result.dataList, companyName:companyName, subCompanyName:subCompanyName});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
@@ -384,7 +384,7 @@
 	});
 </script>
-<script type="text/html" id="list_scheduleAnaly">
+<script type="text/html" id="list_scheduleAnaly_sum">
 	{{each list as obj i}}
 		<tr>
 			<th style="display: none;"></th>
@@ -144,6 +144,19 @@
     var hide_wait_modal = function () {
         UIkit.modal('#gb_wait_modal').hide();
     };
+
+    var alt_confirm = function (content, succ, okBtn, noCenter) {
+        var modalEl = UIkit.modal.confirm(content, function () {
+            succ && succ();
+            modalEl.hide();
+        }, {
+            labels: {
+                Ok: okBtn,
+                Cancel: '取消'
+            }
+            , center: !noCenter
+        });
+    };
 </script>
 </body>
 </html>
 \ No newline at end of file
 <div>
     <script id="sys-note-80-temp" type="text/html">
-        <div class="uk-width-medium-1-1 sys-note-80 sys-mail-item" data-id={{id}}>
+        <div class="uk-width-medium-1-1 sys-note-80 sys-mail-item" data-id={{id}} data-schid="{{schId}}">
             <div class="uk-panel uk-panel-box uk-panel-box-primary">
                 <h4 class="uk-panel-title">{{data.nbbm}} {{text}}</h4>
                 <code>{{dateStr}}</code>
@@ -21,9 +21,13 @@
                         <option value="1">运营指令</option>
                         <option value="2">线路切换指令</option>
                     </select>
+                    <span class="horizontal-field">线路</span>
+                    <select name="lineCode" style="width: 140px;">
+                        <option value="">全部</option>
+                    </select>
                     <span class="horizontal-field">车辆</span>
                     <div class="uk-autocomplete uk-form" id="uk-autocomplete-cars">
-                        <input type="text" name="nbbm" placeholder="车辆自编号">
+                        <input type="text" name="nbbms" placeholder="车辆自编号">
                     </div>
                     <button class="uk-button">检索</button>
@@ -81,43 +85,18 @@
             var form = $('.search-form', modal);
             var page = 0;
             var pageSize = 12;
-            //all car nbbm
-            var cars;
-            //custom autocomplete search function
-            var carInput = $('#uk-autocomplete-cars input');
-            var search_nbbm = function(release) {
-                var q = carInput.val().toUpperCase(),
-                        rs = [],
-                        max = 12,
-                        count = 0;
-
-                $.each(cars, function(i, item) {
-                    if (item.indexOf(q) != -1){
-                        rs.push({
-                            value: item,
-                            title: item
-                        });
-                        count ++;
-                    }
-                    if (count >= max)
-                        return false;
-                });
-                release && release(rs);
-            }
+            //线路下拉框
+            var opts = '<option value="">全部</option>';
+            $.each(gb_data_basic.activeLines, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+            $('[name=lineCode]', form).html(opts);
             $('#directive-history-modal').on('init', function(e, data) {
                 e.stopPropagation();
-                // autocomplete
-                $.get('/basic/cars', function(rs) {
-                    cars = rs;
-
-                    UIkit.autocomplete('#uk-autocomplete-cars', {
-                        source: search_nbbm,
-                        minLength: 1,
-                        delay: 50
-                    });
-                });
+                //车辆 autocomplete
+                gb_common.carAutocomplete($('#uk-autocomplete-cars', modal), gb_data_basic.carsArray());
                 query();
             });
@@ -133,6 +112,17 @@
                 var data = form.serializeJSON();
                 data.page = page;
                 data.size = pageSize;
+                if(data.lineCode){
+                    //有选择线路，重新设置车辆字符串
+                    var nbbmArray=data.nbbms=gb_schedule_table.findNbbmByLineCode(data.lineCode);
+                    if(nbbmArray.length>0){
+                        data.nbbms='';
+                        for(var i=0,n;n=nbbmArray[i++];){
+                            data.nbbms+=n+',';
+                        }
+                        data.nbbms=data.nbbms.substr(0, data.nbbms.length-1);
+                    }
+                }
                 $.get('/directive/list', data, function(rs) {
                     $.each(rs.list, function(i, e){
@@ -14,10 +14,12 @@
                     <select name="requestCode">
                         <option value="">全部</option>
                     </select>
-                    <span class="horizontal-field">线路</span>
+                    <!--<span class="horizontal-field">线路</span>
                     <div class="uk-autocomplete uk-form autocomplete-line" >
                         <input type="text" name="lineId" placeholder="线路">
-                    </div>
+                    </div>-->
+                    <span class="horizontal-field">线路</span>
+                    <select name="lineId" style="width: 140px;"></select>
                     <span class="horizontal-field">车辆</span>
                     <div class="uk-autocomplete uk-form autocomplete-cars" >
                         <input type="text" name="nbbm" placeholder="车辆自编号">
@@ -80,6 +82,13 @@
             var page = 0;
             var pageSize = 12;
+            //线路下拉框
+            var opts = '<option value="">全部</option>';
+            $.each(gb_data_basic.activeLines, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+            $('[name=lineId]', form).html(opts);
+
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 var opt='';
@@ -90,7 +99,7 @@
                 //车辆 autocomplete
                 gb_common.carAutocomplete($('.autocomplete-cars', modal), gb_data_basic.carsArray());
                 //线路 autocomplete
-                gb_common.lineAutocomplete($('.autocomplete-line', modal));
+                //gb_common.lineAutocomplete($('.autocomplete-line', modal));
                 query();
             });
@@ -106,12 +115,12 @@
                 var data = form.serializeJSON();
                 data.page = page;
                 data.size = pageSize;
-                //线路转换成编码
+                /*//线路转换成编码
                 if(data.lineId){
                     var lineCode = gb_data_basic.findCodeByLinename(data.lineId);
                     if(lineCode)
                         data.lineId=lineCode;
-                }
+                }*/
                 $.get('/directive/findAll80', data, function(rs) {
                     $.each(rs.list, function(){
                         //命令字转中文
@@ -62,6 +62,18 @@ var gb_common = (function () {
         return rs;
     };
+    /**
+     * 从班次集合里提取车辆
+     * @param list
+     */
+    var extractNbbm = function (list) {
+        var rs = {};
+        $.each(list, function () {
+            rs[this.clZbh]=1;
+        });
+        return rs;
+    };
+
     var compileTempByDom = function (dom, opts) {
         var tps = {},
             id;
@@ -435,7 +447,8 @@ var gb_common = (function () {
         adjustExps: adjustExps,
         inOutExps: inOutExps,
         next_elem: next_elem,
-        getDisabledVal: getDisabledVal
+        getDisabledVal: getDisabledVal,
+        extractNbbm: extractNbbm
         //whichTransitionEvent:whichTransitionEvent
     };
@@ -651,6 +651,17 @@ var gb_schedule_table = (function () {
     var refreshAll = function () {
         show();
     };
+
+    /**
+     * 获取线路下营运的车辆
+     */
+    var findNbbmByLineCode = function (lineCode) {
+        try{
+            return gb_common.get_keys(gb_common.extractNbbm(gb_common.get_vals(line2Schedule[lineCode])));
+        }catch (e){
+            return [];
+        }
+    };
     return {
         show: show,
@@ -673,6 +684,7 @@ var gb_schedule_table = (function () {
         showLateBadge: showLateBadge,
         cancelLateBadge: cancelLateBadge,
         refreshAll: refreshAll,
-        getNextNormalSch: getNextNormalSch
+        getNextNormalSch: getNextNormalSch,
+        findNbbmByLineCode:findNbbmByLineCode
     };
 })();
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-11-02',
-        text: '<h5>1、修正二次放站时，需要先将班次切回正常班次的问题。</h5><h5>2、驾驶员请求信使上，添加“编辑”链接，可弹出对应班次的发车信息微调框。</h5>'
+        date: '2017-11-08',
+        text: '<h5>1、现在点击驾驶员请求信使，也可以定位到班次。</h5><h5>2、修复进场班次不会自动误点待发调整的问题。</h5><h5>3、“指令下发记录” 和 “设备上报记录” 加入线路筛选。</h5><h5>4、尝试修复“自动执行的班车线路”和营运线路套跑时，线路切换指令会延迟触发的问题。</h5>'
     };
     var storage = window.localStorage
@@ -235,23 +235,37 @@ var gb_sch_websocket = (function () {
         dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
     });
+    //80消息点击
+    $(document).on('click', '.sys-mailbox .sys-note-80', function () {
+        var lineCode = $(this).parents('li.line_schedule').data('id')
+            , id = $(this).data('schid');
+        var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+        var dl = gb_schedule_table.scroToDl(sch);
+        //高亮
+        gb_schedule_table.reset_drag_active_all(dl);
+        dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
+    });
     //80同意
-    $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button-primary', function () {
+    $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button-primary', function (e) {
+        e.stopPropagation();
         $(this).attr('disabled', 'disabled');
         var panel = $(this).parents('.sys-note-80')
             , id = panel.data('id');
         reply80({id: id, reply: 0});
+        return false;
     });
     //80不同意
     $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button.reject', function () {
+        e.stopPropagation();
         $(this).attr('disabled', 'disabled');
         var panel = $(this).parents('.sys-note-80')
             , id = panel.data('id');
         reply80({id: id, reply: -1});
+        return false;
     });
     var reply80 = function (data, cb) {
@@ -344,10 +358,6 @@ var gb_sch_websocket = (function () {
             return;
         gb_schedule_context_menu.fcxxwt(sch);
-        var dl = gb_schedule_table.scroToDl(sch);
-        //高亮
-        gb_schedule_table.reset_drag_active_all(dl);
-        dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
     });
     return {