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 da064e9b 136a8f3a
Showing 17 changed files with 591 additions and 235 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/SeiPstThread.java
src/main/java/com/bsth/data/schedule/edit_logs/entity/EditType.java
src/main/java/com/bsth/data/schedule/edit_logs/entity/SchEditInfo.java
src/main/java/com/bsth/data/schedule/edit_logs/loggers/FcxxwtLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/repository/EditInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/report/timetable/timetable.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/north/nav/safeDriving.html
src/main/resources/static/real_control_v2/js/line_schedule/dbclick.js
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
src/main/resources/static/real_control_v2/main.html
@@ -6,6 +6,7 @@ import com.bsth.data.car_out_info.UpdateDBThread;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
+import com.bsth.data.schedule.edit_logs.SeiPstThread;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
 import com.bsth.data.schedule.thread.CalcOilThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
@@ -53,6 +54,8 @@ public class XDApplication implements CommandLineRunner {
     DirectivesPstThread directivesPstThread;
     @Autowired
     ThreadMonotor threadMonotor;
+    @Autowired
+    SeiPstThread seiPstThread;
     private static long timeDiff;
@@ -93,6 +96,8 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
+        //班次修正日志延迟入库
+        //sexec.scheduleWithFixedDelay(seiPstThread, 60, 60, TimeUnit.SECONDS);
         //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
@@ -107,10 +112,12 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
         //GPS设备掉离线
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
-        //实际排班更新线程
+        //班次更新线程
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
-        //实际排班延迟入库线程
+        //班次延迟入库线程
         sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
+        //班次修正日志延迟入库
+        sexec.scheduleWithFixedDelay(seiPstThread, 60, 60, TimeUnit.SECONDS);
         //检查班次误点
         sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
         //调度指令延迟入库
 package com.bsth.data.safe_driv;
-import com.bsth.Application;
 import com.bsth.websocket.handler.SendUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -15,7 +14,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 /**
  * 安全驾驶
@@ -69,7 +67,7 @@ public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware
     @Override
     public void run(String... strings) throws Exception {
         //定时加载安全驾驶数据
-        Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 7, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 80, 7, TimeUnit.SECONDS);
     }
     @Override
 package com.bsth.data.schedule.edit_logs;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.schedule.edit_logs.entity.EditType;
+import com.bsth.data.schedule.edit_logs.entity.SchEditInfo;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+
 /**
  * 班次修正记录
  * Created by panzhao on 2017/5/16.
  */
 public class ScheduleModifyLogger {
+    public static LinkedList<SchEditInfo> list;
+
+    static {
+        list = new LinkedList<>();
+    }
+
+    static Logger log = LoggerFactory.getLogger(ScheduleModifyLogger.class);
+
     /**
      * 待发调整
+     * opType 0: 双击调整、 1：待发调整、2：批量待发调整、3：间隔调整
      */
-    public static void dftz(Long id, String remarks, String dfsj, String bcType, String opType){
+    public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks){
+        try {
+            if(oldDfsj.equals(nowDfsj))
+                return;
+
+            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            sei.setType(EditType.DFTZ);
+            sei.setType2(opType);
+            sei.setRemarks(remarks==null?"":remarks);
+
+            //detail
+            JSONObject jobj = new JSONObject();
+            jobj.put("old", oldDfsj);
+            jobj.put("now", nowDfsj);
+
+            sei.setJsonArray(jobj.toJSONString());
+
+            put(sei);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    /**
+     * 发车信息微调记录器
+     */
+    public static void fcxxwt(ScheduleRealInfo sch, String remarks, JSONArray jsonArray){
+
+        try {
+            if(jsonArray == null || jsonArray.size() == 0)
+                return;
+
+            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            sei.setRemarks(remarks);
+            sei.setJsonArray(jsonArray.toJSONString());
+            sei.setType(EditType.FCXXWT);
+
+            put(sei);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    /**
+     * 计划烂班
+     * @param remarks
+     */
+    public static void jhlb(ScheduleRealInfo sch, String remarks){
+        try {
+            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            sei.setRemarks(remarks);
+            sei.setType(EditType.JHLB);
+
+            put(sei);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+    public static void put(SchEditInfo sei){
+        list.add(sei);
     }
 }
 \ No newline at end of file
+package com.bsth.data.schedule.edit_logs;
+
+import com.bsth.data.schedule.edit_logs.entity.SchEditInfo;
+import com.bsth.data.schedule.edit_logs.repository.EditInfoRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 班次修正日志入库
+ * Created by panzhao on 2017/5/19.
+ */
+@Component
+public class SeiPstThread extends Thread{
+
+    @Autowired
+    EditInfoRepository repository;
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try{
+            LinkedList<SchEditInfo> list = ScheduleModifyLogger.list;
+            SchEditInfo sei;
+            for(int i = 0; i < 1000; i ++){
+                sei = list.poll();
+                if(sei == null)
+                    break;
+                else{
+                    repository.save(sei);
+                }
+            }
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+}
+package com.bsth.data.schedule.edit_logs.entity;
+
+/**
+ * Created by panzhao on 2017/5/18.
+ */
+public enum EditType {
+
+    DFTZ,SFTZ,FCXXWT,TZRC,LPDD,ZRW,JHLB
+}
+package com.bsth.data.schedule.edit_logs.entity;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import javax.persistence.*;
+
+/**
+ * Created by panzhao on 2017/5/18.
+ */
+@Entity
+@Table(name = "logger_sch_modify")
+public class SchEditInfo {
+
+    @Id
+    @GeneratedValue
+    private long id;
+    /**
+     * 日期 yyyy-MM-dd
+     */
+    private String rq;
+
+    /**
+     * 时间 HH:mm
+     */
+    private String timeStr;
+
+    private String lineCode;
+
+    private String gsbm;
+
+    private String fgsbm;
+
+    /**
+     * 班次ID
+     */
+    private long schId;
+
+    /**
+     * 类型
+     */
+    @Enumerated(EnumType.STRING)
+    private EditType type;
+
+    private String type2;
+    /**
+     * 操作人 @system 系统/用户名
+     */
+    private String user;
+
+    /**
+     * 操作明细
+     */
+    @Column(length = 2000)
+    private String jsonArray;
+
+    private String remarks;
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getTimeStr() {
+        return timeStr;
+    }
+
+    public void setTimeStr(String timeStr) {
+        this.timeStr = timeStr;
+    }
+
+    public long getSchId() {
+        return schId;
+    }
+
+    public void setSchId(long schId) {
+        this.schId = schId;
+    }
+
+    public EditType getType() {
+        return type;
+    }
+
+    public void setType(EditType type) {
+        this.type = type;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getJsonArray() {
+        return jsonArray;
+    }
+
+    public void setJsonArray(String jsonArray) {
+        this.jsonArray = jsonArray;
+    }
+
+    public String getType2() {
+        return type2;
+    }
+
+    public void setType2(String type2) {
+        this.type2 = type2;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+
+    @Transient
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+    @Transient
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+    public static SchEditInfo getInstance(ScheduleRealInfo sch){
+        SchEditInfo sei = new SchEditInfo();
+        long t = System.currentTimeMillis();
+
+        sei.setRq(fmtyyyyMMdd.print(t));
+        sei.setTimeStr(fmtHHmm.print(t));
+
+        SysUser user = SecurityUtils.getCurrentUser();
+        if(user != null)
+            sei.setUser(user.getUserName());
+
+        if(sch != null){
+            sei.setSchId(sch.getId());
+            sei.setLineCode(sch.getXlBm());
+            sei.setGsbm(sch.getGsBm());
+            sei.setFgsbm(sch.getFgsBm());
+        }
+        return sei;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getGsbm() {
+        return gsbm;
+    }
+
+    public void setGsbm(String gsbm) {
+        this.gsbm = gsbm;
+    }
+
+    public String getFgsbm() {
+        return fgsbm;
+    }
+
+    public void setFgsbm(String fgsbm) {
+        this.fgsbm = fgsbm;
+    }
+}
+package com.bsth.data.schedule.edit_logs.loggers;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 发车信息微调记录
+ * Created by panzhao on 2017/5/19.
+ */
+public class FcxxwtLogger {
+
+    static Logger log = LoggerFactory.getLogger(FcxxwtLogger.class);
+
+    private JSONArray jsonArray = new JSONArray();
+    private String remarks;
+    private ScheduleRealInfo sch;
+
+    public void log(String title, Object old, Object now){
+        try {
+
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("title", title);
+            jsonObject.put("old", old);
+            jsonObject.put("now", now);
+
+            jsonArray.add(jsonObject);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public void log(String text){
+        try {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("title", text);
+
+            jsonArray.add(jsonObject);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public static FcxxwtLogger start(ScheduleRealInfo sch, String remarks){
+        FcxxwtLogger fLog = new FcxxwtLogger();
+        fLog.setSch(sch);
+        fLog.setRemarks(remarks);
+        return fLog;
+    }
+
+    public void end(){
+        ScheduleModifyLogger.fcxxwt(sch, this.remarks, jsonArray);
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public ScheduleRealInfo getSch() {
+        return sch;
+    }
+
+    public void setSch(ScheduleRealInfo sch) {
+        this.sch = sch;
+    }
+}
+package com.bsth.data.schedule.edit_logs.repository;
+
+import com.bsth.data.schedule.edit_logs.entity.SchEditInfo;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/5/19.
+ */
+@Repository
+public interface EditInfoRepository extends BaseRepository<SchEditInfo, Long>{
+}
@@ -15,6 +15,8 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
+import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
@@ -221,6 +223,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule.setRealExecDate(schedule.getScheduleDateStr());
             }
+            //记录日志
+            ScheduleModifyLogger.dftz(schedule,opType, schedule.getDfsj(),dfsj,remarks);
+
             schedule.setDfsjAll(dfsj);
             schedule.setDfAuto(false);
             schedule.addRemarks(remarks);
@@ -276,6 +281,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     map.put("msg", "不必要的重复烂班！");
                     return map;
                 }
+                //记录日志
+                ScheduleModifyLogger.jhlb(schedule, remarks);
                 schedule.setAdjustExps(reason);
                 schedule.destroy();
@@ -1163,7 +1170,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     sch = list.get(i);
                     //调整待发
-                    outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null, "间隔调整");
+                    outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null, "3");
                 }
                 rs.put("status", ResponseCode.SUCCESS);
@@ -1186,6 +1193,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> ts = new ArrayList<>();
         try {
             Long id = Long.parseLong(map.get("id"));
+            String remarks = map.get("remarks");
+
             ScheduleRealInfo sch = dayOfSchedule.get(id);
             if(null == sch){
@@ -1194,6 +1203,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 return rs;
             }
+            //日志记录器
+            FcxxwtLogger fLog = FcxxwtLogger.start(sch, remarks);
+
             String clZbh = map.get("clZbh");
             String jsy = map.get("jsy");
             if(!clZbh.equals(sch.getClZbh())
@@ -1208,7 +1220,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     rs.put("status", ResponseCode.ERROR);
                     rs.put("msg", "车辆 " + clZbh + " 不存在！");
                     return rs;
-                } else {
+                } else if(!clZbh.equals(sch.getClZbh())){
+                    fLog.log("换车", sch.getClZbh(), clZbh);
                     dayOfSchedule.changeCar(sch, clZbh);
                 }
             }
@@ -1224,7 +1237,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     rs.put("status", ResponseCode.ERROR);
                     return rs;
                 }
-                persoChange(sch, jGh);
+                else if(!jGh.equals(sch.getjGh())){
+                    fLog.log("换驾驶员", sch.getjGh() + "/" + sch.getjName(), jsy);
+                    persoChange(sch, jGh);
+                }
             }
             /**
@@ -1239,9 +1255,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     rs.put("status", ResponseCode.ERROR);
                     return rs;
                 }
-                persoChangeSPY(sch, sGh);
+                else if(!sGh.equals(sch.getsGh())){
+                    fLog.log("换售票员", sch.getsGh() + "/" + sch.getsName(), spy);
+                    persoChangeSPY(sch, sGh);
+                }
             }
-            else{
+            else if(StringUtils.isNotEmpty(sch.getsGh())){
+                fLog.log("撤销售票员");
                 sch.setsGh("");
                 sch.setsName("");
             }
@@ -1261,6 +1281,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 else
                     t = fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + fcsjActual);
+                fLog.log("调整实发时间", sch.getFcsjActual(), fcsjActual);
                 sch.setFcsjActualAll(t);
                 //取消应发未到标记
                 if(sch.isLate2()){
@@ -1268,6 +1289,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     LateAdjustHandle.remove(sch);
                 }
             } else if (StringUtils.isNotEmpty(sch.getFcsjActual()) && StringUtils.isEmpty(fcsjActual)){
+                fLog.log("撤销实发时间", sch.getFcsjActual(), "");
                 //撤销实发
                 revokeRealOutgo(sch.getId());
             }
@@ -1280,6 +1302,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     && !zdsjActual.equals(sch.getZdsjActual())) {
                 //调整实达
+                fLog.log("调整实达时间", sch.getZdsjActual(), zdsjActual);
                 sch.setZdsjActualAll(zdsjActual);
                 //路牌下一班起点到达时间
                 ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
@@ -1294,7 +1317,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     ScheduleRealInfo carNext = dayOfSchedule.next(sch);
                     if(carNext != null && !carNext.getXlBm().equals(sch.getXlBm())){
                         DirectivePushQueue.put64(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
-                        //directiveService.lineChange(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
+                        fLog.log("下发线路切换指令", sch.getXlName(), carNext.getXlName());
                     }
                 }catch (Exception e){logger.error("", e);}
@@ -1302,6 +1325,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 dayOfSchedule.reCalcExecPlan(sch.getClZbh());
             } else if(StringUtils.isNotEmpty(sch.getZdsjActual()) && StringUtils.isEmpty(zdsjActual)){
                 //清除实达时间
+                fLog.log("撤销实达时间", sch.getZdsjActual(), "");
                 sch.clearZdsjActual();
                 //清除路牌下一班起点到达时间
                 ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
@@ -1316,7 +1340,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             /**
              * 备注
              */
-            sch.setRemarks(map.get("remarks"));
+            sch.setRemarks(remarks);
             /**
              * 烂班
@@ -1324,6 +1348,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (map.get("status") != null
                     && Integer.parseInt(map.get("status").toString()) == -1) {
                 destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                fLog.log("烂班");
             }
             /**
@@ -1333,9 +1358,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isNotEmpty(jhlc)) {
                 double jhlcNum = Double.parseDouble(jhlc);
                 //烂班
-                if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch._isInout())
+                if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch._isInout() && !sch.isDestroy()){
                     destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                    fLog.log("里程设置为0，自动烂班");
+                }
                 else if(jhlcNum != sch.getJhlc()){
+                    fLog.log("设置里程", sch.getJhlc(), jhlcNum);
                     sch.setJhlc(jhlcNum);
                     //临加班次，实际计划一起改
                     if(sch.isSflj())
@@ -1347,7 +1375,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              * 修改班次类型
              */
             String bcType = map.get("bcType");
-            if (StringUtils.isNotEmpty(bcType)) {
+            if (StringUtils.isNotEmpty(bcType) && !bcType.equals(sch.getBcType())) {
+                fLog.log("修改班次类型", sch.getBcType(), bcType);
                 sch.setBcType(bcType);
             }
@@ -1359,6 +1388,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             rs.put("status", ResponseCode.SUCCESS);
             rs.put("ts", ts);
+
+            //日志记录结束
+            fLog.end();
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -1383,7 +1415,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule = dayOfSchedule.get(id);
                 if(schedule != null)
-                    outgoAdjust(id, null, dfsj, null, "批量调整");
+                    outgoAdjust(id, null, dfsj, null, "2");
             }
             rs.put("status", ResponseCode.SUCCESS);
@@ -3144,7 +3176,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Set<ScheduleRealInfo> set = new HashSet<>();
         ScheduleRealInfo sch;
-        //BiMap<String, String> map = BasicData.deviceId2NbbmMap.inverse();
         String jGh = null,jName,sGh,sName;
         for (ChangePersonCar cpc : cpcs) {
@@ -3257,7 +3288,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
                 continue;
-            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null, "批量调整");
+            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null, "2");
             if (tempMap.get("status").equals(ResponseCode.SUCCESS)) {
                 list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
@@ -573,191 +573,77 @@ public class ReportServiceImpl implements ReportService{
 		//查询全程
 		String sqlqc="select t.*,x.station_name as qdz_name from ( "
-				     + "(SELECT fcsj,qdz,2 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
-					 + " where ttinfo ='"+ttinfo+"' and bc_type='normal'  and fcsj <='"+minfcsj+"' ) "
+				     + " (SELECT bc_type, fcsj,qdz,2 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
+					 + " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
+					 + " and fcsj <='"+minfcsj+"') "
 					 + " union "
-					 + " (SELECT fcsj,qdz,1 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
-					 + " where ttinfo ='"+ttinfo+"' and bc_type='normal'  and fcsj > '"+minfcsj+"') "
-					 		+ "order by  xl_dir,xh,fcsj ) t left join bsth_c_station  x on t.qdz=x.id";
+					 + " (SELECT bc_type, fcsj,qdz,1 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
+					 + " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
+					 + " and fcsj > '"+minfcsj+"') "
+					 + "order by  xl_dir,xh,fcsj ) t left join bsth_c_station x on t.qdz=x.id";
 		List<Map<String, String>> qclist= jdbcTemplate.query(sqlqc,
 				 new RowMapper<Map<String, String>>(){
 			 @Override
-			 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, String> m=new HashMap<String,String>();
-				 m.put("qdz_name", rs.getString("qdz_name"));
-				 m.put("fcsj", rs.getString("fcsj"));
-				 m.put("xl", rs.getString("xl_dir"));
-				 return m;
-			 }
+				 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+					 Map<String, String> m=new HashMap<String,String>();
+					 m.put("qdz_name", rs.getString("qdz_name"));
+					 m.put("bcType", rs.getString("bc_type"));
+					 m.put("fcsj", rs.getString("fcsj"));
+					 m.put("xl", rs.getString("xl_dir"));
+					 m.put("xh", rs.getString("xh"));
+					 return m;
+				 }
 		});
-				
-		Map<String, Object> qcMap=new HashMap<String,Object>();
-		int num=0;
-		String sxfcsj="";
-		String xxfcsj="";
-		String sxzd="";
-		String xxzd="";
-		for (int i = 0; i < qclist.size(); i++) {
-			Map<String, String> map=qclist.get(i);
-			if(map.get("xl").equals("0")){
-				if(sxzd.equals("")){
-					sxzd=map.get("qdz_name").toString();
-					qcMap.put("sxzm", sxzd);
-					sxfcsj +=map.get("fcsj").toString()+"-";
-				}
-				if(!(qclist.get(i+1).get("xl").equals("0"))){
-					sxfcsj +=map.get("fcsj").toString();
-					qcMap.put("sxsj",sxfcsj);
-					qcMap.put("sxbc", i+1);
-					num=i+1;
-				}
-			}
-			if(map.get("xl").equals("1")){
-				if(xxzd.equals("")){
-					xxzd=map.get("qdz_name").toString();
-					xxfcsj+=map.get("fcsj").toString()+"-";
-					qcMap.put("xxzm", xxzd);
-				}
+		
+		List<List<Map<String, String>>> mapList = new ArrayList<List<Map<String,String>>>();
+		mapList.add(new ArrayList<Map<String, String>>());
+		mapList.add(new ArrayList<Map<String, String>>());
+		for(Map<String, String> m : qclist){
+			String bcType = m.get("bcType");
+			if(bcType.equals("normal")){
+				mapList.get(0).add(m);
+			} else {
+				mapList.get(1).add(m);
 			}
 		}
-		xxfcsj +=qclist.get(qclist.size()-1).get("fcsj").toString();
-		qcMap.put("xxsj", xxfcsj);
-		qcMap.put("xxbc", qclist.size()-num);
-		list.add(qcMap);
-		
-		//查询区间
-		String sqlqj="select t.*,x.station_name as qdz_name from ( "
-				+ "(SELECT fcsj,qdz,'1' as gf,xl_dir FROM bsth_c_s_ttinfo_detail  "
-				+ "where ttinfo ='"+ttinfo+"' and bc_type='region' and fcsj >='06:31'"
-				+ "and fcsj <'08:30')"
-				+ " union ( SELECT fcsj,qdz,'2' as gf,xl_dir FROM bsth_c_s_ttinfo_detail  "
-				+ "where ttinfo ='"+ttinfo+"' and bc_type='region' "
-				+ "and fcsj > '16:01' and fcsj < '18:00') order by  xl_dir,gf,fcsj ) t "
-				+ "left join bsth_c_station  x on t.qdz=x.id";
-		
-		List<Map<String, String>> qjlist= jdbcTemplate.query(sqlqj,
-				 new RowMapper<Map<String, String>>(){
-			 @Override
-			 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-				 Map<String, String> m=new HashMap<String,String>();
-				 m.put("qdz_name", rs.getString("qdz_name"));
-				 m.put("fcsj", rs.getString("fcsj"));
-				 m.put("xl", rs.getString("xl_dir"));
-				 m.put("gf", rs.getString("gf"));
-				 return m;
-			 }
-		});
-		
-		Map<String, Object> qjzMap=new HashMap<String,Object>();
-		Map<String, Object> qjwMap=new HashMap<String,Object>();
-		int numqj=0;
-		String sxfcsjqj="";
-		String xxfcsjqj="";
-		String sxzdqj="";
-		String xxzdqj="";
-		for(int i=0;i<qjlist.size();i++){
-			Map<String, String> map=qjlist.get(i);
-			if(map.get("xl").toString().equals("0")){
-				if(map.get("gf").toString().equals("1")){
-					if(sxzdqj.equals("")){
-						sxzdqj =map.get("qdz_name").toString();
-						qjzMap.put("sxzm", sxzdqj);
-						sxfcsjqj +=map.get("fcsj").toString()+"-";
-					}
-					if(i<qjlist.size()-1){
-						if(!(qjlist.get(i+1).get("gf").equals("1"))){
-							sxfcsjqj +=map.get("fcsj").toString();
-							qjzMap.put("sxsj",sxfcsjqj);
-							qjzMap.put("sxbc", i+1);
-							numqj=i+1;
-							sxzdqj ="";
-							sxfcsjqj="";
-						}
-					}else{
-						qjzMap.put("sxsj",sxfcsjqj+"-"+map.get("fcsj").toString());
-						qjzMap.put("sxbc", i+1);
-						numqj=i+1;
-						sxzdqj ="";
-						sxfcsjqj="";
-					}
-				}
-				if(map.get("gf").toString().equals("2")){
-					if(sxzdqj.equals("")){
-						sxzdqj =map.get("qdz_name").toString();
-						qjwMap.put("sxzm", sxzdqj);
-						sxfcsjqj +=map.get("fcsj").toString()+"-";
-					}
-					if(i<qjlist.size()-1){
-						if(!(qjlist.get(i+1).get("xl").equals("0"))){
-							sxfcsjqj +=map.get("fcsj").toString();
-							qjwMap.put("sxsj",sxfcsjqj);
-							qjwMap.put("sxbc", i+1-numqj);
-							numqj=i+1;
-						}
-					}else{
-						qjwMap.put("sxsj",sxfcsjqj+"-"+map.get("fcsj").toString());
-						qjwMap.put("sxbc", i+1-numqj);
-						numqj=i+1;
-					}
-				}
-				
-			}else{
-				if(map.get("gf").toString().equals("1")){
-					if(xxzdqj.equals("")){
-						xxzdqj =map.get("qdz_name").toString();
-						qjzMap.put("xxzm", xxzdqj);
-						xxfcsjqj +=map.get("fcsj").toString()+"-";
-					}
-					if(i<qjlist.size()-1){
-						if(!(qjlist.get(i+1).get("gf").equals("1"))){
-							xxfcsjqj +=map.get("fcsj").toString();
-							qjzMap.put("xxsj",xxfcsjqj);
-							qjzMap.put("xxbc", i+1-numqj);
-							numqj=i+1;
-							xxzdqj ="";
-							xxfcsjqj="";
-						}
-					}else{
-						qjzMap.put("xxsj",xxfcsjqj+"-"+map.get("fcsj").toString());
-						qjzMap.put("xxbc", i+1-numqj);
-						numqj=i+1;
-						xxzdqj ="";
-						xxfcsjqj="";
-					}
-				}
-				if(map.get("gf").toString().equals("2")){
-					if(xxzdqj.equals("")){
-						xxzdqj =map.get("qdz_name").toString();
-						qjwMap.put("xxzm", xxzdqj);
-						xxfcsjqj +=map.get("fcsj").toString()+"-";
-					}
-					if(i<qjlist.size()){
-						if(i==qjlist.size()-1){
-							xxfcsjqj +=map.get("fcsj").toString();
-							qjwMap.put("xxsj",xxfcsjqj);
-							qjwMap.put("xxbc", i+1-numqj);
-							numqj=i+1;
-						}
-					}else{
-						qjwMap.put("xxsj",xxfcsjqj+"-"+xxfcsjqj);
-						qjwMap.put("xxbc", i+1-numqj);
-						numqj=i+1;
-					}
+		for(int i = 0; i < mapList.size(); i++){
+			List<Map<String, String>> l = mapList.get(i);
+			Map<String, Object> tempMap = new HashMap<String, Object>();
+			List<String> upfcsj = new ArrayList<String>();
+			List<String> downfcsj = new ArrayList<String>();
+			String sxqdz = "", xxqdz = "";
+			String sxfcsj = "", xxfcsj = "";
+			int sxbc = 0, xxbc = 0;
+			for(Map<String, String> m : l){
+				if(m.get("xl").equals("0")){
+					sxbc++;
+					upfcsj.add(m.get("fcsj"));
+					if(sxqdz.length() == 0 && m.containsKey("qdz_name"))
+						sxqdz = m.get("qdz_name");
+				} else {
+					xxbc++;
+					downfcsj.add(m.get("fcsj"));
+					if(xxqdz.length() == 0 && m.containsKey("qdz_name"))
+						xxqdz = m.get("qdz_name");
 				}
-				
-			
 			}
+			if(upfcsj.size() != 0)
+				sxfcsj = upfcsj.get(0) + "-" + upfcsj.get(upfcsj.size() - 1);
+			if(downfcsj.size() != 0)
+				xxfcsj = downfcsj.get(0) + "-" + downfcsj.get(downfcsj.size() - 1);
+			tempMap.put("sxqdz", sxqdz);
+			tempMap.put("sxfcsj", i==0?sxfcsj:"");
+			tempMap.put("sxbc", sxbc!=0?sxbc:"");
+			tempMap.put("xxqdz", xxqdz);
+			tempMap.put("xxfcsj", i==0?xxfcsj:"");
+			tempMap.put("xxbc", xxbc!=0?xxbc:"");
+			tempMap.put("bcType", i);
+			if(sxqdz.length()!=0 || xxqdz.length()!=0)
+				list.add(tempMap);
 		}
-		if(!qjzMap.isEmpty()){
-			list.add(qjzMap);
-		}
-		if(!qjwMap.isEmpty()){
-			list.add(qjwMap);
-
-		}
 		return list;
 	}
 	@Override
@@ -769,15 +655,14 @@ public class ReportServiceImpl implements ReportService{
 				String[] minSjs = minfcsj.split(":");
 				int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
 				//查询时间里程
-				String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,2 as xh FROM "
+				String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,2 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"' and "
-						+ " fcsj <='"+minfcsj+"' and  bc_type = 'normal') "
+						+ " fcsj <='"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks') "
 						+ " union "
-						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,1 as xh FROM "
+						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,1 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
-						+ " fcsj >'"+minfcsj+"' and  bc_type ='normal') "
+						+ " fcsj > '"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks') "
 						+ " order by xl_dir,  xh,fcsj";
-						
 				Map<String, Object> map=new HashMap<String,Object>();
 				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 						 new RowMapper<Map<String, Object>>(){
@@ -790,9 +675,10 @@ public class ReportServiceImpl implements ReportService{
 						 m.put("bcType", rs.getString("bc_type"));
 						 m.put("lp", rs.getString("lp"));
 						 m.put("dir", rs.getString("xl_dir"));
+						 m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"");
 						 return m;
 					 }
-				});		
+				});
 		List<Map<String, Object>> newList=new ArrayList<Map<String,Object>>();
 		Map<String, List<Map<String, Object>>> keyMap = new HashMap<String, List<Map<String, Object>>>();
@@ -824,8 +710,9 @@ public class ReportServiceImpl implements ReportService{
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Map<String, Object>> list2 = keyMap.get(key);
 			List<Integer> cjs = new ArrayList<Integer>();
-			int sxsj = 0, xxsj = 0, zcj = 0;
+			int sxsj = 0, xxsj = 0, zcj = 0, tssj = 0;
 			int temp = 24*60+1;
+			boolean ists = false;
 			for(Map<String, Object> m : list2){
 				String[] split = m.get("fcsj").toString().split(":");
 				int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
@@ -838,9 +725,18 @@ public class ReportServiceImpl implements ReportService{
 				}
 				if(temp >= fcsj){
 					temp = fcsj;
+					ists = false;
 				} else {
-					cjs.add(fcsj - temp);
+					if(ists){
+						tssj += fcsj - temp;
+						ists = false;
+					} else {
+						cjs.add(fcsj - temp);
+					}
 					temp = fcsj;
+					if(m.get("ists").equals("1")){
+						ists = true;
+					}
 				}
 			}
 			Collections.sort(cjs);
@@ -852,7 +748,8 @@ public class ReportServiceImpl implements ReportService{
 			tempMap.put("xxsj", xxsj);
 			tempMap.put("fqsj", sxsj + xxsj);
 			tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
-			tempMap.put("pjcj", cjs.size()>0?zcj/(cjs.size()-1):"/");
+			tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
+			tempMap.put("tssj", tssj);
 			maps.put(key, tempMap);
 		}
 		newList.add(maps.get("(首)——6:30"));
@@ -45,7 +45,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>
@@ -165,18 +165,19 @@
 							<div class="col-md-6" >
 								<table  class="table table-bordered table-checkable" id="formsTime5">
 									<tr>
-										<td colspan="6">全日分组行驶时间(区间除外)</td>
+										<td colspan="7">全日分组行驶时间(区间除外)</td>
 									</tr>
 									<tr>
 										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分组   时间</td>
-										<td width="25%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
-										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分圈   时间</td>
-										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
+										<td width="23%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
+										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">分圈时间</td>
+										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">停驶时间</td>
+										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
+										<td width="12%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
 									</tr>
 									<tr>
 										<td>上行</td>
-										<td>下行</td>
+										<td style="text-align:center;">下行</td>
 									</tr>
 									<tbody class="tbody_time_5">
@@ -313,8 +314,8 @@
 				});
 				$.get('/report/tbodyTime4',{line:line,ttinfo:ttinfo},function(result){
-					$("#skb_sxzd").html(result[0].sxzm);
-					$("#skb_xxzd").html(result[0].xxzm);
+					$("#skb_sxzd").html(result[0].sxqdz);
+					$("#skb_xxzd").html(result[0].xxqdz);
 					var tbodyTime4 = template('tbodyTime4',{list:result});
 					$('#formsTime4 .tbody_time_4').html(tbodyTime4);
 				});
@@ -377,11 +378,11 @@
 {{each list as result i}}
 	<tr>
-		<td align="center">{{result.sxzm}}</td>
-		<td align="center">{{result.sxsj}}</td>
+		<td align="center">{{result.sxqdz}}</td>
+		<td align="center">{{result.sxfcsj}}</td>
 		<td align="center">{{result.sxbc}}</td>
-		<td align="center">{{result.xxzm}}</td>
-		<td align="center">{{result.xxsj}}</td>
+		<td align="center">{{result.xxqdz}}</td>
+		<td align="center">{{result.xxfcsj}}</td>
         <td align="center">{{result.xxbc}}</td>
 	</tr>
 {{/each}}
@@ -399,13 +400,14 @@
 		<td align="center">{{result.sxsj}}</td>
 		<td align="center">{{result.xxsj}}</td>
 		<td align="center">{{result.fqsj}}</td>
+		<td align="center">{{result.tssj}}</td>
 		<td align="center">{{result.cjqj}}</td>
 		<td align="center">{{result.pjcj}}</td>
 	</tr>
 {{/each}}
 {{if list.length == 0}}
 		<tr>
-			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -9,6 +9,7 @@
     <script id="schedule-dftz-form-temp" type="text/html">
         <input type="hidden" name="id" value="{{id}}"/>
+        <input type="hidden" name="opType" value="1"/>
         <div class="uk-grid">
             <div class="uk-width-1-2">
                 <div class="uk-form-row">
@@ -191,8 +191,9 @@
                     e.preventDefault();
                     var data = $(this).serializeJSON();
-                    if(data.status==-1 && !data.adjustExps){
-                        notify_err("烂班需要选择调整原因！");
+                    if(!data.adjustExps && (data.status==-1
+                        || (data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out'))){
+                        notify_err("当前操作需要选择调整原因！");
                         return;
                     }
 <div class="uk-modal ct_move_modal" id="safe_dring_list-modal" style="z-index: 99;">
-    <div class="uk-modal-dialog" style="width: 1100px;">
+    <div class="uk-modal-dialog" style="width: 1150px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
             <h2>安全驾驶图像信息（当日）</h2></div>
@@ -26,7 +26,7 @@
                             <option value="A7">行驶中与人交谈</option>
                         </select>
                         <button class="uk-button">检索</button>
-                        <a id="showSSSpVedioModal" style="color: red;float: right;font-size: 12px;">查看实时视频</a>
+                        <!--<a id="showSSSpVedioModal" style="color: red;float: right;font-size: 12px;">查看实时视频</a>-->
                     </fieldset>
                 </form>
             </div>
@@ -34,14 +34,15 @@
             <table class="ct-fixed-table uk-table uk-table-hover">
                 <thead>
                 <tr>
-                    <th style="width: 12%;">线路</th>
-                    <th style="width: 13%;">车辆自编号</th>
-                    <th style="width: 13%;">设备</th>
-                    <th style="width: 13%;">异常类型</th>
-                    <th style="width: 17%;">时间</th>
-                    <th style="width: 11%;">检查属性</th>
-                    <th style="width: 11%;">图像</th>
+                    <th style="width: 10%;">线路</th>
+                    <th style="width: 11%;">车辆自编号</th>
+                    <th style="width: 12%;">设备</th>
+                    <th style="width: 12%;">异常类型</th>
+                    <th style="width: 16%;">时间</th>
+                    <th style="width: 10%;">检查属性</th>
+                    <th style="width: 10%;">图像</th>
                     <th>视频</th>
+                    <th style="width: 8%;">实时视频</th>
                 </tr>
                 </thead>
                 <tbody data-uk-observe>
@@ -75,7 +76,10 @@
                 <a class="image_link" href="{{sd.url}}.jpg" data-uk-lightbox="{group:'jpg_group1'}" title="{{sd.title}}">JPG</a>
             </td>
             <td>
-                <a class="image_link" href="{{sd.url}}.gif" data-uk-lightbox="{group:'gif_group2'}" title="{{sd.title}}">查看视频</a>
+                <a class="image_link" href="{{sd.url}}.gif" data-uk-lightbox="{group:'gif_group2'}" title="{{sd.title}}">查看</a>
+            </td>
+            <td>
+                <a data-type="{{sd.yczltype}}" class="show_vedio_modal">DVR</a>
             </td>
         </tr>
         {{/each}}
@@ -88,9 +92,14 @@
             var page = 0;
             var pageSize = 12;
-            $('#showSSSpVedioModal', modal).on('click', function () {
+            /*$('#showSSSpVedioModal', modal).on('click', function () {
                 gb_safe_driv.showVedioModal();
+            });*/
+            //show_vedio_modal
+            $(modal).on('click', '.show_vedio_modal', function () {
+                gb_safe_driv.showVedioModal($(this).data('type'));
             });
+
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
@@ -18,7 +18,8 @@ var gb_schedule_table_dbclick = (function() {
             gb_common.$post('/realSchedule/outgoAdjust', {
                 id: id,
                 dfsj: val,
-                remarks: ''
+                remarks: '',
+                opType: '0'
             }, function(rs) {
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('待发调整成功！');
@@ -10,7 +10,8 @@ var gb_safe_driv = (function () {
         'A4': '未戴袖章',
         'A5': '眨眼/疲劳驾驶',
         'A6': '打哈欠/打瞌睡',
-        'A7': '与人交谈'
+        'A7': '与人交谈',
+        'A9': '玩手机'
     };
     var path = 'http://118.178.187.115/CurrentSafeDriving/';
@@ -32,7 +33,7 @@ var gb_safe_driv = (function () {
         //图片地址
         var p = (sd.sbbh+'_'+sd.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
         var url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
-        sd.url = path + url + '.jpg';
+        sd.url = path + url + '.gif';
         var htmlStr = template('safe_driv_item-temp', sd);
         var items = $wrap.find('.safe_driv_pop'), len = items.length;
@@ -46,12 +47,12 @@ var gb_safe_driv = (function () {
                         '<div class="uk-modal-dialog uk-modal-dialog-large">' +
                         '<button type="button" class="uk-modal-close uk-close"></button>' +
                         '<div class="uk-modal-header"> <h2>实时视频</h2> </div> '+
-                        '<p class="loading"><i class="uk-icon-spinner uk-icon-spin"></i> 载入资源...</p><iframe id="vedioIframe" src="http://222.66.0.204:8910/transport_server/dvr_monitor1.jsp?deviceId=229L0650&channel=0"></iframe>' +
+                        '<p class="loading"><i class="uk-icon-spinner uk-icon-spin"></i> 载入资源...</p><iframe id="vedioIframe" src="http://222.66.0.204:8910/transport_server/dvr_monitor1.jsp?deviceId=229L0650&channel=^^channel^^"></iframe>' +
                         '</div>' +
                     '</div>';
     $wrap.on('click', '.safe_driv_pop', function () {
-        var title = $(this).data('title') + '&nbsp;<button class="uk-button uk-button-mini uk-button-primary" id="openVedioModalBtn" type="button">查看实时视频</button>';
+        var title = $(this).data('title') + '&nbsp;<button data-type="'+$(this).data('type')+'" class="uk-button uk-button-mini uk-button-primary" id="openVedioModalBtn" type="button">查看实时视频</button>';
         var url = $(this).data('url');
         $(this).remove();
         var lightbox = UIkit.lightbox.create([
@@ -61,8 +62,19 @@ var gb_safe_driv = (function () {
         lightbox.show();
     });
-    var showVedioModal = function () {
-        open_modal_dom(vedioModal ,{}, {modal: false});
+    var channelMap = {
+        'A1': 1,
+        'A2': 1,
+        'A3': 1,
+        'A9': 1,
+        'A4': 2,
+        'A5': 2,
+        'A6': 2,
+        'A7': 2
+    };
+    var showVedioModal = function (type) {
+        var channel = channelMap[type]?channelMap[type]:1;
+        open_modal_dom(vedioModal.replace('^^channel^^', channel) ,{}, {modal: false});
         $('#ssspVedioModal #vedioIframe').on('load', function () {
             var that = this;
             setTimeout(function () {
@@ -72,7 +84,9 @@ var gb_safe_driv = (function () {
         });
     };
-    $(document).on('click', '#openVedioModalBtn', showVedioModal);
+    $(document).on('click', '#openVedioModalBtn', function () {
+        showVedioModal($(this).data('type'));
+    });
     return {
@@ -206,7 +206,7 @@
 <!-- #### 安全驾驶 start ###  -->
 <div class="safe_driv_pop_wrap" ></div>
 <script id="safe_driv_item-temp" type="text/html">
-    <div class="safe_driv_pop uk-animation-slide-bottom" data-title="{{clzbh}} {{timeStr}} {{ycztText}}" data-url="{{url}}">
+    <div class="safe_driv_pop uk-animation-slide-bottom" data-type="{{yczltype}}" data-title="{{clzbh}} {{timeStr}} {{ycztText}}" data-url="{{url}}">
         <div>
             <span class="title">异常&nbsp;{{clzbh}}</span>
             <span class="text"> {{timeStr}} 出现违规驾驶（{{ycztText}}）</span>