Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control into minhang

sgz
2 parents b954c764 5dab9b2a
Showing 66 changed files with 2997 additions and 910 deletions
pom.xml
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/safe_driv/SafeDriv.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/gps/entity/GpsOutbound.java
src/main/java/com/bsth/service/gps/entity/GpsOutbound_DTO.java
src/main/java/com/bsth/service/gps/entity/GpsSpeed.java
@@ -237,6 +237,27 @@
 			<version>1.13</version>
 		</dependency>
  
+        <dependency>
+            <groupId>org.dbunit</groupId>
+            <artifactId>dbunit</artifactId>
+            <version>2.4.9</version>
+            <scope>test</scope>
+
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.2.132</version>
+            <scope>test</scope>
+        </dependency>
+
 	</dependencies>
  
 	<dependencyManagement>
@@ -108,4 +108,22 @@ public class GpsController {
     public Map<String, Object> history_v2(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
         return gpsService.history_v2(nbbm, st, et);
     }
+
+    /**
+     * 安全驾驶数据 分页查询
+     * @param map
+     * @param page
+     * @param size
+     * @param order
+     * @param direction
+     * @return
+     */
+    @RequestMapping(value = "/safeDriv")
+    public Map<String, Object> safeDrivList(@RequestParam Map<String, Object> map,
+                                       @RequestParam(defaultValue = "0") int page,
+                                       @RequestParam(defaultValue = "15") int size,
+                                       @RequestParam(defaultValue = "timestamp") String order,
+                                       @RequestParam(defaultValue = "DESC") String direction){
+        return gpsService.safeDrivList(map , page, size, order, direction);
+    }
 }
@@ -369,8 +369,35 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
  
 	@RequestMapping(value="/statisticsDailyTj")
-	public List<Map<String,Object>> statisticsDailyTj(@RequestParam String gsdm,@RequestParam String fgsdm, @RequestParam String line, @RequestParam String date,
-			@RequestParam String date2,@RequestParam String xlName, @RequestParam String type){
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString();
+		}
 		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
  
@@ -155,12 +155,32 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
         else if(sch.getBcType().equals("out")){
             ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            //如果下一个班次是区间，并且是环线
+            if(next != null && next.getBcType().equals("region")){
+                next = dayOfSchedule.nextSame(next);
+                if(next == null || !next.getQdzName().equals(next.getZdzName())){
+                    return;
+                }
+            }
             if(next != null && prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
                 dayOfSchedule.addExecPlan(next);
                 outStation(gps, prev);
             }
         }
+        //当前班次是区间
+        else if(sch.getBcType().equals("region")){
+            ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
+            if(next==null || !next.getQdzName().equals(next.getZdzName())){
+                return;
+            }
+            //是环线
+            if(prev.getStopNo().equals(next.getQdzCode())){
+                //发下一个班次
+                dayOfSchedule.addExecPlan(next);
+                outStation(gps, prev);
+            }
+        }
     }
  
  
@@ -260,7 +280,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             //如果当前班次是出场，并且进的是下一个班次的终点
             if(sch.getBcType().equals("out")){
                 ScheduleRealInfo next = dayOfSchedule.next(sch);
-                if(next.getZdzCode().equals(gps.getStopNo())){
+                if(next != null && next.getZdzCode().equals(gps.getStopNo())){
                     List<ScheduleRealInfo> halfList = dayOfSchedule.findByNbbm(sch.getClZbh());
                     //和当前进站信号最匹配的一个班次
                     ScheduleRealInfo nearSch = nearScheduleByGpsIn(gps, halfList);
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("SXC-YD012"))
+            /*if(nbbm.equals("W9G-013"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
  
@@ -150,6 +150,8 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 CircleQueue<GpsEntity> prevs;
                 boolean task;
                 for (GpsEntity gps : list) {
+                    /*if(gps.getTimestamp() > 1491951840000L)
+                        System.out.print("");*/
  
                     //是否有任务
  
-package com.bsth.data.safe_driv;
-
-/**
- * 安全驾驶
- * Created by panzhao on 2017/4/6.
- */
-public class SafeDriv {
-
-    /**
-     * 时间
-     * 2017-04-06 08:00:00.0
-     */
-    private String Startime;
-
-    /**
-     * 时间戳
-     */
-    private Long ts;
-
-    /**
-     * 设备编号
-     */
-    private String sbbh;
-
-    /**
-     * 线路名称
-     */
-    private String xlmc;
-
-    /**
-     * 车辆自编号
-     */
-    private String clzbh;
-
-    /**
-     * 车牌号
-     */
-    private String cph;
-
-    /**
-     * 检查属性
-     * 双脱手 0 单脱手 1 其他为0都是异常
-     */
-    private String jctype;
-
-    /**
-     * 异常种类
-     * 手部检测: 1
-     * 脸部检测: 5
-     * 摄像头检测: 2
-     * 安全带检测: 3
-     * 袖章检测: 4
-     */
-    private String yczltype;
-
-    @Override
-    public int hashCode() {
-        return ("safe_" + (this.getClzbh() + this.getStartime())).hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        SafeDriv s2 = (SafeDriv)obj;
-        return (this.getClzbh() + this.getStartime()).equals(s2.getClzbh() + s2.getStartime());
-    }
-
-    public String getStartime() {
-        return Startime;
-    }
-
-    public void setStartime(String startime) {
-        Startime = startime;
-    }
-
-    public String getSbbh() {
-        return sbbh;
-    }
-
-    public void setSbbh(String sbbh) {
-        this.sbbh = sbbh;
-    }
-
-    public String getXlmc() {
-        return xlmc;
-    }
-
-    public void setXlmc(String xlmc) {
-        this.xlmc = xlmc;
-    }
-
-    public String getClzbh() {
-        return clzbh;
-    }
-
-    public void setClzbh(String clzbh) {
-        this.clzbh = clzbh;
-    }
-
-    public String getCph() {
-        return cph;
-    }
-
-    public void setCph(String cph) {
-        this.cph = cph;
-    }
-
-    public String getJctype() {
-        return jctype;
-    }
-
-    public void setJctype(String jctype) {
-        this.jctype = jctype;
-    }
-
-    public String getYczltype() {
-        return yczltype;
-    }
-
-    public void setYczltype(String yczltype) {
-        this.yczltype = yczltype;
-    }
-
-    public Long getTs() {
-        return ts;
-    }
-
-    public void setTs(Long ts) {
-        this.ts = ts;
-    }
-}
+package com.bsth.data.safe_driv;
+
+/**
+ * 安全驾驶
+ * Created by panzhao on 2017/4/6.
+ */
+public class SafeDriv {
+
+    /**
+     * 时间
+     * 2017-04-06 08:00:00.0
+     */
+    private String Startime;
+
+    /**
+     * 时间戳
+     */
+    private Long ts;
+
+    /**
+     * 设备编号
+     */
+    private String sbbh;
+
+    /**
+     * 线路名称
+     */
+    private String xlmc;
+
+    private String xlbm;
+
+    /**
+     * 车辆自编号
+     */
+    private String clzbh;
+
+    /**
+     * 车牌号
+     */
+    private String cph;
+
+    /**
+     * 检查属性
+     * 双脱手 0 单脱手 1 其他为0都是异常
+     */
+    private String jctype;
+
+    /**
+     * 异常种类
+     * 手部检测: 1
+     * 脸部检测: 5
+     * 摄像头检测: 2
+     * 安全带检测: 3
+     * 袖章检测: 4
+     */
+    private String yczltype;
+
+    @Override
+    public int hashCode() {
+        return ("safe_" + (this.getClzbh() + this.getStartime())).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        SafeDriv s2 = (SafeDriv)obj;
+        return (this.getClzbh() + this.getStartime()).equals(s2.getClzbh() + s2.getStartime());
+    }
+
+    public String getStartime() {
+        return Startime;
+    }
+
+    public void setStartime(String startime) {
+        Startime = startime;
+    }
+
+    public String getSbbh() {
+        return sbbh;
+    }
+
+    public void setSbbh(String sbbh) {
+        this.sbbh = sbbh;
+    }
+
+    public String getXlmc() {
+        return xlmc;
+    }
+
+    public void setXlmc(String xlmc) {
+        this.xlmc = xlmc;
+    }
+
+    public String getClzbh() {
+        return clzbh;
+    }
+
+    public void setClzbh(String clzbh) {
+        this.clzbh = clzbh;
+    }
+
+    public String getCph() {
+        return cph;
+    }
+
+    public void setCph(String cph) {
+        this.cph = cph;
+    }
+
+    public String getJctype() {
+        return jctype;
+    }
+
+    public void setJctype(String jctype) {
+        this.jctype = jctype;
+    }
+
+    public String getYczltype() {
+        return yczltype;
+    }
+
+    public void setYczltype(String yczltype) {
+        this.yczltype = yczltype;
+    }
+
+    public Long getTs() {
+        return ts;
+    }
+
+    public void setTs(Long ts) {
+        this.ts = ts;
+    }
+
+    public String getXlbm() {
+        return xlbm;
+    }
+
+    public void setXlbm(String xlbm) {
+        this.xlbm = xlbm;
+    }
+}
-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;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 安全驾驶
- * Created by panzhao on 2017/4/6.
- */
-@Component
-public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware {
-
-    private static Set<SafeDriv> data;
-
-    @Autowired
-    SafeDrivDataLoadThread safeDrivDataLoadThread;
-
-    static SendUtils sendUtils;
-
-    /**
-     * 车辆自编号 和 最新一条数据对照
-     */
-    private static Map<String, SafeDriv> safeMap;
-
-    static {
-        data = new HashSet<>();
-        safeMap = new HashMap<>();
-    }
-
-    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
-    public static void put(SafeDriv sd){
-        sd.setTs(fmt.parseMillis(sd.getStartime()));
-        data.add(sd);
-
-        if(sd.getYczltype().indexOf("A") == -1)
-            sd.setYczltype("A" + sd.getYczltype());
-
-        SafeDriv old = safeMap.get(sd.getClzbh());
-        if(old == null || sd.getTs() > old.getTs()){
-            //通知客户端
-            sendUtils.sendSafeDriv(sd);
-        }
-
-        safeMap.put(sd.getClzbh(), sd);
-    }
-
-    @Override
-    public void run(String... strings) throws Exception {
-        //定时加载安全驾驶数据
-        Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 5, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        sendUtils = applicationContext.getBean(SendUtils.class);
-    }
-}
+package com.bsth.data.safe_driv;
+
+import com.bsth.websocket.handler.SendUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 安全驾驶
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware {
+
+    private static Set<SafeDriv> data;
+
+    @Autowired
+    SafeDrivDataLoadThread safeDrivDataLoadThread;
+
+    static SendUtils sendUtils;
+
+    /**
+     * 车辆自编号 和 最新一条数据对照
+     */
+    private static Map<String, SafeDriv> safeMap;
+
+    static {
+        data = new HashSet<>();
+        safeMap = new HashMap<>();
+    }
+
+    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
+    public static void put(SafeDriv sd){
+        sd.setTs(fmt.parseMillis(sd.getStartime()));
+
+        if(sd.getYczltype().indexOf("A") == -1)
+            sd.setYczltype("A" + sd.getYczltype());
+
+        //SafeDriv old = safeMap.get(sd.getClzbh());
+        if(!data.contains(sd)){
+            //通知客户端
+            sendUtils.sendSafeDriv(sd);
+            data.add(sd);
+            safeMap.put(sd.getClzbh(), sd);
+        }
+    }
+
+    public static Set<SafeDriv> findAll(){
+        return data;
+    }
+
+    public static void clear(){
+        data = new HashSet<>();
+        safeMap = new HashMap<>();
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        //定时加载安全驾驶数据
+        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 4, TimeUnit.SECONDS);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        sendUtils = applicationContext.getBean(SendUtils.class);
+    }
+}
-package com.bsth.data.safe_driv;
-
-import com.alibaba.fastjson.JSON;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.List;
-
-/**
- * 安全驾驶数据加载线程
- * Created by panzhao on 2017/4/6.
- */
-@Component
-public class SafeDrivDataLoadThread extends Thread{
-
-    private final static String url = "http://180.166.5.82:9988//bsth-safedriving/Crlcxb/realtimeInterface.do";
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public void run() {
-        List<SafeDriv> list = null;
-        CloseableHttpClient httpClient = null;
-        CloseableHttpResponse response = null;
-        try {
-            httpClient = HttpClients.createDefault();
-            HttpGet get = new HttpGet(url);
-
-            response = httpClient.execute(get);
-
-            HttpEntity entity = response.getEntity();
-            if (null != entity) {
-                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-                StringBuffer stringBuffer = new StringBuffer();
-                String str = "";
-                while ((str = br.readLine()) != null)
-                    stringBuffer.append(str);
-
-
-                list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
-                /**
-                 * 模拟数据
-
-                SafeDriv sd1 = new SafeDriv();
-                sd1.setYczltype("1");
-                sd1.setClzbh("W2B-001");
-                sd1.setStartime("2017-04-07 08:00:00.0");
-
-                SafeDriv sd2 = new SafeDriv();
-                sd2.setYczltype("2");
-                sd2.setClzbh("W2B-002");
-                sd2.setStartime("2017-04-07 08:02:00.0");
-
-                SafeDriv sd3 = new SafeDriv();
-                sd3.setYczltype("3");
-                sd3.setClzbh("W2B-003");
-                sd3.setStartime("2017-04-07 08:03:00.0");
-
-                SafeDriv sd4 = new SafeDriv();
-                sd4.setYczltype("4");
-                sd4.setClzbh("W2B-004");
-                sd4.setStartime("2017-04-07 08:04:00.0");
-
-                SafeDriv sd5 = new SafeDriv();
-                sd5.setYczltype("5");
-                sd5.setClzbh("W2B-005");
-                sd5.setStartime("2017-04-07 08:05:00.0");
-
-                list.add(sd1);
-                list.add(sd2);
-                list.add(sd3);
-                list.add(sd4);
-                list.add(sd5);
-                 */
-                for(SafeDriv sd : list){
-                    SafeDrivCenter.put(sd);
-                }
-            }
-
-            httpClient.close();
-            response.close();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-}
+package com.bsth.data.safe_driv;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.List;
+
+/**
+ * 安全驾驶数据加载线程
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivDataLoadThread extends Thread{
+
+    private final static String url = "http://180.166.5.82:9988//bsth-safedriving/Crlcxb/realtimeInterface.do";
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        List<SafeDriv> list = null;
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpGet get = new HttpGet(url);
+
+            response = httpClient.execute(get);
+
+            HttpEntity entity = response.getEntity();
+            if (null != entity) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                StringBuffer stringBuffer = new StringBuffer();
+                String str = "";
+                while ((str = br.readLine()) != null)
+                    stringBuffer.append(str);
+
+
+                list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
+                /**
+                 * 模拟数据
+
+                SafeDriv sd1 = new SafeDriv();
+                sd1.setYczltype("1");
+                sd1.setClzbh("W2B-001");
+                sd1.setStartime("2017-04-07 08:00:00.0");
+
+                SafeDriv sd2 = new SafeDriv();
+                sd2.setYczltype("2");
+                sd2.setClzbh("W2B-002");
+                sd2.setStartime("2017-04-07 08:02:00.0");
+
+                SafeDriv sd3 = new SafeDriv();
+                sd3.setYczltype("3");
+                sd3.setClzbh("W2B-003");
+                sd3.setStartime("2017-04-07 08:03:00.0");
+
+                SafeDriv sd4 = new SafeDriv();
+                sd4.setYczltype("4");
+                sd4.setClzbh("W2B-004");
+                sd4.setStartime("2017-04-07 08:04:00.0");
+
+                SafeDriv sd5 = new SafeDriv();
+                sd5.setYczltype("5");
+                sd5.setClzbh("W2B-005");
+                sd5.setStartime("2017-04-07 08:05:00.0");
+
+                list.add(sd1);
+                list.add(sd2);
+                list.add(sd3);
+                list.add(sd4);
+                list.add(sd5);
+                 */
+                for(SafeDriv sd : list){
+                    SafeDrivCenter.put(sd);
+                }
+            }
+
+            httpClient.close();
+            response.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+}
@@ -138,7 +138,7 @@ public class DayOfSchedule implements CommandLineRunner {
         //dataRecovery();
  
         //翻班线程
-        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
 //        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
         //班次误点扫描
@@ -384,9 +384,9 @@ public class DayOfSchedule implements CommandLineRunner {
                 }
  
                 sch.setJhlcOrig(sch.getJhlc());
-                //计划里程为0，设置NULL
-                //if (sch.getJhlc() != null && sch.getJhlc() == 0)
-                //    sch.setJhlc(null);
+                //保留备注
+                if(StringUtils.isNotEmpty(sch.getRemark()))
+                    sch.setRemarks(sch.getRemark());
             }
         } catch (Exception e) {
             logger.error("", e);
 package com.bsth.data.schedule.thread;
  
+import com.bsth.service.oil.DlbService;
+import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,7 +17,8 @@ public class CalcOilThread extends Thread{
  
     @Autowired
     YlbService ylbService;
-
+    @Autowired
+    DlbService dlbService;
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
     @Override
@@ -23,7 +26,11 @@ public class CalcOilThread extends Thread{
         try{
             logger.info("开始计算路单里程加注量....");
             ylbService.obtainDsq();
+            dlbService.obtainDsq();
             logger.info("计算路单里程加注量结束！");
+
+            //清除安全驾驶数据 先临时蹭这个线程
+            SafeDrivCenter.clear();
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
@@ -223,7 +223,7 @@ public class ChildTaskPlan {
  
 	@Override
 	public int hashCode() {
-		return ("" + this.getId() + this.getSchedule().getId()).hashCode();
+		return ("cTask" + this.getId() + this.getSchedule().getId()).hashCode();
 	}
  
 	@Override
@@ -145,6 +145,9 @@ public class ScheduleRealInfo {
  
 	/** 备注*/
 	private String remarks;
+
+	/** 原计划排班备注 */
+	private String remark;
  
 	/**待发时间（格式 HH:mm） */
 	private String dfsj;
@@ -168,7 +171,7 @@ public class ScheduleRealInfo {
 	private String qdzArrDatesj;
  
 	/** 子任务 */
-	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "schedule")
 	private Set<ChildTaskPlan> cTasks = new HashSet<>();
  
 	/** 关联的公司名称 */
@@ -875,4 +878,12 @@ public class ScheduleRealInfo {
 		else
 			this.setLate(false);
 	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 }
@@ -128,6 +128,9 @@ public class SchedulePlanInfo {
     /** 关联的时刻表名字 */
     private String ttInfoName;
  
+    /** 时刻表的明细备注 */
+    private String remark;
+
  
     /** 创建人 */
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
@@ -269,6 +272,9 @@ public class SchedulePlanInfo {
         // 使用的时刻表名字
         this.ttInfoName = ttInfoDetail.getTtinfo().getName();
  
+        // 备注信息
+        this.remark = ttInfoDetail.getRemark();
+
         // 使用车辆配置的停车场信息
         String pzType = carConfigInfo.getPzType(); // 配置类型
         if (pzType != null && !pzType.equals("BSY")) {
@@ -648,4 +654,12 @@ public class SchedulePlanInfo {
     public void setTtInfoName(String ttInfoName) {
         this.ttInfoName = ttInfoName;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
@@ -155,8 +155,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2,String gsdm,String fgsdm);
  
 	//按照时间段统计
-		@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
-		List<ScheduleRealInfo> scheduleByDateAndLineTj2(String line,String date,String date2);
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLineTj2(String line,String date,String date2);
+		//月报表
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3  order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
  
 	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY clZbh,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
@@ -35,21 +35,22 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "info.cl_zbh as clZbh, " +
             "group_concat(info.fcsj order by info.fcno) ccsj, " +
             "group_concat(info.bc_type order by info.fcno) bctype, " +
-            "group_concat(distinct info.j) jsyId, " +
-            "group_concat(distinct info.j_gh) jsyGh, " +
-            "group_concat(distinct info.j_name) jsyName, " +
-            "group_concat(distinct info.s) spyId, " +
-            "group_concat(distinct info.s_gh) spyGh, " +
-            "group_concat(distinct info.s_name) spyName, " +
+            "group_concat(distinct info.j order by info.fcno) jsyId, " +
+            "group_concat(distinct info.j_gh order by info.fcno) jsyGh, " +
+            "group_concat(distinct info.j_name order by info.fcno) jsyName, " +
+            "group_concat(distinct info.s order by info.fcno) spyId, " +
+            "group_concat(distinct info.s_gh order by info.fcno) spyGh, " +
+            "group_concat(distinct info.s_name order by info.fcno) spyName, " +
             "group_concat(info.fcno order by info.fcno) fcno, " +
             "max(info.update_date) as updateDate, " +
             "max(user.user_name) as updateUserName, " +
             "max(info.tt_info_name) as ttInfoName " +
             "from bsth_c_s_sp_info info left join bsth_c_sys_user user on info.update_by = user.id " +
+            "left join bsth_c_s_gbi gbi on info.lp = gbi.id " +
             "where info.xl = ?1 and " +
             "info.schedule_date = ?2 " +
             "group by info.xl_name, info.schedule_date, info.lp, info.lp_name, info.cl, info.cl_zbh " +
-            "order by info.xl_name, info.schedule_date, info.lp ", nativeQuery = true)
+            "order by info.xl_name, info.schedule_date, gbi.lp_no ", nativeQuery = true)
     List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
  
     @Modifying
 package com.bsth.service.gps;
  
+import com.bsth.service.gps.entity.GpsOutbound_DTO;
+import com.bsth.service.gps.entity.GpsSpeed_DTO;
+
 import java.util.List;
 import java.util.Map;
  
@@ -20,4 +23,10 @@ public interface GpsService {
     Map<String,Object> gpsCompletion(long schId);
  
 	Map<String,Object> history_v2(String nbbm, long st, long et);
+
+	List<GpsSpeed_DTO> speeds(String nbbm, long st, long et);
+
+	List<GpsOutbound_DTO> outbounds(String nbbm, long st, long et);
+
+	Map<String, Object> safeDrivList(Map<String, Object> map, int page, int size, String order, String direction);
 }
@@ -6,11 +6,15 @@ import com.bsth.data.arrival.ArrivalEntity;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.bsth.data.safe_driv.SafeDriv;
+import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.gps.entity.GpsOutbound_DTO;
+import com.bsth.service.gps.entity.GpsSpeed_DTO;
 import com.bsth.service.gps.entity.HistoryGps_DTO;
 import com.bsth.service.gps.entity.Road_DTO;
 import com.bsth.util.DateUtils;
@@ -29,6 +33,7 @@ import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.text.DecimalFormat;
 import java.util.*;
  
 @Service
@@ -192,7 +197,6 @@ public class GpsServiceImpl implements GpsService {
                 return (int) (Long.parseLong(o1.get("ts").toString()) - Long.parseLong(o2.get("ts").toString()));
             }
         });
-        ;
         return list;
     }
  
@@ -207,10 +211,10 @@ public class GpsServiceImpl implements GpsService {
         inv = inv.substring(0, inv.length() - 1);
  
         // 查询到离站数据
-        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
+        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear, st, et, inv);
  
         String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS from bsth_c_gps_info where days_year=? and device_id in ("
-                + inv + ") and ts > ? and ts < ?";
+                + inv + ") and ts > ? and ts < ? ORDER BY device_id,ts,stop_no";
         try {
             conn = DBUtils_MS.getConnection();
             ps = conn.prepareStatement(sql);
@@ -296,6 +300,9 @@ public class GpsServiceImpl implements GpsService {
                 prefix = lineId + "_" + updown + "_";
                 stationName = BasicData.getStationNameByCode(rs.getString("STOP_NO"), prefix);
  
+                if (StringUtils.isEmpty(stationName))
+                    continue;
+
                 arr = new ArrivalEntity(rs.getString("DEVICE_ID"), rs.getLong("TS"), lineId,
                         updown, rs.getString("STOP_NO"), rs.getInt("IN_OUT"), rs.getLong("CREATE_DATE"),
                         rs.getInt("WEEKS_YEAR"), stationName);
@@ -352,17 +359,12 @@ public class GpsServiceImpl implements GpsService {
             //过滤后的
             List<GpsEntity> rs = new ArrayList<>();
             Field[] fields = GpsEntity.class.getDeclaredFields();
-            //排序字段
-            Field orderField = null;
             //参与过滤的字段
             List<Field> fs = new ArrayList<>();
             for (Field f : fields) {
                 f.setAccessible(true);
                 if (map.containsKey(f.getName()))
                     fs.add(f);
-
-                if (f.getName().equals(order))
-                    orderField = f;
             }
             //过滤数据
             for (GpsEntity gps : list) {
@@ -370,9 +372,6 @@ public class GpsServiceImpl implements GpsService {
                     rs.add(gps);
             }
  
-            //排序
-/*            if (null != orderField)
-                sortGpsList(orderField, rs);*/
             //时间戳排序
             Collections.sort(rs, new Comparator<GpsEntity>() {
                 @Override
@@ -444,7 +443,7 @@ public class GpsServiceImpl implements GpsService {
                 return rs;
             }
  
-            if(sch.isReissue()){
+            if (sch.isReissue()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "你不能重复这个操作");
                 return rs;
@@ -453,7 +452,7 @@ public class GpsServiceImpl implements GpsService {
             String sql = "select * from bsth_gps_template where line_id='" + sch.getXlBm() + "' and up_down=" + sch.getXlDir();
             List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
  
-            if(list.size() == 0){
+            if (list.size() == 0) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "缺少模板数据，请联系系统管理员！！");
                 return rs;
@@ -470,21 +469,20 @@ public class GpsServiceImpl implements GpsService {
             int diff = (int) (sch.getDfsjT() - Long.parseLong(fs.get("ts").toString()) - 1000 * 70);
  
             String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
-            for(Map<String, Object> map : list){
+            for (Map<String, Object> map : list) {
                 map.put("device_id", deviceId);
                 map.put("ts", Long.parseLong(map.get("ts").toString()) + diff);
             }
  
-            String sqlBefore = "insert into bsth_c_template("
-                    ,sqlValues = " values(";
+            String sqlBefore = "insert into bsth_c_template(", sqlValues = " values(";
  
             Set<String> ks = fs.keySet();
-            for(String k : ks){
+            for (String k : ks) {
                 sqlBefore += (k + ",");
                 sqlValues += "?,";
             }
             sqlBefore = sqlBefore.substring(0, sqlBefore.length() - 1) + ", create_ts)";
-            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ", "+System.currentTimeMillis()+")";
+            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ", " + System.currentTimeMillis() + ")";
             sql = sqlBefore + " " + sqlValues;
  
             Connection conn = DBUtils_MS.getConnection();
@@ -492,9 +490,9 @@ public class GpsServiceImpl implements GpsService {
             ps = conn.prepareStatement(sql);
             int fsize = ks.size();
             List<Object> vs;
-            for(Map<String, Object> map : list){
+            for (Map<String, Object> map : list) {
                 vs = new ArrayList<>(map.values());
-                for(int i = 0; i < fsize; i ++){
+                for (int i = 0; i < fsize; i++) {
                     ps.setObject(i + 1, vs.get(i));
                 }
                 ps.addBatch();
@@ -523,30 +521,122 @@ public class GpsServiceImpl implements GpsService {
         try {
             //获取历史gps 数据
             List<HistoryGps_DTO> list = HistoryGps_DTO.craete(history(new String[]{nbbm}, st, et));
-            if(list!=null && list.size() > 0){
+            if (list != null && list.size() > 0) {
                 //获取路段信息
                 String sql = "select ID, ST_AsText(GROAD_VECTOR) as GROAD_VECTOR,ROAD_CODE,ROAD_NAME,SPEED from bsth_c_road where road_code in(select section_code from bsth_c_sectionroute where line_code=? and destroy=0)";
                 List<Road_DTO> roads = Road_DTO.craete(jdbcTemplate.queryForList(sql, list.get(0).getLineId()));
  
                 //为GPS数据关联路段信息
-                for(HistoryGps_DTO gps : list){
+                for (HistoryGps_DTO gps : list) {
                     matchRoadToGps(gps, roads);
                 }
             }
  
+            //超速数据
+            List<GpsSpeed_DTO> speedList = speeds(nbbm, st, et);
+            //越界数据
+            List<GpsOutbound_DTO> outboundList = outbounds(nbbm, st, et);
+            //计算里程
+            List<HistoryGps_DTO> effList = new ArrayList<>();
+            for(HistoryGps_DTO gps : list){
+                if(gps.getLat() != 0 && gps.getLon() != 0)
+                    effList.add(gps);
+            }
+            double sum = 0, dist;
+            for (int i = 0; i < effList.size() - 1; i++) {
+                dist = GeoUtils.getDistance(effList.get(i).getPoint(), effList.get(i + 1).getPoint());
+                //点位相同时，dist会NaN
+                if(String.valueOf(dist).matches("^[0.0-9.0]+$"))
+                    sum += dist;
+            }
+
             rs.put("status", ResponseCode.SUCCESS);
-            rs.put("list", list);
-        }catch (Exception e){
+            rs.put("list", removeDuplicate(effList));
+            rs.put("speedList", speedList);
+            rs.put("outboundList", outboundList);
+            rs.put("sumMileage", new DecimalFormat(".##").format(sum / 1000));
+        } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
         }
         return rs;
     }
  
-    private void matchRoadToGps(HistoryGps_DTO gps, List<Road_DTO> roads){
-        double min = -1,distance;
+    @Override
+    public List<GpsSpeed_DTO> speeds(String nbbm, long st, long et) {
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_speeding where vehicle=? and timestamp>? and timestamp<?";
+
+        return GpsSpeed_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st * 1000, et * 1000));
+    }
+
+    @Override
+    public List<GpsOutbound_DTO> outbounds(String nbbm, long st, long et) {
+        /**
+         * 如果 st 和 et 跨了周分区，也只查询st 分区的数据。
+         */
+        st = st * 1000;
+        et = et * 1000;
+        //按周分区
+        Calendar weekCal = Calendar.getInstance();
+        weekCal.setTimeInMillis(st);
+        int weekYear = weekCal.get(Calendar.WEEK_OF_YEAR);
+        //设备号
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        String sql = "select vehicle,line,up_down,lon,lat,timestamp from bsth_c_outbound where weeks_year=" + weekYear + " and vehicle=? and timestamp>? and timestamp<?";
+        return GpsOutbound_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st, et));
+    }
+
+    @Override
+    public Map<String, Object> safeDrivList(Map<String, Object> map, int page, int size, String order, String direction) {
+        Map<String, Object> rsMap = new HashMap<>();
+        try {
+            //全量
+            List<SafeDriv> list = new ArrayList<>(SafeDrivCenter.findAll());
+            //过滤后的
+            List<SafeDriv> rs = new ArrayList<>();
+            Field[] fields = SafeDriv.class.getDeclaredFields();
+            //参与过滤的字段
+            List<Field> fs = new ArrayList<>();
+            for (Field f : fields) {
+                f.setAccessible(true);
+                if (map.containsKey(f.getName()))
+                    fs.add(f);
+            }
+            //过滤数据
+            for (SafeDriv sd : list) {
+                if (fieldEquals(fs, sd, map))
+                    rs.add(sd);
+            }
+
+            //时间戳排序
+            Collections.sort(rs, new Comparator<SafeDriv>() {
+                @Override
+                public int compare(SafeDriv o1, SafeDriv o2) {
+                    return o2.getTs().intValue() - o1.getTs().intValue();
+                }
+            });
+
+            //分页
+            int count = rs.size(), s = page * size, e = s + size;
+            if (e > count)
+                e = count;
+
+            rsMap.put("list", rs.subList(s, e));
+            rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
+            rsMap.put("page", page);
+            rsMap.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rsMap.put("status", ResponseCode.ERROR);
+        }
+        return rsMap;
+    }
+
+    private void matchRoadToGps(HistoryGps_DTO gps, List<Road_DTO> roads) {
+        double min = -1, distance;
         Road_DTO nearRoad = null;
-        for(Road_DTO road : roads){
+        for (Road_DTO road : roads) {
             distance = GeoUtils.getDistanceFromLine(road.getLineStr(), gps.getPoint());
  
             if (min > distance || min == -1) {
@@ -559,6 +649,20 @@ public class GpsServiceImpl implements GpsService {
         gps.setRoadMinDistance(min);
     }
  
+    /**
+     * 去重复
+     *
+     * @param list
+     * @return
+     */
+    private Set<HistoryGps_DTO> removeDuplicate(List<HistoryGps_DTO> list) {
+        Set<HistoryGps_DTO> set = new HashSet<>();
+        for (HistoryGps_DTO gps : list) {
+            set.add(gps);
+        }
+        return set;
+    }
+
     private void sortGpsList(final Field f, List<GpsEntity> rs) {
         Collections.sort(rs, new Comparator<GpsEntity>() {
  
+package com.bsth.service.gps.entity;
+
+/**
+ * 越界异常  --ms数据库格式
+ * Created by panzhao on 2017/4/9.
+ */
+public class GpsOutbound {
+
+    private String vehicle;
+
+    private String line;
+
+    private int up_down;
+
+    private float lon;
+
+    private float lat;
+
+    private long timestamp;
+
+    public String location(){
+        return lon + "," + lat;
+    }
+
+    public String getVehicle() {
+        return vehicle;
+    }
+
+    public void setVehicle(String vehicle) {
+        this.vehicle = vehicle;
+    }
+
+    public String getLine() {
+        return line;
+    }
+
+    public void setLine(String line) {
+        this.line = line;
+    }
+
+    public int getUp_down() {
+        return up_down;
+    }
+
+    public void setUp_down(int up_down) {
+        this.up_down = up_down;
+    }
+
+    public float getLon() {
+        return lon;
+    }
+
+    public void setLon(float lon) {
+        this.lon = lon;
+    }
+
+    public float getLat() {
+        return lat;
+    }
+
+    public void setLat(float lat) {
+        this.lat = lat;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+
+import java.util.*;
+
+/**
+ * 越界异常 dto
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsOutbound_DTO {
+
+    public static List<GpsOutbound_DTO> create(List<Map<String, Object>> mapList){
+        //默认都是一辆车的数据
+        List<GpsOutbound> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsOutbound.class);
+        GpsOutbound outbound;
+
+        //排序
+        Collections.sort(list, new Comparator<GpsOutbound>() {
+            @Override
+            public int compare(GpsOutbound o1, GpsOutbound o2) {
+                return (int) (o1.getTimestamp() - o2.getTimestamp());
+            }
+        });
+
+        int space = 1000 * 60;
+        int size = list.size();
+        StringBuffer locations = new StringBuffer("");
+
+        List<GpsOutbound_DTO> rsList = new ArrayList<>();
+        GpsOutbound_DTO dto = null;
+
+        for(int i = 0; i < size; i++){
+            outbound = list.get(i);
+            locations.append(outbound.location() + ";");
+            if(dto == null){
+                dto = new GpsOutbound_DTO();
+                dto.setDeviceId(outbound.getVehicle());
+                dto.setNbbm(BasicData.deviceId2NbbmMap.get(outbound.getVehicle()));
+                dto.setSt(outbound.getTimestamp());
+            }
+            else{
+                //越界结束
+                if((i < size - 1 && list.get(i + 1).getTimestamp() - outbound.getTimestamp() > space)){
+                    dto.setEt(outbound.getTimestamp());
+                    dto.setLocations(locations.toString());
+
+                    rsList.add(dto);
+                    dto = null;
+                    locations = new StringBuffer("");
+                    continue;
+                }
+
+                if(i == size - 1)
+                    rsList.add(dto);
+            }
+        }
+
+        return rsList;
+    }
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 自编号
+     */
+    private String nbbm;
+
+    /**
+     * 越界开始时间
+     */
+    private long st;
+
+    /**
+     * 越界结束时间
+     */
+    private long et;
+
+    /**
+     * 越界点位集合
+     */
+    private String locations;
+
+    private String abnormalType = "outbound";
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public String getLocations() {
+        return locations;
+    }
+
+    public void setLocations(String locations) {
+        this.locations = locations;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+}
+package com.bsth.service.gps.entity;
+
+/**
+ * 超速异常 -ms数据库格式
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsSpeed {
+
+    private String vehicle;
+
+    private String line;
+
+    private int up_down;
+
+    private float lon;
+
+    private float lat;
+
+    private float speed;
+
+    private long timestamp;
+
+    public String getVehicle() {
+        return vehicle;
+    }
+
+    public void setVehicle(String vehicle) {
+        this.vehicle = vehicle;
+    }
+
+    public String getLine() {
+        return line;
+    }
+
+    public void setLine(String line) {
+        this.line = line;
+    }
+
+    public int getUp_down() {
+        return up_down;
+    }
+
+    public void setUp_down(int up_down) {
+        this.up_down = up_down;
+    }
+
+    public float getLon() {
+        return lon;
+    }
+
+    public void setLon(float lon) {
+        this.lon = lon;
+    }
+
+    public float getLat() {
+        return lat;
+    }
+
+    public void setLat(float lat) {
+        this.lat = lat;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+
+import java.util.*;
+
+/**
+ * 超速异常 dto
+ * Created by panzhao on 2017/4/7.
+ */
+public class GpsSpeed_DTO {
+
+    public static List<GpsSpeed_DTO> create(List<Map<String, Object>> mapList){
+        //默认都是一辆车的数据
+        List<GpsSpeed> list = JSONObject.parseArray(JSON.toJSONString(mapList), GpsSpeed.class);
+        GpsSpeed gs;
+        //排序
+        Collections.sort(list, new Comparator<GpsSpeed>() {
+            @Override
+            public int compare(GpsSpeed o1, GpsSpeed o2) {
+                return (int) (o1.getTimestamp() - o2.getTimestamp());
+            }
+        });
+
+        int space = 1000 * 60;
+        int size = list.size();
+
+        List<GpsSpeed_DTO> rsList = new ArrayList<>();
+        GpsSpeed_DTO dto = null;
+
+        for(int i = 0; i < size; i++){
+            gs = list.get(i);
+            if(dto == null){
+                dto = new GpsSpeed_DTO();
+                dto.setDeviceId(gs.getVehicle());
+                dto.setNbbm(BasicData.deviceId2NbbmMap.get(gs.getVehicle()));
+                dto.setSt(gs.getTimestamp());
+                dto.setSpeed(gs.getSpeed());
+            }
+            else{
+                //超速结束
+                if((i < size - 1 && list.get(i + 1).getTimestamp() - gs.getTimestamp() > space)){
+                    dto.setEt(gs.getTimestamp());
+                    rsList.add(dto);
+                    dto = null;
+                    continue;
+                }
+
+                //记录最大速度
+                if(gs.getSpeed() > dto.getSpeed())
+                    dto.setSpeed(gs.getSpeed());
+
+                if(i == size - 1)
+                    rsList.add(dto);
+            }
+        }
+        return rsList;
+    }
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 自编号
+     */
+    private String nbbm;
+
+    /**
+     * 超速开始时间
+     */
+    private long st;
+
+    /**
+     * 超速结束时间
+     */
+    private long et;
+
+    /**
+     * 速度
+     */
+    private float speed;
+
+    private String abnormalType = "speed";
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public String getAbnormalType() {
+        return abnormalType;
+    }
+
+    public void setAbnormalType(String abnormalType) {
+        this.abnormalType = abnormalType;
+    }
+}
@@ -17,20 +17,20 @@ import java.util.Map;
  */
 public class HistoryGps_DTO {
  
-    public static List<HistoryGps_DTO> craete(List<Map<String, Object>> mapList){
+    public static List<HistoryGps_DTO> craete(List<Map<String, Object>> mapList) {
         List<HistoryGps_DTO> list = JSONObject.parseArray(JSON.toJSONString(mapList), HistoryGps_DTO.class);
  
         GeometryFactory geometryFactory = new GeometryFactory();
         Point point;
-        for(HistoryGps_DTO gps : list){
+        for (HistoryGps_DTO gps : list) {
             point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
             gps.setPoint(point);
         }
         return list;
     }
  
-    private double gcj_lon;
-    private double gcj_lat;
+    //private double gcj_lon;
+    //private double gcj_lat;
  
     private double bd_lon;
     private double bd_lat;
@@ -56,12 +56,33 @@ public class HistoryGps_DTO {
     @JsonIgnore
     private Point point;
  
-    /** 路段 */
+    /**
+     * 路段
+     */
     private Road_DTO road;
-    /** 和路段的最短距离 */
+    /**
+     * 和路段的最短距离
+     */
     private double roadMinDistance;
  
-    public double getGcj_lon() {
+    @Override
+    public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        HistoryGps_DTO g2 = (HistoryGps_DTO) obj;
+        return this.toString().equals(g2.toString());
+    }
+
+
+    @Override
+    public String toString() {
+        return (this.getDeviceId() + "_" + (inout_stop_info==null?this.getStopNo():inout_stop_info.getStopName()) + "_" + this.getTs() + "_" + this.getLon() + "_" + this.getLat());
+    }
+
+/*    public double getGcj_lon() {
         return gcj_lon;
     }
  
@@ -75,7 +96,7 @@ public class HistoryGps_DTO {
  
     public void setGcj_lat(double gcj_lat) {
         this.gcj_lat = gcj_lat;
-    }
+    }*/
  
     public double getBd_lon() {
         return bd_lon;
@@ -18,4 +18,6 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
  
 	Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception;
+	
+	String obtainDsq() throws Exception;
 }
@@ -6,6 +6,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -70,8 +71,144 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	JdbcTemplate jdbcTemplate;
  
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Transactional  
+	@Override
+	public String obtainDsq() throws Exception{
+		String result = "failure";
+		List<Cars> carsList=carsRepository.findCars();
+		 Map<String, Boolean> carsMap=new HashMap<String, Boolean>();
+		 for (int i = 0; i < carsList.size(); i++) {
+			 Cars c=carsList.get(i);
+			 carsMap.put(c.getInsideCode(), c.getSfdc());
+		}
+		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			Date dNow = new Date();   //当前时间
+			Date dBefore = new Date();
+			Calendar calendar = Calendar.getInstance(); //得到日历
+			calendar.setTime(dNow);//把当前时间赋给日历
+			calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
+			dBefore = calendar.getTime();   //得到前一天的时间
+			String rq=sdf.format(dBefore);
+		String line="";
+		//保留两位小数
+		DecimalFormat df = new DecimalFormat("#.00");
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap=new HashMap<String,Object>();
+		//当天DLB信息
+		List<Dlb> dlList=repository.obtainDl(rq, "", "", line, "", "nbbm");
+		//当天YLXXB信息
+		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,"");
+		//当天加电信息表
+		List<Jdl> jdlList=jdlRepository.JdlList(rq);
+		//前一天所有车辆最后进场班次信息
+		List<Dlb> dlListBe=repository.obtainYlbefore(rq, "", "", "", "");
+		List<Cdl> cdyList=cdlRepository.obtainCdl();
+		//从排班表中计算出行驶的总里程
+		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
+		List<Ylb> addList=new ArrayList<Ylb>();
+		List<Ylb> updateList=new ArrayList<Ylb>();
+		for(int x=0;x<listpb.size();x++){
+			String type="add";
+			boolean sfdc=false;
+			Map<String, Object> map=listpb.get(x);
+			if (carsMap.get(map.get("clZbh").toString())!=null) {
+				 sfdc= carsMap.get(map.get("clZbh").toString());
+			}else{
+				sfdc=false;
+			}
+			if(sfdc){
+				//判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+				Dlb t=new Dlb();
+				for(int k=0;k<dlList.size();k++){
+					Dlb t1=dlList.get(k);
+					if(t1.getNbbm().equals(map.get("clZbh").toString())
+							&&t1.getJsy().equals(map.get("jGh").toString())
+							&&t1.getXlbm().equals(map.get("xlBm").toString()))
+					{
+						t=t1;
+						type="update";
+					}
+				}
+				try {
+					//当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+					Double jzl=0.0;
+					if(map.get("seqNumber").toString().equals("1")){
+						boolean fage=true;
+						for (int i = 0; i < dlListBe.size(); i++) {
+							Dlb dlb=dlListBe.get(i);
+							if(map.get("clZbh").toString().equals(dlb.getNbbm())){
+								t.setCzcd(dlb.getJzcd());
+								fage=false;
+								break;
+							}
+						}
+						if(fage){
+							for (int y = 0; y < cdyList.size(); y++) {
+								Cdl cdl=cdyList.get(y);
+								if(map.get("clZbh").toString().equals(cdl.getNbbm())){
+									t.setCzcd(cdl.getClcd()==null?0:cdl.getClcd());
+									fage=false;
+									break;
+								}
+							}
+						}
+						if(fage){
+							t.setCzcd(0.0);
+						}
+						
+						//手动导入没有驾驶员工号
+						for (int i = 0; i < jdlList.size(); i++) {
+							Jdl jdl=jdlList.get(i);
+							if(map.get("clZbh").toString().equals(jdl.getNbbm()) ){
+								jzl+=jdl.getJdl();
+							}
+						}
+					}
+					
+					
+					//把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+					for(int j=0;j<ylxxList.size();j++){
+						Ylxxb ylxxb= ylxxList.get(j);
+						if(map.get("clZbh").toString().equals(ylxxb.getNbbm()) &&map.get("jGh").toString().equals(ylxxb.getJsy())){
+							jzl+=ylxxb.getJzl();
+						}
+					}
+					
+					t.setCdl(jzl);
+					if(type.equals("add")){
+						t.setHd(jzl);
+						t.setJzcd(t.getCzcd());
+					}
+					
+					t.setNbbm(map.get("clZbh").toString());
+					t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
+					t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
+					t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
+					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+					t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
+					t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+					t.setRq(sdf.parse(rq));
+					t.setCreatetime(new Date());
+					/*if(type.equals("add")){
+						addList.add(t);
+					}else{
+						updateList.add(t);
+					}*/
+					repository.save(t);
+					newMap.put("status", ResponseCode.SUCCESS);
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					newMap.put("status", ResponseCode.ERROR);
+					e.printStackTrace();
+				}
+			}
+		}
+		return result;
+	}
 	/**
-	 * 获取进存油信息
+	 * 获取进存电信息
 	 * @Transactional 回滚事物
 	 */
 	@Transactional  
@@ -135,9 +135,11 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								Ylb ylb=ylListBe.get(i);
 								if(map.get("clZbh").toString().equals(ylb.getNbbm())){
 									if(ylb.getJzyl()!=null){
-										t.setCzyl(ylb.getJzyl());
-										fage=false;
-										break;
+										if(ylb.getJzyl()>0){
+											t.setCzyl(ylb.getJzyl());
+											fage=false;
+											break;
+										}
 									}
  
 								}
@@ -170,7 +172,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJzl(jzl);*/
 						t.setNbbm(map.get("clZbh").toString());
 						t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
-						t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(df.format(Double.parseDouble(map.get("totalKilometers").toString()))));
+						t.setZlc(map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString()));
 						t.setXlbm(map.get("xlBm")==null?"":map.get("xlBm").toString());
 						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
@@ -270,7 +272,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						for (int i = 0; i < ylListBe.size(); i++) {
 							Ylb ylb = ylListBe.get(i);
 							if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
-								if(ylb.getJzyl()>=0){
+								if(ylb.getJzyl()>0){
 									t.setCzyl(ylb.getJzyl());
 									fage = false;
 									break;
@@ -282,16 +284,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							for (int y = 0; y < clyList.size(); y++) {
 								Cyl cyl = clyList.get(y);
 								if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
-									if(cyl.getCyl()>=0){
-										t.setCzyl(cyl.getCyl());
-										fage = false;
-										break;
-									}else {
-										if(cyl.getCxrl()!=null){
-											if(cyl.getCxrl()>0){
-												t.setCzyl(cyl.getCxrl());
-												fage = false;
-												break;
+									if(cyl!=null){
+										if(cyl.getCyl()>=0){
+											t.setCzyl(cyl.getCyl());
+											fage = false;
+											break;
+										}else {
+											if(cyl.getCxrl()!=null){
+												if(cyl.getCxrl()>0){
+													t.setCzyl(cyl.getCxrl());
+													fage = false;
+													break;
+												}
 											}
 										}
 									}
 package com.bsth.service.realcontrol.impl;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
-import com.bsth.data.match.Arrival2Schedule;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -10,19 +10,19 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ChildTaskPlanService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
  
 import javax.transaction.Transactional;
+import java.util.HashMap;
 import java.util.Map;
  
 @Service
 public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService {
  
-	/*@Autowired
-    ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
-
     @Autowired
     ScheduleRealInfoRepository scheduleRealInfoRepository;
  
@@ -33,34 +33,41 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
     DayOfSchedule dayOfSchedule;
  
     @Autowired
-    Arrival2Schedule arrival2Schedule;
-
-    @Autowired
     JdbcTemplate jdbcTemplate;
  
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
     @Transactional
     @Override
     public Map<String, Object> save(ChildTaskPlan t) {
-        ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
-        Map<String, Object> rs;
-        //保存起终点名称
-        String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
-
-        if(StringUtils.isEmpty(t.getStartStationName()))
-            t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
-
-        if(StringUtils.isEmpty(t.getEndStationName()))
-            t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
-        //先持久化子任务
-        rs = super.save(t);
-        //再关联主任务
-        sch.getcTasks().add(t);
-        dayOfSchedule.save(sch);
-
-        rs.put("t", sch);
  
-        if (sch.getZdsjActual() == null)
-            arrival2Schedule.removeExpect(sch.getClZbh());
+        Map<String, Object> rs = new HashMap();
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
+            //保存起终点名称
+            String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+            if(StringUtils.isEmpty(t.getStartStationName()))
+                t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
+
+            if(StringUtils.isEmpty(t.getEndStationName()))
+                t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
+            //先持久化子任务
+            rs = super.save(t);
+            //关联主任务
+            System.out.println("schschsch: " + sch);
+            System.out.println("sch.getcTasks()sch.getcTasks(): " + sch.getcTasks());
+            sch.getcTasks().add(t);
+            dayOfSchedule.save(sch);
+            //直接持久化
+            //scheduleRealInfoRepository.save(sch);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("t", sch);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg",  e.getMessage());
+        }
         return rs;
     }
  
@@ -69,16 +76,13 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         Map<String, Object> rs;
  
         ChildTaskPlan cPlan = childTaskPlanRepository.findOne(id);
-        //解除和主任务关联
-        ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
-        sch.getcTasks().remove(cPlan);
-        //删除关联表数据
-        jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real=" + sch.getId() + " and c_tasks=" + cPlan.getId());
  
         //删除子任务
         rs = super.delete(id);
-        dayOfSchedule.save(sch);
-
+        //dayOfSchedule.save(sch);
+        //解除和主任务关联
+        ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
+        sch.getcTasks().remove(cPlan);
         rs.put("t", sch);
         return rs;
     }
@@ -581,62 +581,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Iterator<?>> list = new ArrayList<Iterator<?>>();
         List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
-
+//        List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+    	for (int i = 0; i < scheduleRealInfos.size(); i++) {
+    		ScheduleRealInfo s=scheduleRealInfos.get(i);
+    		if(s.getZdsjActual()!=null){
+    			lists.add(s);
+    		}
+		}
         DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-        int jhbc = 0, cjbc = 0, ljbc = 0;
-        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0;
-        float addMileage = 0l, remMileage = 0l;
  
         Map<String, Object> map;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
-            if (scheduleRealInfo != null) {
-                //计算计划里程（主任务过滤掉临加班次），烂班里程，临加里程，计划班次，烂班班次，增加班次
-                if (scheduleRealInfo != null) {
-                    //计划里程（主任务过滤掉临加班次），
-                    //烂班里程（主任务烂班），
-                    //临加里程（主任务临加），
-                    //计划班次，烂班班次，增加班次
-                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
-                    if (scheduleRealInfo.isSflj()) {
-                        ljbc++;
-                    } else {
-                        jhlc += tempJhlc;
-                        jhbc++;
-                        if (scheduleRealInfo.getStatus() == -1) {
-                            remMileage += tempJhlc;
-                            cjbc++;
-                        }
-                    }
-                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-                    //计算营运里程，空驶里程
-                    if (childTaskPlans.isEmpty()) {
-                        if (scheduleRealInfo.getBcType().equals("in") || scheduleRealInfo.getBcType().equals("out")
-                                ) {
-                            ksgl += tempJhlc;
-                        } else {
-                            yygl += tempJhlc;
-                        }
-                    } else {
-                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                        while (it.hasNext()) {
-                            ChildTaskPlan childTaskPlan = it.next();
-                            if (childTaskPlan.getMileageType().equals("empty")) {
-                                if (scheduleRealInfo.isSflj()) {
-                                    addMileage += tempJhlc;
-                                }
-                                ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            } else {
-                                if (scheduleRealInfo.isSflj()) {
-                                    addMileage += tempJhlc;
-                                }
-                                yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            }
-                        }
-                    }
-                }
-
                 map = new HashMap<String, Object>();
                 try {
                     scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
@@ -661,21 +619,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-            }
         }
  
         //计算里程和班次数，并放入Map里
         map = new HashMap<String, Object>();
-        map.put("jhlc", format.format(jhlc));
-        map.put("remMileage", format.format(remMileage));
-        map.put("addMileage", format.format(addMileage));
-        map.put("yygl", format.format(yygl));
-        map.put("ksgl", format.format(ksgl));
-        map.put("realMileage", format.format(yygl + ksgl));
-        map.put("jhbc", jhbc);
-        map.put("cjbc", cjbc);
-        map.put("ljbc", ljbc);
-        map.put("sjbc", jhbc - cjbc + ljbc);
+        map.put("jhlc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
  
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  
@@ -1414,19 +1374,27 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public Map<String, Object> findKMBC(String jGh, String clZbh,
             String lpName, String date, String line) {
     	Map<String, Object> map = new HashMap<String, Object>();
-    	List<ScheduleRealInfo> lists=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+    	for (int i = 0; i < list.size(); i++) {
+    		ScheduleRealInfo s=list.get(i);
+    		if(s.getZdsjActual()!=null){
+    			lists.add(s);
+    		}
+		}
     	double ksgl=culateService.culateKsgl(lists);
     	double sjgl=culateService.culateSjgl(lists);
     	double jccgl=culateService.culateJccgl(lists);
     	double ljgl=culateService.culateLjgl(lists);
-    	 map.put("jhlc", culateService.culateJhgl(lists)); //计划里程
+    	
+    	 map.put("jhlc", culateService.culateJhgl(list)); //计划里程
          map.put("remMileage", culateService.culateLbgl(lists)); //烂班公里
          map.put("addMileage", ljgl); //临加公里
          map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
          map.put("ksgl", ksgl);//空驶公里
          map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
 //         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
-         map.put("jhbc", culateService.culateJhbc(lists,""));
+         map.put("jhbc", culateService.culateJhbc(list,""));
          map.put("cjbc", culateService.culateLbbc(lists));
          map.put("ljbc", culateService.culateLjbc(lists,""));
          map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
@@ -1670,7 +1638,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          map.put("ssgl_kx", culateService.culateCJLC(lists, "客稀"));
          map.put("ssgl_qh", culateService.culateCJLC(lists, "气候"));
          map.put("ssgl_yw", culateService.culateCJLC(lists, "援外"));
-         map.put("ssgl_other", culateService.culateCJLC(lists, "其他"));
+         double ssgl_pc=culateService.culateCJLC(lists, "配车");
+         double ssgl_by=culateService.culateCJLC(lists, "保养");
+         double ssgl_cj=culateService.culateCJLC(lists, "抽减");
+         double ssgl_qt=culateService.culateCJLC(lists, "其他");
+         map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
          map.put("ssbc", culateService.culateLbbc(lists));
          map.put("ljgl", culateService.culateLjgl(lists));
          map.put("jhbc", culateService.culateJhbc(lists,""));
@@ -3793,6 +3765,76 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return new ArrayList<Map<String, Object>>();
     }
  
+    public  List<ScheduleRealInfo> exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
+        ReportUtils ee = new ReportUtils();
+        ReportRelatedUtils rru = new ReportRelatedUtils();
+        List<Iterator<?>> list = new ArrayList<Iterator<?>>();
+        List<ScheduleRealInfo> scheduleRealInfos = listpl;
+        List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+//        List<ScheduleRealInfo> scheduleRealInfos=scheduleRealInfoRepository.queryListWaybillXcld(jName, clZbh, lpName, date, line);
+    	List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+    	for (int i = 0; i < scheduleRealInfos.size(); i++) {
+    		ScheduleRealInfo s=scheduleRealInfos.get(i);
+    		if(s.getZdsjActual()!=null){
+    			lists.add(s);
+    		}
+		}
+        DecimalFormat format = new DecimalFormat("0.00");
+//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
+//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
+
+        Map<String, Object> map;
+        for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
+                map = new HashMap<String, Object>();
+                try {
+                    scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
+                    scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
+                    map = rru.getMapValue(scheduleRealInfo);
+                    String zdsj = scheduleRealInfo.getZdsj();
+                    String zdsjActual = scheduleRealInfo.getZdsjActual();
+                    if (zdsj != null && zdsjActual != null &&
+                            !zdsj.equals(zdsjActual)) {
+                        if (zdsj.compareTo(zdsjActual) > 0) {
+                            map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                            map.put("slow", "");
+                        } else {
+                            map.put("fast", "");
+                            map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                        }
+                    } else {
+                        map.put("fast", "");
+                        map.put("slow", "");
+                    }
+                    listMap.add(map);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+        }
+
+        //计算里程和班次数，并放入Map里
+        map = new HashMap<String, Object>();
+        map.put("jhlc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("remMileage",culateMieageService.culateLbgl(lists));
+        map.put("addMileage", culateMieageService.culateLjgl(lists));
+        double yygl=Arith.add(culateMieageService.culateSjgl(lists),culateMieageService.culateLjgl(lists));
+        map.put("yygl", yygl);
+        double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
+        map.put("ksgl",ksgl);
+        map.put("realMileage", Arith.add(yygl ,ksgl));
+        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("cjbc", culateMieageService.culateLbbc(lists));
+        map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
+        int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
+        map.put("sjbc", sjbc);
+
+        String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+
+        list.add(listMap.iterator());
+        ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/waybill_minhang.xls",
+                path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
+        return scheduleRealInfos;
+    }
+    
     @Override
     public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
         String date = map.get("date").toString();
@@ -3814,12 +3856,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
             file.mkdirs();
-
+            List<ScheduleRealInfo> lists_line=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
             for (List<String> list : lists) {
+            	List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
                 String jName = list.get(0);
                 String clZbh = list.get(1);
                 String lpName = list.get(2);
-                this.exportWaybill(jName, clZbh, lpName, date, line);
+                for (int i = 0; i < lists_line.size(); i++) {
+					ScheduleRealInfo s=lists_line.get(i);
+					if(s.getjName().equals(jName) && s.getClZbh().equals(clZbh) && s.getLpName().equals(lpName)){
+						newList.add(s);
+					}
+				}
+                this.exportWaybill_pl(newList, date, jName, clZbh, lpName);
                 File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
                 String fileName = file.getName();
                 temp.renameTo(new File(path + fileName + "/" + temp.getName()));
@@ -276,6 +276,155 @@
   <hop> <from>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_gbi</to><enabled>Y</enabled> </hop>
   </order>
   <step>
+    <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
+    <type>ExcelInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <noempty>Y</noempty>
+    <stoponempty>N</stoponempty>
+    <filefield/>
+    <sheetfield/>
+    <sheetrownumfield/>
+    <rownumfield/>
+    <sheetfield/>
+    <filefield/>
+    <limit>0</limit>
+    <encoding/>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <accept_filenames>Y</accept_filenames>
+    <accept_field>filepath_</accept_field>
+    <accept_stepname>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</accept_stepname>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>&#x7ebf;&#x8def;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x7f16;&#x53f7;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x540d;&#x79f0;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format>&#x23;</format>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
+        <name>&#x8def;&#x724c;&#x7c7b;&#x578b;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+    </fields>
+    <sheets>
+      <sheet>
+        <name>&#x5de5;&#x4f5c;&#x8868;1</name>
+        <startrow>0</startrow>
+        <startcol>0</startcol>
+        </sheet>
+    </sheets>
+    <strict_types>N</strict_types>
+    <error_ignored>N</error_ignored>
+    <error_line_skipped>N</error_line_skipped>
+    <bad_line_files_destination_directory/>
+    <bad_line_files_extension>warning</bad_line_files_extension>
+    <error_line_files_destination_directory/>
+    <error_line_files_extension>error</error_line_files_extension>
+    <line_number_files_destination_directory/>
+    <line_number_files_extension>line</line_number_files_extension>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <spreadsheet_type>JXL</spreadsheet_type>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>150</xloc>
+      <yloc>68</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</name>
+    <type>Constant</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>
+      <field>
+        <name>isCancel</name>
+        <type>Integer</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>0</nullif>
+        <length>-1</length>
+        <precision>-1</precision>
+        <set_empty_string>N</set_empty_string>
+      </field>
+    </fields>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>544</xloc>
+      <yloc>70</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x5b57;&#x6bb5;&#x6539;&#x540d;</name>
     <type>SelectValues</type>
     <description/>
@@ -393,27 +542,27 @@
       <value>
         <name>xl</name>
         <rename>xlid</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>lp_no</name>
         <rename>lpno</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>lp_name</name>
         <rename>lpname</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>lp_type</name>
         <rename>lptype</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
       <value>
         <name>is_cancel</name>
         <rename>isCancel</rename>
-        <update>N</update>
+        <update>Y</update>
       </value>
     </lookup>
      <cluster_schema/>
@@ -512,122 +661,6 @@
     </step>
  
   <step>
-    <name>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</name>
-    <type>ExcelInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <header>Y</header>
-    <noempty>Y</noempty>
-    <stoponempty>N</stoponempty>
-    <filefield/>
-    <sheetfield/>
-    <sheetrownumfield/>
-    <rownumfield/>
-    <sheetfield/>
-    <filefield/>
-    <limit>0</limit>
-    <encoding/>
-    <add_to_result_filenames>Y</add_to_result_filenames>
-    <accept_filenames>Y</accept_filenames>
-    <accept_field>filepath_</accept_field>
-    <accept_stepname>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</accept_stepname>
-    <file>
-      <name/>
-      <filemask/>
-      <exclude_filemask/>
-      <file_required>N</file_required>
-      <include_subfolders>N</include_subfolders>
-    </file>
-    <fields>
-      <field>
-        <name>&#x7ebf;&#x8def;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8def;&#x724c;&#x7f16;&#x53f7;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format>&#x23;</format>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8def;&#x724c;&#x540d;&#x79f0;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format>&#x23;</format>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-      <field>
-        <name>&#x8def;&#x724c;&#x7c7b;&#x578b;</name>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-      </field>
-    </fields>
-    <sheets>
-      <sheet>
-        <name>&#x5de5;&#x4f5c;&#x8868;1</name>
-        <startrow>0</startrow>
-        <startcol>0</startcol>
-        </sheet>
-    </sheets>
-    <strict_types>N</strict_types>
-    <error_ignored>N</error_ignored>
-    <error_line_skipped>N</error_line_skipped>
-    <bad_line_files_destination_directory/>
-    <bad_line_files_extension>warning</bad_line_files_extension>
-    <error_line_files_destination_directory/>
-    <error_line_files_extension>error</error_line_files_extension>
-    <line_number_files_destination_directory/>
-    <line_number_files_extension>line</line_number_files_extension>
-    <shortFileFieldName/>
-    <pathFieldName/>
-    <hiddenFieldName/>
-    <lastModificationTimeFieldName/>
-    <uriNameFieldName/>
-    <rootUriNameFieldName/>
-    <extensionFieldName/>
-    <sizeFieldName/>
-    <spreadsheet_type>JXL</spreadsheet_type>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>150</xloc>
-      <yloc>68</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
     <name>&#x9519;&#x8bef;&#x8f93;&#x51fa;</name>
     <type>ExcelOutput</type>
     <description/>
@@ -754,39 +787,6 @@
       </GUI>
     </step>
  
-  <step>
-    <name>&#x542f;&#x7528;&#x88ab;&#x6570;&#x636e;flag</name>
-    <type>Constant</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <fields>
-      <field>
-        <name>isCancel</name>
-        <type>Integer</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>0</nullif>
-        <length>-1</length>
-        <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-    </fields>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>544</xloc>
-      <yloc>70</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
   <step_error_handling>
       <error>
         <source_step>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_gbi</source_step>
+<!-- 统计数据 -->
+<div class="modal fade" id="countadd_mobal" tabindex="-1" role="basic" aria-hidden="true">
+	<div class="modal-dialog" style="margin-left: 400px;">
+		<div class="modal-content" style="width: 700px;">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<h4 class="modal-title">统计数据 </h4>
+			</div>
+			<div class="modal-body">
+				<div class="portlet-body">
+					<div class="table-container" style="margin-top: 10px">
+						<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_countadd">
+							<thead>
+								<tr role="row" class="heading">
+									<th width="1%">序号</th>
+									<th width="45%">统计项目</th>
+									<th width="15%">统计数值</th>
+								</tr>
+							</thead>
+							<tbody></tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal">关闭</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/html" id="countAdd_temp">
+{{each list as obj i }}
+	<tr role="row" class="filter">
+		<td>{{i+1}}</td>
+		<td>
+			{{obj.name}}
+		</td>
+		<td style="vertical-align:middle; text-align:center;">
+			{{if obj.name == '综合评估'}}
+				<div id="star"></div>
+			{{else}}
+				{{obj.value}}
+			{{/if}}
+		</td>
+	</tr>
+{{/each}}
+{{if list.length == 0}}
+		<tr>
+			<td colspan=3><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+{{/if}}
+</script>
+<script type="text/javascript">
+$('#countadd_mobal').on('countAddMobal.show', function(e,countDate){
+	// 加载延迟200毫秒显示mobal
+	setTimeout(function(){$('#countadd_mobal').modal({show : true,backdrop: 'static', keyboard: false});},200);
+	// 当模态框对用户可见时触发（将等待 CSS 过渡效果完成）。
+	$('#countadd_mobal').on('show.bs.modal', function () {
+		// 把数据填充到模版中
+		var tbodyHtml = template('countAdd_temp',{list:countDate});
+		// 把渲染好的模版html文本追加到表格中
+		$('#datatable_countadd tbody').html(tbodyHtml);
+		$('#star').raty({ readOnly: true,score: 4.5 });
+	});
+});
+</script>
 \ No newline at end of file
@@ -19,19 +19,15 @@
  
 <!-- row 组件START -->
 <div class="row">
-	
 	<!-- col-md-12 组件START -->
 	<div class="col-md-12">
-		
 		<!-- portlet 组件START -->
 		<div class="portlet light porttlet-fit bordered">
-			
 			<!-- portlet-title组件START -->
 			<div class="portlet-title">
-				
 				<!-- caption 组件START  -->
 				<div class="caption">
-					 <i class="fa fa-database font-dark"></i>
+					 <i class="fa fa-bar-chart font-dark"></i>
 					 <span class="caption-subject font-dark sbold uppercase">时刻表明细模型</span>
 				</div>
 				<!-- caption 组件END -->
@@ -40,6 +36,9 @@
 				</div>
 				<!-- actions 组件START -->
 				<div class="actions">
+					<div class="btn-group btn-group-devided countbtn" data-toggle="buttons">
+						<a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 统计数据</a>
+					</div>
 					<div class="btn-group btn-group-devided checkbtn" data-toggle="buttons">
 						<a class="btn btn-circle blue checkAdd" href="javascript:;" data-pjax><i class="fa fa-check"></i> 保存数据</a>
 					</div>
@@ -107,6 +106,7 @@
 	<!-- col-md-12 组件END -->
 </div>
 <!-- row 组件END -->
+<script src="/pages/base/timesmodel/js/raty/lib/jquery.raty.js"></script>
 <script src="/pages/base/timesmodel/js/ContextJS/js/context.js"></script>
 <script src="/pages/base/timesmodel/js/base-fun.js"></script>
 <script src="/pages/base/timesmodel/js/d3.relationshipgraph.js"></script>
@@ -201,7 +201,7 @@ $(&#39;.reladplus&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
  
 /** 
- * @description : (TODO) 均匀发车事件.
+ * @description : (TODO) 监听均匀发车事件.
  * 
  * @stutas : OK.
  * 	
@@ -229,8 +229,9 @@ $(&#39;.updownread&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
  
 /** 
- * 调整班次点击事件
- * 	
+ * @description : (TODO) 调整班次点击事件
+ * 
+ * @status OK.
  ************************************************************************************************************************************************/
 $('.aboutread').on('click',function() {
 	// 判断选择框是否存在.
@@ -255,7 +256,7 @@ $(&#39;.aboutread&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
  
 /** 
- * @description : (TODO) 保存数据.
+ * @description : (TODO) 监听保存数据事件.
  * 
  * @status OK. 
  ************************************************************************************************************************************************/
@@ -282,6 +283,112 @@ $(&#39;.aboutread&#39;).on(&#39;click&#39;,function() {
 /************************************************************************************************************************************************/
  
 /**
+ * @description : (TODO) 监听统计数据事件.
+ * 
+ * @status OK.
+ ************************************************************************************************************************************************/
+ $('.countAdd').on('click',function() {
+	var list = $_GlobalGraph.getDataArray();
+	var countBc = 0,// 总班次
+		serviceBc = 0,// 营运班次
+		jcbc = 0, // 进场总班次.
+		ccbc = 0, // 出场总班次.
+		cfbc = 0,// 吃饭总班次.
+		zwlbbc = 0,// 早晚例保总班次.
+		countGs = 0.0,// 总工时
+		servicesj = 0,// 营运班次总时间
+		jcsj = 0.0,// 进场总时间.
+		ccsj = 0.0 // 出场总时间.
+		cfsj = 0.0, // 吃饭总时间.
+		zwlbsj = 0.0, // 早晚例保总时间.
+		ksBc = 0,// 空驶班次
+		serviceLc = 0.0 ,// 营运里程
+		ksLc = 0.0 ,// 空驶里程
+		avgTzjx = 0.0,// 平均停站间隙
+		gfServiceBc = 0,// 高峰营运班次
+		dgServiceBc = 0,// 低谷营运班次
+		gfAvgTzjx = 0.0,// 高峰平均停站间隙
+		dgAvgTzjx = 0.0;// 低谷平均停站间隙
+	for(var i = 0;i<list.length;i++) {
+		if(list[i].bcsj>0) {
+			countBc = countBc + 1;
+			countGs = countGs + list[i].STOPTIME + list[i].bcsj;
+			var nowDate = BaseFun.getDateTime(list[i].fcsj);
+			if((BaseFun.isgfsjd($_GlobalGraph.configuration.dataMap.zgfsjd[0].st,$_GlobalGraph.configuration.dataMap.zgfsjd[0].ed,nowDate) ||
+					BaseFun.isgfsjd($_GlobalGraph.configuration.dataMap.wgfsjd[0].st,$_GlobalGraph.configuration.dataMap.wgfsjd[0].ed,nowDate)) &&
+					(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.normal ||
+							list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.region ||
+							list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.major)) {
+				gfServiceBc = gfServiceBc + 1;
+				gfAvgTzjx = gfAvgTzjx + list[i].STOPTIME;
+			} else if((!BaseFun.isgfsjd($_GlobalGraph.configuration.dataMap.zgfsjd[0].st,$_GlobalGraph.configuration.dataMap.zgfsjd[0].ed,nowDate) ||
+						!BaseFun.isgfsjd($_GlobalGraph.configuration.dataMap.wgfsjd[0].st,$_GlobalGraph.configuration.dataMap.wgfsjd[0].ed,nowDate)) &&
+					(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.normal ||
+							list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.region ||
+							list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.major)){
+				dgServiceBc = dgServiceBc + 1;
+				dgAvgTzjx = dgAvgTzjx + list[i].STOPTIME;
+			}
+			if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.normal ||
+					list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.region ||
+					list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.major) {
+				serviceBc = serviceBc + 1;
+				serviceLc = serviceLc + list[i].jhlc;
+				servicesj = servicesj + list[i].bcsj;
+				avgTzjx = avgTzjx + list[i].STOPTIME;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.venting) {
+				ksBc = ksBc +1;
+				ksLc = ksLc  + list[i].jhlc;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.in_) {
+				jcbc = jcbc +1;
+				jcsj = jcsj + list[i].bcsj;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.out) {
+				ccbc = ccbc +1;
+				ccsj = ccsj + list[i].bcsj;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.cf) {
+				cfbc = cfbc +1;
+				cfsj = cfsj + list[i].bcsj;
+			}else if(list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.bd ||
+					list[i].bcType == $_GlobalGraph.configuration.dataMap.bcTypeArr.lc ) {
+				zwlbbc = zwlbbc +1;
+				zwlbsj = zwlbsj + list[i].bcsj;
+			}
+		}
+	}
+	dgAvgTzjx = dgAvgTzjx/dgServiceBc;
+	gfAvgTzjx = gfAvgTzjx/gfServiceBc;
+	avgTzjx = avgTzjx/dgServiceBc;
+	 var countDate = [{'name':'总班次(包括进出场、吃饭时间、早晚例保、营运且班次时间大于零的班次)','value':countBc},
+	                  {'name':'进场总班次(包括进场且班次时间大于零的班次)','value':jcbc},
+	                  {'name':'出场总班次(包括进场且班次时间大于零的班次)','value':ccbc},
+	                  {'name':'吃饭总班次(包括吃饭且班次时间大于零的班次)','value':cfbc},
+	                  {'name':'早晚例保总班次(包括早晚例保且时间大于零的班次)','value':zwlbbc},
+	                  {'name':'营运总班次(包括正常、区间、放大站且班次时间大于零班次)','value':serviceBc},
+	                  {'name':'进场总时间(包括进场班次且班次时间大于零)','value':parseFloat((jcsj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'出场总时间(包括进场班次且班次时间大于零)','value':parseFloat((ccsj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'吃饭总时间(包括吃饭班次且班次时间大于零)','value':parseFloat((cfsj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'早晚例保总时间(包括早晚例保班次且时间大于零的)','value':parseFloat((zwlbsj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'营运班次总时间(包括正常、区间、放大站且班次时间大于零)','value':parseFloat((servicesj/60).toFixed(2)) + ' 小时'},
+	                  {'name':'总工时(包括进出场、吃饭时间、早晚例保、营运班次时间)','value': parseFloat((countGs/60).toFixed(2)) + ' 小时'},
+	                  {'name':'空驶班次(包括直放班次)','value':ksBc},
+	                  {'name':'营运里程(包括正常、区间、放大站里程)','value':serviceLc + ' 公里'},
+	                  {'name':'空驶里程(包括直放里程)','value':ksLc + ' 公里'},
+	                  {'name':'平均停站时间(营运班次停站时间总和/营运总班次)','value':parseInt(avgTzjx) + ' 分钟' },
+	                  {'name':'高峰营运班次(包括早晚高峰时段的正常、区间、放大站班次)','value':gfServiceBc},
+	                  {'name':'低谷营运班次(包括低谷时段的正常、区间、放大站班次)','value':dgServiceBc},
+	                  {'name':'高峰平均停站间隙(高峰营运班次停站时间总和/高峰营运班次总和)','value':parseInt(gfAvgTzjx) + ' 分钟'},
+	                  {'name':'低谷平均停站间隙(低谷营运班次停站时间总和/低谷营运班次总和)','value':parseInt(dgAvgTzjx) + ' 分钟'},
+	                  {'name':'综合评估','value':3}];
+	// 弹出层mobal页面
+	$.get('/pages/base/timesmodel/countadd.html', function(m){
+		$(pjaxContainer).append(m);
+		// 规定被选元素要触发的事件。可以使自定义事件（使用 bind() 函数来附加），或者任何标准事件。
+		$('#countadd_mobal').trigger('countAddMobal.show',[countDate]);
+	});
+ });
+/************************************************************************************************************************************************/
+
+/**
  * @description : (TODO)获取路牌对应的班次数(这里的班次不包括早晚例保班次、吃饭时间) 
  * 
  * @params : [a1--班次数组；a2--路牌数组]
+/*!
+ * jQuery Raty - A Star Rating Plugin
+ * ------------------------------------------------------------------
+ *
+ * jQuery Raty is a plugin that generates a customizable star rating.
+ *
+ * Licensed under The MIT License
+ *
+ * @version        2.5.2
+ * @since          2010.06.11
+ * @author         Washington Botelho
+ * @documentation  wbotelhos.com/raty
+ *
+ * ------------------------------------------------------------------
+ *
+ *  <div id="star"></div>
+ *
+ *  $('#star').raty();
+ *
+ */
+
+;(function($) {
+
+  var methods = {
+    init: function(settings) {
+      return this.each(function() {
+        methods.destroy.call(this);
+
+        this.opt = $.extend(true, {}, $.fn.raty.defaults, settings);
+
+        var that  = $(this),
+            inits = ['number', 'readOnly', 'score', 'scoreName'];
+
+        methods._callback.call(this, inits);
+
+        if (this.opt.precision) {
+          methods._adjustPrecision.call(this);
+        }
+
+        this.opt.number = methods._between(this.opt.number, 0, this.opt.numberMax)
+
+        this.opt.path = this.opt.path || '';
+
+        if (this.opt.path && this.opt.path.slice(this.opt.path.length - 1, this.opt.path.length) !== '/') {
+          this.opt.path += '/';
+        }
+
+        this.stars = methods._createStars.call(this);
+        this.score = methods._createScore.call(this);
+
+        methods._apply.call(this, this.opt.score);
+
+        var space  = this.opt.space ? 4 : 0,
+            width  = this.opt.width || (this.opt.number * this.opt.size + this.opt.number * space);
+
+        if (this.opt.cancel) {
+          this.cancel = methods._createCancel.call(this);
+
+          width += (this.opt.size + space);
+        }
+
+        if (this.opt.readOnly) {
+          methods._lock.call(this);
+        } else {
+          that.css('cursor', 'pointer');
+          methods._binds.call(this);
+        }
+
+        if (this.opt.width !== false) {
+          that.css('width', width);
+        }
+
+        methods._target.call(this, this.opt.score);
+
+        that.data({ 'settings': this.opt, 'raty': true });
+      });
+    }, _adjustPrecision: function() {
+      this.opt.targetType = 'score';
+      this.opt.half       = true;
+    }, _apply: function(score) {
+      if (score && score > 0) {
+        score = methods._between(score, 0, this.opt.number);
+        this.score.val(score);
+      }
+
+      methods._fill.call(this, score);
+
+      if (score) {
+        methods._roundStars.call(this, score);
+      }
+    }, _between: function(value, min, max) {
+      return Math.min(Math.max(parseFloat(value), min), max);
+    }, _binds: function() {
+      if (this.cancel) {
+        methods._bindCancel.call(this);
+      }
+
+      methods._bindClick.call(this);
+      methods._bindOut.call(this);
+      methods._bindOver.call(this);
+    }, _bindCancel: function() {
+      methods._bindClickCancel.call(this);
+      methods._bindOutCancel.call(this);
+      methods._bindOverCancel.call(this);
+    }, _bindClick: function() {
+      var self = this,
+          that = $(self);
+
+      self.stars.on('click.raty', function(evt) {
+        self.score.val((self.opt.half || self.opt.precision) ? that.data('score') : this.alt);
+
+        if (self.opt.click) {
+          self.opt.click.call(self, parseFloat(self.score.val()), evt);
+        }
+      });
+    }, _bindClickCancel: function() {
+      var self = this;
+
+      self.cancel.on('click.raty', function(evt) {
+        self.score.removeAttr('value');
+
+        if (self.opt.click) {
+          self.opt.click.call(self, null, evt);
+        }
+      });
+    }, _bindOut: function() {
+      var self = this;
+
+      $(this).on('mouseleave.raty', function(evt) {
+        var score = parseFloat(self.score.val()) || undefined;
+
+        methods._apply.call(self, score);
+        methods._target.call(self, score, evt);
+
+        if (self.opt.mouseout) {
+          self.opt.mouseout.call(self, score, evt);
+        }
+      });
+    }, _bindOutCancel: function() {
+      var self = this;
+
+      self.cancel.on('mouseleave.raty', function(evt) {
+        $(this).attr('src', self.opt.path + self.opt.cancelOff);
+
+        if (self.opt.mouseout) {
+          self.opt.mouseout.call(self, self.score.val() || null, evt);
+        }
+      });
+    }, _bindOverCancel: function() {
+      var self = this;
+
+      self.cancel.on('mouseover.raty', function(evt) {
+        $(this).attr('src', self.opt.path + self.opt.cancelOn);
+
+        self.stars.attr('src', self.opt.path + self.opt.starOff);
+
+        methods._target.call(self, null, evt);
+
+        if (self.opt.mouseover) {
+          self.opt.mouseover.call(self, null);
+        }
+      });
+    }, _bindOver: function() {
+      var self   = this,
+          that   = $(self),
+          action = self.opt.half ? 'mousemove.raty' : 'mouseover.raty';
+
+      self.stars.on(action, function(evt) {
+        var score = parseInt(this.alt, 10);
+
+        if (self.opt.half) {
+          var position = parseFloat((evt.pageX - $(this).offset().left) / self.opt.size),
+              plus     = (position > .5) ? 1 : .5;
+
+          score = score - 1 + plus;
+
+          methods._fill.call(self, score);
+
+          if (self.opt.precision) {
+            score = score - plus + position;
+          }
+
+          methods._roundStars.call(self, score);
+
+          that.data('score', score);
+        } else {
+          methods._fill.call(self, score);
+        }
+
+        methods._target.call(self, score, evt);
+
+        if (self.opt.mouseover) {
+          self.opt.mouseover.call(self, score, evt);
+        }
+      });
+    }, _callback: function(options) {
+      for (i in options) {
+        if (typeof this.opt[options[i]] === 'function') {
+          this.opt[options[i]] = this.opt[options[i]].call(this);
+        }
+      }
+    }, _createCancel: function() {
+      var that   = $(this),
+          icon   = this.opt.path + this.opt.cancelOff,
+          cancel = $('<img />', { src: icon, alt: 'x', title: this.opt.cancelHint, 'class': 'raty-cancel' });
+
+      if (this.opt.cancelPlace == 'left') {
+        that.prepend('&#160;').prepend(cancel);
+      } else {
+        that.append('&#160;').append(cancel);
+      }
+
+      return cancel;
+    }, _createScore: function() {
+      return $('<input />', { type: 'hidden', name: this.opt.scoreName }).appendTo(this);
+    }, _createStars: function() {
+      var that = $(this);
+
+      for (var i = 1; i <= this.opt.number; i++) {
+        var title = methods._getHint.call(this, i),
+            icon  = (this.opt.score && this.opt.score >= i) ? 'starOn' : 'starOff';
+
+        icon = this.opt.path + this.opt[icon];
+
+        $('<img />', { src : icon, alt: i, title: title }).appendTo(this);
+
+        if (this.opt.space) {
+          that.append((i < this.opt.number) ? '&#160;' : '');
+        }
+      }
+
+      return that.children('img');
+    }, _error: function(message) {
+      $(this).html(message);
+
+      $.error(message);
+    }, _fill: function(score) {
+      var self  = this,
+          hash  = 0;
+
+      for (var i = 1; i <= self.stars.length; i++) {
+        var star   = self.stars.eq(i - 1),
+            select = self.opt.single ? (i == score) : (i <= score);
+
+        if (self.opt.iconRange && self.opt.iconRange.length > hash) {
+          var irange = self.opt.iconRange[hash],
+              on     = irange.on  || self.opt.starOn,
+              off    = irange.off || self.opt.starOff,
+              icon   = select ? on : off;
+
+          if (i <= irange.range) {
+            star.attr('src', self.opt.path + icon);
+          }
+
+          if (i == irange.range) {
+            hash++;
+          }
+        } else {
+          var icon = select ? 'starOn' : 'starOff';
+
+          star.attr('src', this.opt.path + this.opt[icon]);
+        }
+      }
+    }, _getHint: function(score) {
+      var hint = this.opt.hints[score - 1];
+      return (hint === '') ? '' : (hint || score);
+    }, _lock: function() {
+      var score = parseInt(this.score.val(), 10), // TODO: 3.1 >> [['1'], ['2'], ['3', '.1', '.2']]
+          hint  = score ? methods._getHint.call(this, score) : this.opt.noRatedMsg;
+
+      $(this).data('readonly', true).css('cursor', '').attr('title', hint);
+
+      this.score.attr('readonly', 'readonly');
+      this.stars.attr('title', hint);
+
+      if (this.cancel) {
+        this.cancel.hide();
+      }
+    }, _roundStars: function(score) {
+      var rest = (score - Math.floor(score)).toFixed(2);
+
+      if (rest > this.opt.round.down) {
+        var icon = 'starOn';                                 // Up:   [x.76 .. x.99]
+
+        if (this.opt.halfShow && rest < this.opt.round.up) { // Half: [x.26 .. x.75]
+          icon = 'starHalf';
+        } else if (rest < this.opt.round.full) {             // Down: [x.00 .. x.5]
+          icon = 'starOff';
+        }
+
+        this.stars.eq(Math.ceil(score) - 1).attr('src', this.opt.path + this.opt[icon]);
+      }                              // Full down: [x.00 .. x.25]
+    }, _target: function(score, evt) {
+      if (this.opt.target) {
+        var target = $(this.opt.target);
+
+        if (target.length === 0) {
+          methods._error.call(this, 'Target selector invalid or missing!');
+        }
+
+        if (this.opt.targetFormat.indexOf('{score}') < 0) {
+          methods._error.call(this, 'Template "{score}" missing!');
+        }
+
+        var mouseover = evt && evt.type == 'mouseover';
+
+        if (score === undefined) {
+          score = this.opt.targetText;
+        } else if (score === null) {
+          score = mouseover ? this.opt.cancelHint : this.opt.targetText;
+        } else {
+          if (this.opt.targetType == 'hint') {
+            score = methods._getHint.call(this, Math.ceil(score));
+          } else if (this.opt.precision) {
+            score = parseFloat(score).toFixed(1);
+          }
+
+          if (!mouseover && !this.opt.targetKeep) {
+            score = this.opt.targetText;
+          }
+        }
+
+        if (score) {
+          score = this.opt.targetFormat.toString().replace('{score}', score);
+        }
+
+        if (target.is(':input')) {
+          target.val(score);
+        } else {
+          target.html(score);
+        }
+      }
+    }, _unlock: function() {
+      $(this).data('readonly', false).css('cursor', 'pointer').removeAttr('title');
+
+      this.score.removeAttr('readonly', 'readonly');
+
+      for (var i = 0; i < this.opt.number; i++) {
+        this.stars.eq(i).attr('title', methods._getHint.call(this, i + 1));
+      }
+
+      if (this.cancel) {
+        this.cancel.css('display', '');
+      }
+    }, cancel: function(click) {
+      return this.each(function() {
+        if ($(this).data('readonly') !== true) {
+          methods[click ? 'click' : 'score'].call(this, null);
+          this.score.removeAttr('value');
+        }
+      });
+    }, click: function(score) {
+      return $(this).each(function() {
+        if ($(this).data('readonly') !== true) {
+          methods._apply.call(this, score);
+
+          if (!this.opt.click) {
+            methods._error.call(this, 'You must add the "click: function(score, evt) { }" callback.');
+          }
+
+          this.opt.click.call(this, score, { type: 'click' });
+
+          methods._target.call(this, score);
+        }
+      });
+    }, destroy: function() {
+      return $(this).each(function() {
+        var that = $(this),
+            raw  = that.data('raw');
+
+        if (raw) {
+          that.off('.raty').empty().css({ cursor: raw.style.cursor, width: raw.style.width }).removeData('readonly');
+        } else {
+          that.data('raw', that.clone()[0]);
+        }
+      });
+    }, getScore: function() {
+      var score = [],
+          value ;
+
+      $(this).each(function() {
+        value = this.score.val();
+
+        score.push(value ? parseFloat(value) : undefined);
+      });
+
+      return (score.length > 1) ? score : score[0];
+    }, readOnly: function(readonly) {
+      return this.each(function() {
+        var that = $(this);
+
+        if (that.data('readonly') !== readonly) {
+          if (readonly) {
+            that.off('.raty').children('img').off('.raty');
+
+            methods._lock.call(this);
+          } else {
+            methods._binds.call(this);
+            methods._unlock.call(this);
+          }
+
+          that.data('readonly', readonly);
+        }
+      });
+    }, reload: function() {
+      return methods.set.call(this, {});
+    }, score: function() {
+      return arguments.length ? methods.setScore.apply(this, arguments) : methods.getScore.call(this);
+    }, set: function(settings) {
+      return this.each(function() {
+        var that   = $(this),
+            actual = that.data('settings'),
+            news   = $.extend({}, actual, settings);
+
+        that.raty(news);
+      });
+    }, setScore: function(score) {
+      return $(this).each(function() {
+        if ($(this).data('readonly') !== true) {
+          methods._apply.call(this, score);
+          methods._target.call(this, score);
+        }
+      });
+    }
+  };
+
+  $.fn.raty = function(method) {
+    if (methods[method]) {
+      return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+    } else if (typeof method === 'object' || !method) {
+      return methods.init.apply(this, arguments);
+    } else {
+      $.error('Method ' + method + ' does not exist!');
+    }
+  };
+
+  $.fn.raty.defaults = {
+    cancel        : false,
+    cancelHint    : 'Cancel this rating!',
+    cancelOff     : 'cancel-off.png',
+    cancelOn      : 'cancel-on.png',
+    cancelPlace   : 'left',
+    click         : undefined,
+    half          : false,
+    halfShow      : true,
+    hints         : ['bad', 'poor', 'regular', 'good', 'gorgeous'],
+    iconRange     : undefined,
+    mouseout      : undefined,
+    mouseover     : undefined,
+    noRatedMsg    : 'Not rated yet!',
+    number        : 5,
+    numberMax     : 20,
+    path          : 'js/raty/lib/img/',
+    precision     : false,
+    readOnly      : false,
+    round         : { down: .25, full: .6, up: .76 },
+    score         : undefined,
+    scoreName     : 'score',
+    single        : false,
+    size          : 16,
+    space         : true,
+    starHalf      : 'star-half.png',
+    starOff       : 'star-off.png',
+    starOn        : 'star-on.png',
+    target        : undefined,
+    targetFormat  : '{score}',
+    targetKeep    : false,
+    targetText    : '',
+    targetType    : 'hint',
+    width         : undefined
+  };
+
+})(jQuery);
+/*!
+ * jQuery Raty - A Star Rating Plugin
+ *
+ * Licensed under The MIT License
+ *
+ * @version        2.5.2
+ * @author         Washington Botelho
+ * @documentation  wbotelhos.com/raty
+ *
+ */
+
+;(function(b){var a={init:function(c){return this.each(function(){a.destroy.call(this);this.opt=b.extend(true,{},b.fn.raty.defaults,c);var e=b(this),g=["number","readOnly","score","scoreName"];a._callback.call(this,g);if(this.opt.precision){a._adjustPrecision.call(this);}this.opt.number=a._between(this.opt.number,0,this.opt.numberMax);this.opt.path=this.opt.path||"";if(this.opt.path&&this.opt.path.slice(this.opt.path.length-1,this.opt.path.length)!=="/"){this.opt.path+="/";}this.stars=a._createStars.call(this);this.score=a._createScore.call(this);a._apply.call(this,this.opt.score);var f=this.opt.space?4:0,d=this.opt.width||(this.opt.number*this.opt.size+this.opt.number*f);if(this.opt.cancel){this.cancel=a._createCancel.call(this);d+=(this.opt.size+f);}if(this.opt.readOnly){a._lock.call(this);}else{e.css("cursor","pointer");a._binds.call(this);}if(this.opt.width!==false){e.css("width",d);}a._target.call(this,this.opt.score);e.data({settings:this.opt,raty:true});});},_adjustPrecision:function(){this.opt.targetType="score";this.opt.half=true;},_apply:function(c){if(c&&c>0){c=a._between(c,0,this.opt.number);this.score.val(c);}a._fill.call(this,c);if(c){a._roundStars.call(this,c);}},_between:function(e,d,c){return Math.min(Math.max(parseFloat(e),d),c);},_binds:function(){if(this.cancel){a._bindCancel.call(this);}a._bindClick.call(this);a._bindOut.call(this);a._bindOver.call(this);},_bindCancel:function(){a._bindClickCancel.call(this);a._bindOutCancel.call(this);a._bindOverCancel.call(this);},_bindClick:function(){var c=this,d=b(c);c.stars.on("click.raty",function(e){c.score.val((c.opt.half||c.opt.precision)?d.data("score"):this.alt);if(c.opt.click){c.opt.click.call(c,parseFloat(c.score.val()),e);}});},_bindClickCancel:function(){var c=this;c.cancel.on("click.raty",function(d){c.score.removeAttr("value");if(c.opt.click){c.opt.click.call(c,null,d);}});},_bindOut:function(){var c=this;b(this).on("mouseleave.raty",function(d){var e=parseFloat(c.score.val())||undefined;a._apply.call(c,e);a._target.call(c,e,d);if(c.opt.mouseout){c.opt.mouseout.call(c,e,d);}});},_bindOutCancel:function(){var c=this;c.cancel.on("mouseleave.raty",function(d){b(this).attr("src",c.opt.path+c.opt.cancelOff);if(c.opt.mouseout){c.opt.mouseout.call(c,c.score.val()||null,d);}});},_bindOverCancel:function(){var c=this;c.cancel.on("mouseover.raty",function(d){b(this).attr("src",c.opt.path+c.opt.cancelOn);c.stars.attr("src",c.opt.path+c.opt.starOff);a._target.call(c,null,d);if(c.opt.mouseover){c.opt.mouseover.call(c,null);}});},_bindOver:function(){var c=this,d=b(c),e=c.opt.half?"mousemove.raty":"mouseover.raty";c.stars.on(e,function(g){var h=parseInt(this.alt,10);if(c.opt.half){var f=parseFloat((g.pageX-b(this).offset().left)/c.opt.size),j=(f>0.5)?1:0.5;h=h-1+j;a._fill.call(c,h);if(c.opt.precision){h=h-j+f;}a._roundStars.call(c,h);d.data("score",h);}else{a._fill.call(c,h);}a._target.call(c,h,g);if(c.opt.mouseover){c.opt.mouseover.call(c,h,g);}});},_callback:function(c){for(i in c){if(typeof this.opt[c[i]]==="function"){this.opt[c[i]]=this.opt[c[i]].call(this);}}},_createCancel:function(){var e=b(this),c=this.opt.path+this.opt.cancelOff,d=b("<img />",{src:c,alt:"x",title:this.opt.cancelHint,"class":"raty-cancel"});if(this.opt.cancelPlace=="left"){e.prepend("&#160;").prepend(d);}else{e.append("&#160;").append(d);}return d;},_createScore:function(){return b("<input />",{type:"hidden",name:this.opt.scoreName}).appendTo(this);},_createStars:function(){var e=b(this);for(var c=1;c<=this.opt.number;c++){var f=a._getHint.call(this,c),d=(this.opt.score&&this.opt.score>=c)?"starOn":"starOff";d=this.opt.path+this.opt[d];b("<img />",{src:d,alt:c,title:f}).appendTo(this);if(this.opt.space){e.append((c<this.opt.number)?"&#160;":"");}}return e.children("img");},_error:function(c){b(this).html(c);b.error(c);},_fill:function(d){var m=this,e=0;for(var f=1;f<=m.stars.length;f++){var g=m.stars.eq(f-1),l=m.opt.single?(f==d):(f<=d);if(m.opt.iconRange&&m.opt.iconRange.length>e){var j=m.opt.iconRange[e],h=j.on||m.opt.starOn,c=j.off||m.opt.starOff,k=l?h:c;if(f<=j.range){g.attr("src",m.opt.path+k);}if(f==j.range){e++;}}else{var k=l?"starOn":"starOff";g.attr("src",this.opt.path+this.opt[k]);}}},_getHint:function(d){var c=this.opt.hints[d-1];return(c==="")?"":(c||d);},_lock:function(){var d=parseInt(this.score.val(),10),c=d?a._getHint.call(this,d):this.opt.noRatedMsg;b(this).data("readonly",true).css("cursor","").attr("title",c);this.score.attr("readonly","readonly");this.stars.attr("title",c);if(this.cancel){this.cancel.hide();}},_roundStars:function(e){var d=(e-Math.floor(e)).toFixed(2);if(d>this.opt.round.down){var c="starOn";if(this.opt.halfShow&&d<this.opt.round.up){c="starHalf";}else{if(d<this.opt.round.full){c="starOff";}}this.stars.eq(Math.ceil(e)-1).attr("src",this.opt.path+this.opt[c]);}},_target:function(f,d){if(this.opt.target){var e=b(this.opt.target);if(e.length===0){a._error.call(this,"Target selector invalid or missing!");}if(this.opt.targetFormat.indexOf("{score}")<0){a._error.call(this,'Template "{score}" missing!');}var c=d&&d.type=="mouseover";if(f===undefined){f=this.opt.targetText;}else{if(f===null){f=c?this.opt.cancelHint:this.opt.targetText;}else{if(this.opt.targetType=="hint"){f=a._getHint.call(this,Math.ceil(f));}else{if(this.opt.precision){f=parseFloat(f).toFixed(1);}}if(!c&&!this.opt.targetKeep){f=this.opt.targetText;}}}if(f){f=this.opt.targetFormat.toString().replace("{score}",f);}if(e.is(":input")){e.val(f);}else{e.html(f);}}},_unlock:function(){b(this).data("readonly",false).css("cursor","pointer").removeAttr("title");this.score.removeAttr("readonly","readonly");for(var c=0;c<this.opt.number;c++){this.stars.eq(c).attr("title",a._getHint.call(this,c+1));}if(this.cancel){this.cancel.css("display","");}},cancel:function(c){return this.each(function(){if(b(this).data("readonly")!==true){a[c?"click":"score"].call(this,null);this.score.removeAttr("value");}});},click:function(c){return b(this).each(function(){if(b(this).data("readonly")!==true){a._apply.call(this,c);if(!this.opt.click){a._error.call(this,'You must add the "click: function(score, evt) { }" callback.');}this.opt.click.call(this,c,{type:"click"});a._target.call(this,c);}});},destroy:function(){return b(this).each(function(){var d=b(this),c=d.data("raw");if(c){d.off(".raty").empty().css({cursor:c.style.cursor,width:c.style.width}).removeData("readonly");}else{d.data("raw",d.clone()[0]);}});},getScore:function(){var d=[],c;b(this).each(function(){c=this.score.val();d.push(c?parseFloat(c):undefined);});return(d.length>1)?d:d[0];},readOnly:function(c){return this.each(function(){var d=b(this);if(d.data("readonly")!==c){if(c){d.off(".raty").children("img").off(".raty");a._lock.call(this);}else{a._binds.call(this);a._unlock.call(this);}d.data("readonly",c);}});},reload:function(){return a.set.call(this,{});},score:function(){return arguments.length?a.setScore.apply(this,arguments):a.getScore.call(this);},set:function(c){return this.each(function(){var e=b(this),f=e.data("settings"),d=b.extend({},f,c);e.raty(d);});},setScore:function(c){return b(this).each(function(){if(b(this).data("readonly")!==true){a._apply.call(this,c);a._target.call(this,c);}});}};b.fn.raty=function(c){if(a[c]){return a[c].apply(this,Array.prototype.slice.call(arguments,1));}else{if(typeof c==="object"||!c){return a.init.apply(this,arguments);}else{b.error("Method "+c+" does not exist!");}}};b.fn.raty.defaults={cancel:false,cancelHint:"Cancel this rating!",cancelOff:"cancel-off.png",cancelOn:"cancel-on.png",cancelPlace:"left",click:undefined,half:false,halfShow:true,hints:["bad","poor","regular","good","gorgeous"],iconRange:undefined,mouseout:undefined,mouseover:undefined,noRatedMsg:"Not rated yet!",number:5,numberMax:20,path:"",precision:false,readOnly:false,round:{down:0.25,full:0.6,up:0.76},score:undefined,scoreName:"score",single:false,size:16,space:true,starHalf:"star-half.png",starOff:"star-off.png",starOn:"star-on.png",target:undefined,targetFormat:"{score}",targetKeep:false,targetText:"",targetType:"hint",width:undefined};})(jQuery);
@@ -401,7 +401,6 @@
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
 			});
 			$.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
-				console.log(result);
 				var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
 				$('#forms .scheduleDaily_2').html(scheduleDaily_2);
 			});
@@ -541,9 +540,18 @@
 				<td>{{obj.fast}}</td>
 				<td>{{obj.slow}}</td>
 				<td>{{obj.fcsj}}</td>
-				<td>{{obj.fcsjActual}}</td>
+				<td>{{obj.fcsjActual}}
+				{{if obj.bcType== "in"}}
+						(进)
+					{{/if}}
+					{{if obj.bcType== "out"}}
+						(出)
+					{{/if}}
+			</td>
 				<td>{{obj.fast0}}</td>
-				<td>{{obj.slow0}}</td>
+				<td>{{obj.slow0}}
+					
+				</td>
 				<td colspan="2">{{obj.remarks}}</td>
 		{{if (i+1)%3 == 0}}
 				<td>&nbsp;</td>
@@ -247,8 +247,15 @@
 			if(date==null || date =="" ||date2==null || date2 ==""){
 				 layer.msg('请选择时间段.');
 			}else{
-				
-				$get('/realSchedule/statisticsDailyTj',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,xlName:xlName,type:"query"},function(result){
+				 var params = {};
+				 params['gsdm'] = gsdm;
+				 params['fgsdm'] =fgsdm ;
+				 params['line'] = line;
+				 params['date'] = date;
+				 params['date2'] = date2;
+				 params['xlName'] = xlName;
+				 params['type'] = "query";
+				$get('/realSchedule/statisticsDailyTj',params,function(result){
 					// 把数据填充到模版中
 					var tbodyHtml = template('statisticsDaily',{list:result});
 					// 把渲染好的模版html文本追加到表格中
@@ -264,7 +271,15 @@
 		});
  
 		$("#export").on("click",function(){
-			$get('/realSchedule/statisticsDailyTj',{gsdm:gsdm,fgsdm:fgsdm,line:line,date:date,date2:date2,xlName:xlName,type:"export"},function(result){
+			 var params = {};
+			 params['gsdm'] = gsdm;
+			 params['fgsdm'] =fgsdm ;
+			 params['line'] = line;
+			 params['date'] = date;
+			 params['date2'] = date2;
+			 params['xlName'] = xlName;
+			 params['type'] = "export";
+			$get('/realSchedule/statisticsDailyTj',params,function(result){
 				window.open("/downloadFile/download?fileName=统计日报"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -307,7 +307,7 @@
 					param[index][i] = $(this).text().split("\\")[0];
 				});
 			});
-			$post('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
+			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
 				window.open("/downloadFile/downloadList?fileName="+result.fileName);
 			});
 		});
@@ -435,7 +435,7 @@
 			<td>{{obj.fast}}</td>
 			<td>{{obj.slow}}</td>
 			<td>
-			{{if obj.fcsjActual !=null || obj.zdsjActual!=null}}
+			{{if obj.zdsjActual!=null}}
 				{{obj.jhlc}}
 			{{/if}}
 			</td>
@@ -97,8 +97,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         }
                     }
                 } else {
-                    this.isValidInfo = true;
-                    return true;
+                    this.isValidInfo = false;
+                    return false;
                 }
             };
  
@@ -324,7 +324,7 @@
                                                 ng-dblclick="$saTimeTableCtrl.$$cell_dbclick(rowIndex, colIndex, cell)"
                                                 ng-class="{
                                                     lpName: !cell.ttdid,
-                                                    error: cell.invalidFlag,
+                                                    error: cell.isValidInfo,
                                                     active: cell.sel,
                                                     region: cell.bc_type == 'region',
                                                     isfb: cell.isfb
@@ -3795,8 +3795,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         }
                     }
                 } else {
-                    this.isValidInfo = true;
-                    return true;
+                    this.isValidInfo = false;
+                    return false;
                 }
             };
  
@@ -14,8 +14,9 @@
                 <th style="width: 80px;">班次类型</th>
                 <th style="width: 80px;">上下行</th>
                 <th style="width: 80px;">发车时间</th>
-                <th style="width: 100px;">起点站</th>
-                <th style="width: 100px;">终点站</th>
+                <th style="width: 80px;">起点站</th>
+                <th style="width: 80px;">终点站</th>
+                <th style="width: 60px">备注</th>
                 <th style="width: 100%">时刻表</th>
                 <th style="width: 90px;">修改人</th>
                 <th style="width: 90px;">修改时间</th>
@@ -110,6 +111,15 @@
                     <a href="#"
                        tooltip-animation="false"
                        tooltip-placement="top"
+                       uib-tooltip="{{info.remark}}"
+                       tooltip-class="headClass">
+                        {{info.remark}}
+                    </a>
+                </td>
+                <td>
+                    <a href="#"
+                       tooltip-animation="false"
+                       tooltip-placement="top"
                        uib-tooltip="{{info.ttInfoName}}"
                        tooltip-class="headClass">
                         {{info.ttInfoName}}
@@ -31,76 +31,160 @@
         <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>
+                    class="caption-subject font-red-sunglo bold uppercase" ng-bind="ctrl.title1"></span>
             </div>
         </div>
  
         <div class="portlet-body form">
             <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
                 <div class="form-body">
-
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">方向：</label>
-                        <div class="col-md-5">
-                            <sa-Radiogroup model="ctrl.tt.xlDir" dicgroup="LineTrend" name="xlDir"></sa-Radiogroup>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">线路*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.xlname"
+                                   readonly/>
                         </div>
  
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">起点站：</label>
-                        <div class="col-md-5">
-                            <sa-Select5 name="qdz"
-                                        model="ctrl.tt"
-                                        cmaps="{'qdz.id' : 'stationid'}"
-                                        dcname="qdz.id"
-                                        icname="stationid"
-                                        dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
-                                        iterobjname="item"
-                                        iterobjexp="item.stationname"
-                                        searchph="请输拼音..."
-                                        searchexp="this.stationname"
-                                         >
-                            </sa-Select5>
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">时刻表名称*：</label>
+                        <div class="col-md-3">
+                            <input type="text" class="form-control"
+                                   ng-value="ctrl.ttname"
+                                   readonly/>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">终点站：</label>
-                        <div class="col-md-5">
-                            <sa-Select5 name="zdz"
-                                        model="ctrl.tt"
-                                        cmaps="{'zdz.id' : 'stationid'}"
-                                        dcname="zdz.id"
-                                        icname="stationid"
-                                        dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
-                                        iterobjname="item"
-                                        iterobjexp="item.stationname"
-                                        searchph="请输拼音..."
-                                        searchexp="this.stationname"
-                                         >
-                            </sa-Select5>
+
+                    <div class="form-group" ng-if="ctrl.isZdModify == true">
+                        <label class="col-md-2 control-label">方向：</label>
+                        <div class="col-md-3">
+                            <sa-Radiogroup model="ctrl.tt.xlDir" dicgroup="LineTrend" name="xlDir"></sa-Radiogroup>
                         </div>
+
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">停车场：</label>
-                        <div class="col-md-5">
-                            <sa-Select5 name="tcc"
-                                        model="ctrl.tt"
-                                        cmaps="{'tcc.id': 'id'}"
-                                        dcname="tcc.id"
-                                        icname="id"
-                                        dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
-                                        iterobjname="item"
-                                        iterobjexp="item.parkName"
-                                        searchph="请输拼音..."
-                                        searchexp="this.parkName"
-                                         >
-                            </sa-Select5>
+
+                    <div ng-if="ctrl.isZdModify == true">
+
+                        <!--- 出场班次判定 -->
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType == 'out'">
+                            <label class="col-md-2 control-label">停车场：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="tcc"
+                                            model="ctrl.tt"
+                                            cmaps="{'tcc.id': 'id'}"
+                                            dcname="tcc.id"
+                                            icname="id"
+                                            dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.parkName"
+                                            searchph="请输拼音..."
+                                            searchexp="this.parkName"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType == 'out'">
+                            <label class="col-md-2 control-label">终点站：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="zdz"
+                                            model="ctrl.tt"
+                                            cmaps="{'zdz.id' : 'stationid'}"
+                                            dcname="zdz.id"
+                                            icname="stationid"
+                                            dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.stationname"
+                                            searchph="请输拼音..."
+                                            searchexp="this.stationname"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+
+                        <!--- 进场班次判定 -->
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType == 'in'">
+                            <label class="col-md-2 control-label">起点站：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="qdz"
+                                            model="ctrl.tt"
+                                            cmaps="{'qdz.id' : 'stationid'}"
+                                            dcname="qdz.id"
+                                            icname="stationid"
+                                            dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.stationname"
+                                            searchph="请输拼音..."
+                                            searchexp="this.stationname"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType == 'in'">
+                            <label class="col-md-2 control-label">停车场：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="tcc"
+                                            model="ctrl.tt"
+                                            cmaps="{'tcc.id': 'id'}"
+                                            dcname="tcc.id"
+                                            icname="id"
+                                            dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.parkName"
+                                            searchph="请输拼音..."
+                                            searchexp="this.parkName"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+
+                        <!-- 其他班次类型 -->
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType != 'in' && ctrl.tt.bcType != 'out'">
+                            <label class="col-md-2 control-label">起点站：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="qdz"
+                                            model="ctrl.tt"
+                                            cmaps="{'qdz.id' : 'stationid'}"
+                                            dcname="qdz.id"
+                                            icname="stationid"
+                                            dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.stationname"
+                                            searchph="请输拼音..."
+                                            searchexp="this.stationname"
+                                        >
+                                </sa-Select5>
+                            </div>
+                        </div>
+                        <div class="form-group"
+                             ng-if="ctrl.tt.bcType != 'in' && ctrl.tt.bcType != 'out'">
+                            <label class="col-md-2 control-label">终点站：</label>
+                            <div class="col-md-3">
+                                <sa-Select5 name="zdz"
+                                            model="ctrl.tt"
+                                            cmaps="{'zdz.id' : 'stationid'}"
+                                            dcname="zdz.id"
+                                            icname="stationid"
+                                            dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.xlid, 'xldir': ctrl.tt.xlDir}, atype:'zd' } | json }}"
+                                            iterobjname="item"
+                                            iterobjexp="item.stationname"
+                                            searchph="请输拼音..."
+                                            searchexp="this.stationname"
+                                        >
+                                </sa-Select5>
+                            </div>
                         </div>
+
                     </div>
  
                     <div class="form-group">
-                        <label class="col-md-3 control-label">发车时间：</label>
-                        <div class="col-md-5">
+                        <label class="col-md-2 control-label">发车时间：</label>
+                        <div class="col-md-3">
                             <input type="text" class="form-control" name="fcsj"
                                    ng-model="ctrl.tt.fcsj"
                                    ng-pattern="ctrl.time_regex"
@@ -113,8 +197,8 @@
  
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">计划里程：</label>
-                        <div class="col-md-5">
+                        <label class="col-md-2 control-label">计划里程：</label>
+                        <div class="col-md-3">
                             <input type="text" class="form-control" name="jhlc"
                                    ng-model="ctrl.tt.jhlc"
                                    ng-pattern="ctrl.float_regex"
@@ -127,8 +211,8 @@
  
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">班次历时：</label>
-                        <div class="col-md-5">
+                        <label class="col-md-2 control-label">班次历时：</label>
+                        <div class="col-md-3">
                             <input type="text" class="form-control" name="bcsj"
                                    ng-model="ctrl.tt.bcsj"
                                    ng-pattern="ctrl.number_regex"
@@ -140,9 +224,10 @@
                         </div>
  
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">班次类型：</label>
-                        <div class="col-md-5">
+                    <div class="form-group"
+                         ng-if="ctrl.isZdModify == true">
+                        <label class="col-md-2 control-label">班次类型：</label>
+                        <div class="col-md-3">
                             <sa-Select5 name="bcType"
                                         model="ctrl.tt"
                                         cmaps="{'bcType': 'code'}"
@@ -159,6 +244,14 @@
  
                     </div>
  
+                    <div class="form-group has-success has-feedback">
+                        <label class="col-md-2 control-label">开始分班：</label>
+                        <div class="col-md-3">
+                            <sa-Radiogroup model="ctrl.tt.isFB" dicgroup="truefalseType" name="isFB"></sa-Radiogroup>
+                        </div>
+
+                    </div>
+
                 </div>
  
                 <div class="form-actions">
@@ -184,6 +184,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                                         ttinfodetailIds[index].qdz = value.qdz || undefined;
                                         ttinfodetailIds[index].zdz = value.zdz || undefined;
                                         ttinfodetailIds[index].tcc = value.tcc || undefined;
+                                        ttinfodetailIds[index].isfb = value.isFB || undefined;
  
                                         ttinfodetailIds[index].validInfo();
  
@@ -585,10 +586,16 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         '$stateParams',
         '$state',
         function(service, $stateParams, $state) {
-            // TODO：
-
             var self = this;
-            var TTInfoDetail = service.getQueryClass();
+            // 获取传过来的id，有的话就是修改，获取一遍数据
+            self.xlid = $stateParams.xlid; // 获取传过来的线路id
+            self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
+            self.xlname = $stateParams.xlname; // 获取传过来的线路名字
+            self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+
+            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息 批量修改班次信息";
+
+            //var TTInfoDetail = service.getQueryClass();
  
             // 时间正则表达式（格式hh:mm，如：06:39）
             self.time_regex = /^([01]?[0-9]|2[0-3]):[0-5][0-9]$/;
@@ -599,11 +606,14 @@ angular.module(&#39;ScheduleApp&#39;).controller(
  
             // 欲保存的busInfo信息，绑定
             //self.tt = new TTInfoDetail;
+
             self.tt = {
                 xlDir: undefined,
                 tcc: {id: undefined},
                 qdz: {id: undefined},
                 zdz: {id: undefined},
+                bcType: undefined,
+                isFB: undefined,
                 reSetTTinfoDetail: function(value) {
                     for (var key in this) {
                         if (!angular.isFunction(this[key])) {
@@ -611,7 +621,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                                 if (this[key].id) {
                                     value[key] = this[key];
                                 }
-                            } else if (this[key]) {
+                            } else if (this[key] != undefined) {
                                 value[key] = this[key];
                             }
                         }
@@ -619,13 +629,32 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 }
             };
  
-            // 获取传过来的id，有的话就是修改，获取一遍数据
-            self.xlid = $stateParams.xlid; // 获取传过来的线路id
-            self.ttid = $stateParams.ttid; // 获取传过来的时刻表id
-            self.xlname = $stateParams.xlname; // 获取传过来的线路名字
-            self.ttname = $stateParams.ttname; // 获取传过来的时刻表名字
+            // 修正self.tt
  
-            self.title1 = self.xlname + "（" + self.ttname + "）" + "时刻表明细信息";
+            self.isZdModify = false; // 是否可以修改站点（如果不是同一圈的数据是不能修改站点的）
+            var colIndexs_maps = {};
+            var detailInfos = service.getEditInfo().detailInfos;
+            for (var i = 0; i < detailInfos.length; i++) {
+                for (var j = 0; j < detailInfos[i].length; j++) {
+                    if (detailInfos[i][j].canDelete()) {
+                        colIndexs_maps[j] = j;
+                    }
+                }
+            }
+            var colIndexs = [];
+            for (var kk in colIndexs_maps) {
+                colIndexs.push(kk);
+            }
+            if (colIndexs.length == 1) {
+                self.isZdModify = true;
+                var columnBcInfo = service.getEditInfo().columnBcInfo[colIndexs[0]];
+
+                self.tt.xlDir = columnBcInfo.xldir;
+                self.tt.bcType = columnBcInfo.bc_type;
+                self.tt.qdz.id = columnBcInfo.qdz;
+                self.tt.zdz.id = columnBcInfo.zdz;
+                self.tt.tcc.id = columnBcInfo.tcc;
+            }
  
             // 提交方法
             self.submit = function() {
@@ -646,6 +675,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 //    });
                 //});
  
+                console.log(self.tt);
+
                 service.editInfos(self.tt).then(function() {
                     $state.go("ttInfoDetailManage_edit3", {
                         xlid: self.xlid,
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+!function(i){var t;window.UIkit&&(t=i(UIkit)),"function"==typeof define&&define.amd&&define("uikit-lightbox",["uikit"],function(){return t||i(UIkit)})}(function(i){"use strict";function t(t){if(e)return e.lightbox=t,e;e=i.$(['<div class="uk-modal">','<div class="uk-modal-dialog uk-modal-dialog-lightbox uk-slidenav-position" style="margin-left:auto;margin-right:auto;width:200px;height:200px;top:'+Math.abs(window.innerHeight/2-200)+'px;">','<a href="#" class="uk-modal-close uk-close uk-close-alt"></a>','<div class="uk-lightbox-content"></div>','<div class="uk-modal-spinner uk-hidden"></div>',"</div>","</div>"].join("")).appendTo("body"),e.dialog=e.find(".uk-modal-dialog:first"),e.content=e.find(".uk-lightbox-content:first"),e.loader=e.find(".uk-modal-spinner:first"),e.closer=e.find(".uk-close.uk-close-alt"),e.modal=i.modal(e,{modal:!1}),e.on("swipeRight swipeLeft",function(i){e.lightbox["swipeLeft"==i.type?"next":"previous"]()}).on("click","[data-lightbox-previous], [data-lightbox-next]",function(t){t.preventDefault(),e.lightbox[i.$(this).is("[data-lightbox-next]")?"next":"previous"]()}),e.on("hide.uk.modal",function(){e.content.html("")});var o={w:window.innerWidth,h:window.innerHeight};return i.$win.on("load resize orientationchange",i.Utils.debounce(function(){o.w!==window.innerWidth&&e.is(":visible")&&!i.Utils.isFullscreen()&&e.lightbox.fitSize(),o={w:window.innerWidth,h:window.innerHeight}},100)),e.lightbox=t,e}var e,o={};return i.component("lightbox",{defaults:{allowfullscreen:!0,duration:400,group:!1,keyboard:!0},index:0,items:!1,boot:function(){i.$html.on("click","[data-uk-lightbox]",function(t){t.preventDefault();var e=i.$(this);e.data("lightbox")||i.lightbox(e,i.Utils.options(e.attr("data-uk-lightbox"))),e.data("lightbox").show(e)}),i.$doc.on("keyup",function(i){if(e&&e.is(":visible")&&e.lightbox.options.keyboard)switch(i.preventDefault(),i.keyCode){case 37:e.lightbox.previous();break;case 39:e.lightbox.next()}})},init:function(){var t=[];if(this.index=0,this.siblings=[],this.element&&this.element.length){var e=this.options.group?i.$(['[data-uk-lightbox*="'+this.options.group+'"]',"[data-uk-lightbox*='"+this.options.group+"']"].join(",")):this.element;e.each(function(){var e=i.$(this);t.push({source:e.attr("href"),title:e.attr("data-title")||e.attr("title"),type:e.attr("data-lightbox-type")||"auto",link:e})}),this.index=e.index(this.element),this.siblings=t}else this.options.group&&this.options.group.length&&(this.siblings=this.options.group);this.trigger("lightbox-init",[this])},show:function(e){this.modal=t(this),this.modal.dialog.stop(),this.modal.content.stop();var o,n,s=this,h=i.$.Deferred();e=e||0,"object"==typeof e&&this.siblings.forEach(function(i,t){e[0]===i.link[0]&&(e=t)}),0>e?e=this.siblings.length-e:this.siblings[e]||(e=0),n=this.siblings[e],o={lightbox:s,source:n.source,type:n.type,index:e,promise:h,title:n.title,item:n,meta:{content:"",width:null,height:null}},this.index=e,this.modal.content.empty(),this.modal.is(":visible")||(this.modal.content.css({width:"",height:""}).empty(),this.modal.modal.show()),this.modal.loader.removeClass("uk-hidden"),h.promise().done(function(){s.data=o,s.fitSize(o)}).fail(function(){o.meta.content='<div class="uk-position-cover uk-flex uk-flex-middle uk-flex-center"><strong>Loading resource failed!</strong></div>',o.meta.width=400,o.meta.height=300,s.data=o,s.fitSize(o)}),s.trigger("showitem.uk.lightbox",[o])},fitSize:function(){var t=this,e=this.data,o=this.modal.dialog.outerWidth()-this.modal.dialog.width(),n=parseInt(this.modal.dialog.css("margin-top"),10),s=parseInt(this.modal.dialog.css("margin-bottom"),10),h=n+s,a=e.meta.content,l=t.options.duration;this.siblings.length>1&&(a=[a,'<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-previous uk-hidden-touch" data-lightbox-previous></a>','<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-next uk-hidden-touch" data-lightbox-next></a>'].join(""));var d,r,u=i.$("<div>&nbsp;</div>").css({opacity:0,position:"absolute",top:0,left:0,width:"100%","max-width":t.modal.dialog.css("max-width"),padding:t.modal.dialog.css("padding"),margin:t.modal.dialog.css("margin")}),c=e.meta.width,g=e.meta.height;u.appendTo("body").width(),d=u.width(),r=window.innerHeight-h,u.remove(),this.modal.dialog.find(".uk-modal-caption").remove(),e.title&&(this.modal.dialog.append('<div class="uk-modal-caption">'+e.title+"</div>"),r-=this.modal.dialog.find(".uk-modal-caption").outerHeight()),d<e.meta.width&&(g=Math.floor(g*(d/c)),c=d),g>r&&(g=Math.floor(r),c=Math.ceil(e.meta.width*(r/e.meta.height))),this.modal.content.css("opacity",0).width(c).html(a),"iframe"==e.type&&this.modal.content.find("iframe:first").height(g);var m=g+o,p=Math.floor(window.innerHeight/2-m/2)-h;0>p&&(p=0),this.modal.closer.addClass("uk-hidden"),t.modal.data("mwidth")==c&&t.modal.data("mheight")==g&&(l=0),this.modal.dialog.animate({width:c+o,height:g+o,top:p},l,"swing",function(){t.modal.loader.addClass("uk-hidden"),t.modal.content.css({width:""}).animate({opacity:1},function(){t.modal.closer.removeClass("uk-hidden")}),t.modal.data({mwidth:c,mheight:g})})},next:function(){this.show(this.siblings[this.index+1]?this.index+1:0)},previous:function(){this.show(this.siblings[this.index-1]?this.index-1:this.siblings.length-1)}}),i.plugin("lightbox","image",{init:function(i){i.on("showitem.uk.lightbox",function(i,t){if("image"==t.type||t.source&&t.source.match(/\.(jpg|jpeg|png|gif|svg)$/i)){var e=function(i,e,o){t.meta={content:'<img class="uk-responsive-width" width="'+e+'" height="'+o+'" src ="'+i+'">',width:e,height:o},t.type="image",t.promise.resolve()};if(o[t.source])e(t.source,o[t.source].width,o[t.source].height);else{var n=new Image;n.onerror=function(){t.promise.reject("Loading image failed")},n.onload=function(){o[t.source]={width:n.width,height:n.height},e(t.source,o[t.source].width,o[t.source].height)},n.src=t.source}}})}}),i.plugin("lightbox","youtube",{init:function(i){var t=/(\/\/.*?youtube\.[a-z]+)\/watch\?v=([^&]+)&?(.*)/,n=/youtu\.be\/(.*)/;i.on("showitem.uk.lightbox",function(i,s){var h,a,l=function(i,t,o){s.meta={content:'<iframe src="//www.youtube.com/embed/'+i+'" width="'+t+'" height="'+o+'" style="max-width:100%;"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:o},s.type="iframe",s.promise.resolve()};if((a=s.source.match(t))&&(h=a[2]),(a=s.source.match(n))&&(h=a[1]),h){if(o[h])l(h,o[h].width,o[h].height);else{var d=new Image,r=!1;d.onerror=function(){o[h]={width:640,height:320},l(h,o[h].width,o[h].height)},d.onload=function(){120==d.width&&90==d.height?r?(o[h]={width:640,height:320},l(h,o[h].width,o[h].height)):(r=!0,d.src="//img.youtube.com/vi/"+h+"/0.jpg"):(o[h]={width:d.width,height:d.height},l(h,d.width,d.height))},d.src="//img.youtube.com/vi/"+h+"/maxresdefault.jpg"}i.stopImmediatePropagation()}})}}),i.plugin("lightbox","vimeo",{init:function(t){var n,s=/(\/\/.*?)vimeo\.[a-z]+\/([0-9]+).*?/;t.on("showitem.uk.lightbox",function(t,h){var a,l=function(i,t,o){h.meta={content:'<iframe src="//player.vimeo.com/video/'+i+'" width="'+t+'" height="'+o+'" style="width:100%;box-sizing:border-box;"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:o},h.type="iframe",h.promise.resolve()};(n=h.source.match(s))&&(a=n[2],o[a]?l(a,o[a].width,o[a].height):i.$.ajax({type:"GET",url:"//vimeo.com/api/oembed.json?url="+encodeURI(h.source),jsonp:"callback",dataType:"jsonp",success:function(i){o[a]={width:i.width,height:i.height},l(a,o[a].width,o[a].height)}}),t.stopImmediatePropagation())})}}),i.plugin("lightbox","video",{init:function(t){t.on("showitem.uk.lightbox",function(t,e){var n=function(i,t,o){e.meta={content:'<video class="uk-responsive-width" src="'+i+'" width="'+t+'" height="'+o+'" controls></video>',width:t,height:o},e.type="video",e.promise.resolve()};if("video"==e.type||e.source.match(/\.(mp4|webm|ogv)$/i))if(o[e.source])n(e.source,o[e.source].width,o[e.source].height);else var s=i.$('<video style="position:fixed;visibility:hidden;top:-10000px;"></video>').attr("src",e.source).appendTo("body"),h=setInterval(function(){s[0].videoWidth&&(clearInterval(h),o[e.source]={width:s[0].videoWidth,height:s[0].videoHeight},n(e.source,o[e.source].width,o[e.source].height),s.remove())},20)})}}),UIkit.plugin("lightbox","iframe",{init:function(i){i.on("showitem.uk.lightbox",function(t,o){var n=function(i,t,n){o.meta={content:'<iframe class="uk-responsive-width" src="'+i+'" width="'+t+'" height="'+n+'"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:n},o.type="iframe",o.promise.resolve()};("iframe"===o.type||o.source.match(/\.(html|php)$/))&&n(o.source,i.options.width||800,i.options.height||600)})}}),i.lightbox.create=function(t,e){if(t){var o,n=[];return t.forEach(function(t){n.push(i.$.extend({source:"",title:"",type:"auto",link:!1},"string"==typeof t?{source:t}:t))}),o=i.lightbox(i.$.extend({},e,{group:n}))}},i.lightbox});
 \ No newline at end of file
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+.uk-slidenav{display:inline-block;box-sizing:border-box;width:60px;height:60px;line-height:60px;color:rgba(50,50,50,.4);font-size:60px;text-align:center}.uk-slidenav:focus,.uk-slidenav:hover{outline:0;text-decoration:none;color:rgba(50,50,50,.7);cursor:pointer}.uk-slidenav:active{color:rgba(50,50,50,.9)}.uk-slidenav-previous:before{content:"\f104";font-family:FontAwesome}.uk-slidenav-next:before{content:"\f105";font-family:FontAwesome}.uk-slidenav-position{position:relative}.uk-slidenav-position .uk-slidenav{display:none;position:absolute;top:50%;z-index:1;margin-top:-30px}.uk-slidenav-position:hover .uk-slidenav{display:block}.uk-slidenav-position .uk-slidenav-previous{left:20px}.uk-slidenav-position .uk-slidenav-next{right:20px}.uk-slidenav-contrast{color:rgba(255,255,255,.5)}.uk-slidenav-contrast:focus,.uk-slidenav-contrast:hover{color:rgba(255,255,255,.7)}.uk-slidenav-contrast:active{color:rgba(255,255,255,.9)}
 \ No newline at end of file
@@ -930,18 +930,19 @@ option.oil_station_opt{
     position: absolute;
     right: 12px;
     bottom: 12px;
+    z-index: 99;
 }
  
 .safe_driv_pop{
-    height: 45px;
     background: #d44b4b;
-    color: #f2f2f2;
     font-size: 15px;
     padding: 9px 10px 0;
     border: 1px solid #f4f0f0;
     border-radius: 5px;
     cursor: pointer;
     box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    transition: all .03s;
+    color: #f2f2f2;
 }
  
 .safe_driv_pop:hover{
@@ -949,15 +950,33 @@ option.oil_station_opt{
 }
  
 .safe_driv_pop .title{
-    font-weight: 600;
 }
  
-.safe_driv_pop i.uk-icon-times-circle{
+/*.safe_driv_pop i.uk-icon-times-circle{
     margin-right: 5px;
-}
+}*/
 .safe_driv_pop .desc{
     display: block;
     font-size: 12px;
-    margin: 2px 0 0 20px;
-    color: #e3e3e3;
-}
 \ No newline at end of file
+    color: #ff9d9d;
+    text-align: right;
+    margin-right: 5px;
+}
+
+/*.safe_driv_pop .detail_content{
+    display: none;
+}
+
+.safe_driv_pop.open .detail_content{
+    display: block;
+    background: rgb(255, 255, 255);
+    height: 200px;
+    margin: 7px 0;
+    border-radius: 5px;
+    color: #000000;
+}
+
+.safe_driv_pop.open .desc{
+    display: none;
+}*/
+/** 安全驾驶相关css结束 */
 \ No newline at end of file
@@ -291,7 +291,7 @@
 }
  
 .uk-form-icon i{
-    z-index: 999 !important;
+    z-index: 98 !important;
 }
  
 .uk-form-icon .uk-autocomplete input{
@@ -97,6 +97,8 @@
                 <span class="uk-badge uk-badge-danger">直放</span>
                 {{else if sch.bcType == "major"}}
                 <span class="uk-badge uk-badge-danger">放站</span>
+                {{else if sch.bcType == "region"}}
+                <span class="uk-badge">区间</span>
                 {{/if}}
                 {{if sch.sflj}}
                 <span class="uk-badge uk-badge-danger">临加</span>
@@ -422,7 +424,7 @@
                                 name: '加油'
                             },
                             'add_sub_task_in': {
-                                name: '回场'
+                                name: '进场'
                             },
                             'add_sub_task_out': {
                                 name: '出场'
@@ -72,6 +72,8 @@
                                     <span class="uk-badge uk-badge-danger">直放</span>
                                     {{else if sch.bcType == "major"}}
                                     <span class="uk-badge uk-badge-danger">放站</span>
+                                    {{else if sch.bcType == "region"}}
+                                    <span class="uk-badge">区间</span>
                                     {{/if}}
                                     {{if sch.sflj}}
                                     <span class="uk-badge uk-badge-danger">临加</span>
@@ -119,6 +121,8 @@
             <span class="uk-badge uk-badge-danger">直放</span>
             {{else if bcType == "major"}}
             <span class="uk-badge uk-badge-danger">放站</span>
+            {{else if bcType == "region"}}
+            <span class="uk-badge">区间</span>
             {{/if}}
             {{if sflj}}
             <span class="uk-badge uk-badge-danger">临加</span>
-<div class="uk-modal" id="all-devices-modal">
+<div class="uk-modal ct_move_modal" id="all-devices-modal">
     <div class="uk-modal-dialog" style="width: 1100px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
+<div class="uk-modal ct_move_modal" id="safe_dring_list-modal" style="z-index: 99;">
+    <div class="uk-modal-dialog" style="width: 1100px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>安全驾驶图像信息（当日）</h2></div>
+
+            <div class="uk-panel uk-panel-box uk-panel-box-primary">
+                <form class="uk-form search-form">
+                    <fieldset data-uk-margin>
+                        <legend>
+                            数据检索
+                        </legend>
+                        <span class="horizontal-field">车辆</span>
+                        <div class="uk-autocomplete uk-form autocomplete-cars" >
+                            <input type="text" name="clzbh" placeholder="车辆自编号">
+                        </div>
+                        <span class="horizontal-field">异常类型</span>
+                        <select name="yczltype">
+                            <option value="">全部</option>
+                            <option value="A1">手部离开方向盘</option>
+                            <option value="A2">摄像头异常</option>
+                            <option value="A3">未戴安全带</option>
+                            <option value="A4">未戴袖章</option>
+                            <option value="A5">眨眼/疲劳驾驶</option>
+                            <option value="A6">打哈欠/打瞌睡</option>
+                            <option value="A7">行驶中与人交谈</option>
+                        </select>
+                        <button class="uk-button">检索</button>
+                    </fieldset>
+                </form>
+            </div>
+        <div style="height: 495px;margin:5px 0 -18px;">
+            <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>视频</th>
+                </tr>
+                </thead>
+                <tbody data-uk-observe>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="uk-modal-footer uk-text-right pagination-wrap">
+        </div>
+    </div>
+
+    <script id="all-safe_dring-table-temp" type="text/html">
+        {{each array as sd i}}
+        <tr>
+            <td style="width: 14%;">{{sd.xlmc}}</td>
+            <td style="width: 14%;">{{sd.clzbh}}</td>
+            <td style="width: 13%;">{{sd.sbbh}}</td>
+            <td style="width: 13%;">{{sd.yczlText}}</td>
+            <td style="width: 10%;">{{sd.timeStr}}</td>
+            <td style="width: 10%;">
+                {{if sd.yczltype=='A1'}}
+                    {{if sd.jctype==0}}
+                        双脱手
+                    {{else if sd.jctype==1}}
+                        单脱手
+                    {{/if}}
+                {{/if}}
+            </td>
+            <td style="width: 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>
+            </td>
+        </tr>
+        {{/each}}
+    </script>
+
+    <script>
+        (function() {
+            var modal = '#safe_dring_list-modal';
+            var form = $('.search-form', modal);
+            var page = 0;
+            var pageSize = 12;
+
+            $(modal).on('init', function(e, data) {
+                e.stopPropagation();
+
+                query();
+            });
+
+            //sumit event
+            form.on('submit', function(e) {
+                e.preventDefault();
+                resetPagination = true;
+                page=0;
+                query();
+            });
+
+            var query = function() {
+                scanFlag = false;
+                var data = form.serializeJSON();
+                data.page = page;
+                data.size = pageSize;
+
+                gb_common.$get('/gps/safeDriv', data, function (rs) {
+                    //数据转换
+                    var code2Name=gb_data_basic.lineCode2NameAll(), url,stm, p;
+                    $.each(rs.list, function(){
+                        if(this.xlbm)
+                            this.xlmc=code2Name[this.xlbm];
+                        else
+                            this.xlmc='';
+                        stm = moment(this.ts);
+                        this.timeStr = stm.format('YYYY-MM-DD HH:mm:ss');
+                        this.yczlText= gb_safe_driv.safeCode[this.yczltype];
+                        //拼接图片地址
+                        p = (this.sbbh+'_'+this.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+                        url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
+                        this.url = gb_safe_driv.urlPath + url;
+                        //title
+                        this.title = this.clzbh+' '+stm.format('HH时mm分ss秒')+' '+this.yczlText;
+                    });
+
+                    var bodyHtml = template('all-safe_dring-table-temp', {
+                        array: rs.list
+                    });
+                    $('table tbody', modal).html(bodyHtml);
+                    if (resetPagination)
+                        pagination(rs.totalPages + 1, rs.page);
+
+                    //扫描图片是否存在
+                    scanFlag = true;
+                    scanImgIsExist();
+                });
+            };
+
+            var scanFlag;
+            var scanImgIsExist = function () {
+                var array = $('table tbody a.image_link', modal);
+                var i = 0;
+                //匿名函数递归
+                (function () {
+                    //计数
+                    if(i >= array.length || !scanFlag){
+                        console.log('扫描图片结束');
+                        return;
+                    }
+                    var f = arguments.callee;
+                    var $a = $(array[i]);
+                    i ++;
+                    var img = new Image();
+                    img.onerror = function(){
+                        $a.removeAttr('href').removeAttr('data-uk-lightbox').text('无').css('color', '#b8b8b8');
+                        f();
+                    };
+                    img.onload = function(){
+                        f();
+                    };
+                    img.src=$a.attr('href');
+                })();
+            };
+
+            var resetPagination = true;
+            var pagination = function(pages, currentPage) {
+                var wrap = $('.pagination-wrap', modal).empty()
+                        ,e = $('<ul class="uk-pagination"></ul>').appendTo(wrap);
+
+                var pagination = UIkit.pagination(e, {
+                    pages: pages,
+                    currentPage: currentPage
+                });
+
+                e.on('select.uk.pagination', function(e, pageIndex){
+                    page = pageIndex;
+                    query();
+                });
+
+                resetPagination = false;
+            };
+        })();
+    </script>
+</div>
@@ -267,6 +267,11 @@
         "id": 3.4,
         "text": "轨迹回放",
         "event": "gps_play_back"
+      },
+      {
+        "id": 3.5,
+        "text": "安全驾驶(图像)",
+        "event": "safe_driving"
       }
     ]
   },
@@ -227,7 +227,7 @@ var gb_schedule_context_menu = (function () {
                         name: '（子任务）加油'
                     },
                     'add_sub_task_in': {
-                        name: '（子任务）回场'
+                        name: '（子任务）进场'
                     },
                     'add_sub_task_out': {
                         name: '（子任务）出场'
-//modal hide remove dom
-$(document).on('hide.uk.modal', '.uk-modal', function () {
-    $(this).remove();
-});
-
-$(document).on('show.uk.modal', '.uk-modal.ct_move_modal', function () {
-    if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-blank'))
-        return;
-
-    /*    //临时放过轨迹回放
-     if($(this).attr('id')=='map-playback-modal')
-     return;*/
-
-    //计算居中位置
-    var win = $('body');
-    var Y = (win.width() - $('.uk-modal-dialog', this).width()) / 2 - 10;
-    $('.uk-modal-dialog', this).css('top', '50px').css('left', Y + 'px');
-});
-
-var show_modal = function (id, dom) {
-    $(document.body).append(dom);
-    return UIkit.modal(id, {
-        bgclose: false, modal: false
-    }).show();
-};
-
-var open_modal = function (pageUrl, data, opt) {
-    $.get(pageUrl, function (dom) {
-        open_modal_dom(dom, data, opt);
-    });
-};
-
-var open_modal_dom = function (dom, data, opt) {
-    if (!$(dom).hasClass('uk-modal')) {
-        alert('无效的dom片段！');
-        return;
-    }
-    var id = '#' + $(dom).attr('id');
-
-    $(document.body).append(dom);
-    UIkit.modal(id, opt).show();
-    //move
-    if($(id).hasClass('ct_move_modal'))
-        modal_move($('.uk-modal-header',id));
-
-    if (data)
-        $(id).trigger('init', data);
-};
-
-var modal_move = function (m_header) {
-    var _moveFlag;
-    var _moveObj;
-    var _offset;
-    var dict= {};
-    var win = $('body');
-
-    $(m_header).on('mousedown', function (e) {
-        console.log('mousedown');
-        e.preventDefault();
-        _moveFlag = true;
-        _moveObj = $(this).parent();
-        _offset = [
-            e.clientX - parseFloat(_moveObj.css('left'))  - 1,
-            e.clientY - parseFloat(_moveObj.css('top')) - 1
-        ];
-    });
-
-    $(m_header).parents('.uk-modal').mousemove(function (e) {
-        if(!_moveFlag || !_moveObj)
-            return;
-
-        var X = e.clientX - _offset[0]
-            ,Y = e.clientY - _offset[1];
-
-        dict.stX = win.scrollLeft();
-        dict.stY = win.scrollTop();
-
-        //控制元素不被拖出窗口外
-        var setRig = win.width() - _moveObj.outerWidth() + dict.stX
-            ,setBot = win.height() - _moveObj.outerHeight() + dict.stY;
-        X < dict.stX && (X = dict.stX);
-        X > setRig && (X = setRig);
-        Y < dict.stY && (Y = dict.stY);
-        Y > setBot && (Y = setBot);
-
-        _moveObj.css({
-            left: X
-            ,top: Y
-        });
-    });
-    $(window).on('mouseup', function () {
-        _moveFlag = false;
-        _moveObj = null;
-    });
+//modal hide remove dom
+$(document).on('hide.uk.modal', '.uk-modal', function () {
+    //放过灯箱
+    if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-lightbox')){
+        return;
+    }
+    $(this).remove();
+});
+
+$(document).on('show.uk.modal', '.uk-modal.ct_move_modal', function () {
+    if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-blank'))
+        return;
+
+    //计算居中位置
+    var win = $('body');
+    var Y = (win.width() - $('.uk-modal-dialog', this).width()) / 2 - 10;
+    $('.uk-modal-dialog', this).css('top', '50px').css('left', Y + 'px');
+});
+
+var show_modal = function (id, dom) {
+    $(document.body).append(dom);
+    return UIkit.modal(id, {
+        bgclose: false, modal: false
+    }).show();
+};
+
+var open_modal = function (pageUrl, data, opt) {
+    $.get(pageUrl, function (dom) {
+        open_modal_dom(dom, data, opt);
+    });
+};
+
+var open_modal_dom = function (dom, data, opt) {
+    if (!$(dom).hasClass('uk-modal')) {
+        alert('无效的dom片段！');
+        return;
+    }
+    var id = '#' + $(dom).attr('id');
+
+    $(document.body).append(dom);
+    UIkit.modal(id, opt).show();
+    //move
+    if($(id).hasClass('ct_move_modal'))
+        modal_move($('.uk-modal-header',id));
+
+    if (data)
+        $(id).trigger('init', data);
+};
+
+var modal_move = function (m_header) {
+    var _moveFlag;
+    var _moveObj;
+    var _offset;
+    var dict= {};
+    var win = $('body');
+
+    $(m_header).on('mousedown', function (e) {
+        e.preventDefault();
+        _moveFlag = true;
+        _moveObj = $(this).parent();
+        _offset = [
+            e.clientX - parseFloat(_moveObj.css('left'))  - 1,
+            e.clientY - parseFloat(_moveObj.css('top')) - 1
+        ];
+    });
+
+    $(m_header).parents('.uk-modal').mousemove(function (e) {
+        if(!_moveFlag || !_moveObj)
+            return;
+
+        var X = e.clientX - _offset[0]
+            ,Y = e.clientY - _offset[1];
+
+        dict.stX = win.scrollLeft();
+        dict.stY = win.scrollTop();
+
+        //控制元素不被拖出窗口外
+        var setRig = win.width() - _moveObj.outerWidth() + dict.stX
+            ,setBot = win.height() - _moveObj.outerHeight() + dict.stY;
+        X < dict.stX && (X = dict.stX);
+        X > setRig && (X = setRig);
+        Y < dict.stY && (Y = dict.stY);
+        Y > setBot && (Y = setBot);
+
+        _moveObj.css({
+            left: X
+            ,top: Y
+        });
+    });
+    $(window).on('mouseup', function () {
+        _moveFlag = false;
+        _moveObj = null;
+    });
 };
 \ No newline at end of file
@@ -188,6 +188,9 @@ var gb_northToolbar = (function () {
         },
         form_schedule_daily: function () {
             gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleDaily.html', '调度工作日报表');
+        },
+        safe_driving: function () {
+            open_modal('/real_control_v2/fragments/north/nav/safeDriving.html', {}, modal_opts);
         }
     };
  
-/**
- * 安全驾驶相关
- */
-var gb_safe_driv = (function () {
-
-    var codes = {
-        'A1': '手部违规',
-        'A2': '摄像头偏离',
-        'A3': '安全带',
-        'A4': '手臂袖章',
-        'A5': '脸部检测'
-    };
-
-    var $wrap = $('.safe_driv_pop_wrap');
-    var max = 5;
-
-    var pop = function (sd) {
-        //只有admin用户能收到
-        var user = gb_northToolbar.user();
-        if(!user || user.userName.indexOf('admin') == -1)
-            return;
-
-        var htmlStr = '<div class="safe_driv_pop uk-animation-slide-bottom">'+
-            ' <span class="title"><i class="uk-icon-times-circle"></i>安全驾驶 '+moment(sd.ts).format('HH:mm')+'</span>'+
-            ' <span class="text"> '+sd.clzbh+' 违规驾驶（'+codes[sd.yczltype]+'）</span><span class="desc">请至安全驾驶监管平台查看图像信息</span>'+
-            '</div>';
-
-        var items = $wrap.find('.safe_driv_pop'), len = items.length;
-        if(len >= max)
-            $wrap.find('.safe_driv_pop:lt('+(len - max)+')').remove();
-
-        $wrap.append(htmlStr);
-    };
-
-    $wrap.on('click', '.safe_driv_pop', function () {
-        $(this).remove();
-    });
-
-    return {
-        pop: pop
-    }
+/**
+ * 安全驾驶相关
+ */
+var gb_safe_driv = (function () {
+
+    var codes = {
+        'A1': '手部违规',
+        'A2': '摄像头偏离',
+        'A3': '安全带',
+        'A4': '未戴袖章',
+        'A5': '眨眼/疲劳驾驶',
+        'A6': '打哈欠/打瞌睡',
+        'A7': '与人交谈'
+    };
+
+    var path = 'http://180.166.5.82:9988/CurrentSafeDriving/';
+
+    var $wrap = $('.safe_driv_pop_wrap');
+    var max = 5;
+
+    var pop = function (sd) {
+        //只有admin用户能收到
+        var user = gb_northToolbar.user();
+        if (!user || user.userName.indexOf('admin') == -1)
+            return;
+
+        //时间格式化
+        var stm = moment(sd.ts);
+        sd.timeStr = stm.format('HH时mm分ss秒');
+        //异常状态文本
+        sd.ycztText = codes[sd.yczltype];
+        //图片地址
+        var p = (sd.sbbh+'_'+sd.yczltype+'_'+stm.format('YYYYMMDDHHmmss'));
+        var url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
+        sd.url = path + url + '.jpg';
+
+        var htmlStr = template('safe_driv_item-temp', sd);
+        var items = $wrap.find('.safe_driv_pop'), len = items.length;
+        if (len >= max)
+            $wrap.find('.safe_driv_pop:lt(' + (len - max) + ')').remove();
+
+        $wrap.append(htmlStr);
+    };
+
+    $wrap.on('click', '.safe_driv_pop', function () {
+        var title = $(this).data('title');
+        var url = $(this).data('url');
+        $(this).remove();
+        var lightbox = UIkit.lightbox.create([
+            {title: title, 'source': url}
+        ]);
+
+        lightbox.show();
+    });
+
+    return {
+        pop: pop,
+        safeCode: codes,
+        urlPath: path
+    }
 })();
 \ No newline at end of file
@@ -5,26 +5,27 @@
     <meta charset="UTF-8">
     <title>线路调度 v2.0</title>
     <!-- uikit  core style-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="uikit"/>
     <link rel="stylesheet"
-          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css"/>
+          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" merge="uikit"/>
  
     <!-- main style -->
-    <link rel="stylesheet" href="/real_control_v2/css/main.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/main.css" merge="custom_style"/>
     <!-- north style -->
-    <link rel="stylesheet" href="/real_control_v2/css/north.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
     <!-- home style -->
-    <link rel="stylesheet" href="/real_control_v2/css/home.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/home.css" merge="custom_style"/>
     <!-- line style -->
-    <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css"/>
-    <link rel="stylesheet" href="/real_control_v2/css/sch_autocomp_result.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css" merge="custom_style"/>
+    <link rel="stylesheet" href="/real_control_v2/css/sch_autocomp_result.css" merge="custom_style"/>
     <!-- custom table -->
-    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
     <!-- jquery contextMenu style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" />
     <!-- formvalidation style -->
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"/>
     <!-- js tree -->
@@ -33,7 +34,7 @@
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"/>
     <link rel="stylesheet" href="/real_control_v2/css/pace.css"/>
  
-    <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
 </head>
  
 <body>
@@ -60,7 +61,6 @@
     </div>
 </div>
  
-<div class="safe_driv_pop_wrap"></div>
 <script>
     delete window.exports;
     delete window.module;
@@ -116,13 +116,14 @@
 <!-- main js -->
 <script src="/real_control_v2/js/main.js"></script>
 <!-- uikit core -->
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/pagination.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/timepicker.min.js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/pagination.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/timepicker.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.min.js" merge="uikit_js"></script>
  
 <!-- jquery contextMenu -->
 <script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"></script>
@@ -139,54 +140,67 @@
 <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js"></script>
  
 <!-- 数据 -->
-<script src="/real_control_v2/js/data/data_basic.js"></script>
-<script src="/real_control_v2/js/data/data_gps.js"></script>
-<script src="/real_control_v2/js/data/gps_abnormal.js"></script>
+<script src="/real_control_v2/js/data/data_basic.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/data/data_gps.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/data/gps_abnormal.js" merge="custom_js"></script>
 <!-- 线路模拟图 -->
-<script src="/real_control_v2/js/utils/svg_chart.js"></script>
-<script src="/real_control_v2/js/utils/svg_data_convert.js"></script>
-<script src="/real_control_v2/js/utils/svg_chart_tooltip.js"></script>
-<script src="/real_control_v2/js/utils/svg_chart_map.js"></script>
+<script src="/real_control_v2/js/utils/svg_chart.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/svg_data_convert.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/svg_chart_tooltip.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/svg_chart_map.js" merge="custom_js"></script>
  
 <!-- custom table js -->
-<script src="/real_control_v2/js/utils/ct_table.js"></script>
+<script src="/real_control_v2/js/utils/ct_table.js" merge="custom_js"></script>
 <!-- north js -->
-<script src="/real_control_v2/js/north/toolbar.js"></script>
-<script src="/real_control_v2/js/north/tabs.js"></script>
+<script src="/real_control_v2/js/north/toolbar.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/north/tabs.js" merge="custom_js"></script>
 <!-- home js -->
-<script src="/real_control_v2/js/home/layout.js"></script>
-<script src="/real_control_v2/js/home/line_panel.js"></script>
-<script src="/real_control_v2/js/home/context_menu.js"></script>
+<script src="/real_control_v2/js/home/layout.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/home/line_panel.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/home/context_menu.js" merge="custom_js"></script>
 <!-- line schedule js -->
-<script src="/real_control_v2/js/line_schedule/legend.js"></script>
-<script src="/real_control_v2/js/line_schedule/layout.js"></script>
-<script src="/real_control_v2/js/line_schedule/sch_table.js"></script>
-<script src="/real_control_v2/js/line_schedule/context_menu.js"></script>
-<script src="/real_control_v2/js/line_schedule/dbclick.js"></script>
-<script src="/real_control_v2/js/line_schedule/search.js"></script>
+<script src="/real_control_v2/js/line_schedule/legend.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/layout.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/sch_table.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/context_menu.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/dbclick.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/line_schedule/search.js" merge="custom_js"></script>
  
 <!-- 字典相关 -->
-<script src="/assets/js/dictionary.js"></script>
+<script src="/assets/js/dictionary.js" merge="custom_js"></script>
 <!-- websocket -->
 <script src="/assets/js/sockjs.min.js"></script>
-<script src="/real_control_v2/js/websocket/sch_websocket.js"></script>
+<script src="/real_control_v2/js/websocket/sch_websocket.js" merge="custom_js"></script>
 <!-- tts -->
-<script src="/real_control_v2/js/utils/tts.js"></script>
+<script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script>
  
 <!-- echart -->
 <script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
 <!-- Geolib -->
 <script src="/real_control_v2/geolib/geolib.js"></script>
  
-<script src="/real_control_v2/js/signal_state/signal_state.js"></script>
-<script src="/real_control_v2/js/utils/dispatch_pattern.js"></script>
+<script src="/real_control_v2/js/signal_state/signal_state.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/dispatch_pattern.js" merge="custom_js"></script>
  
 <!-- 处理表单片段嵌入问题 -->
-<script src="/real_control_v2/js/forms/form_embed.js"></script>
+<script src="/real_control_v2/js/forms/form_embed.js" merge="custom_js"></script>
 <!-- 模态框扩展 -->
-<script src="/real_control_v2/js/modal_extend.js"></script>
-<!-- 安全驾驶相关 -->
-<script src="/real_control_v2/js/safe_driv/safeDriv.js" ></script>
+<script src="/real_control_v2/js/modal_extend.js" merge="custom_js"></script>
+
+<!-- #### 安全驾驶 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>
+            <span class="title">异常&nbsp;{{clzbh}}</span>
+            <span class="text"> {{timeStr}} 出现违规驾驶（{{ycztText}}）</span>
+            <span class="desc">--安全驾驶监管平台</span>
+        </div>
+    </div>
+</script>
+
+<script src="/real_control_v2/js/safe_driv/safeDriv.js"  merge="custom_js"></script>
+<!-- #### 安全驾驶 end ###  -->
 </body>
  
 </html>
@@ -800,4 +800,125 @@ input[type=checkbox].disabled{
 .cc_info_accordion{
     height: calc(100% - 40px);
     overflow: auto;
+}
+
+.map-wrap-tools{
+    position: absolute;
+    top: 0;
+    width: 100%;
+    background: #ffffff;
+    z-index: 10;
+    box-shadow: 3px 1px 8px 0 rgba(0, 0, 0, 0.12), 1px 0px 8px 0 rgba(0, 0, 0, 0.12);
+    height: 70px;
+    display: none;
+}
+
+.map-container{
+    width: 100%;
+    height: 100%;
+}
+
+.map-container.show_tools{
+    height: calc(100% - 63px);
+    margin-top: 63px;
+}
+
+#map-playback2-modal .uk-modal-close{
+    z-index: 11;
+    background: #ff3333;
+    opacity: 1;
+    border-radius: 15px;
+    color: white;
+}
+
+.map-wrap-tools .ct-progress-bar{
+    position: absolute;
+    height: 11px;
+    width: 100%;
+    bottom: 0;
+    cursor: pointer;
+    overflow: hidden;
+    /*border-top: 5px solid white;*/
+}
+
+.map-wrap-tools .ct-progress-bar .scale{
+    width: 85%;
+    height: 6px;
+    border-top: 5px solid white;
+    background: #2bc2d5;
+}
+
+.map-wrap-tools .btns{
+    padding: 5px 10px 0 25px;
+}
+
+.map-wrap-tools .btns>span.ct_btn{
+    cursor: pointer;
+}
+
+.map-wrap-tools .btns>.play_btn{
+    width: 48px;
+    height: 48px;
+    display: inline-block;
+    background: url("/real_control_v2/assets/imgs/icon/play.png");
+    margin-right: 10px;
+}
+
+.map-wrap-tools .btns>.play_btn.play{
+    background: url("/real_control_v2/assets/imgs/icon/pause.png");
+}
+
+.map-wrap-tools .btns>.play_btn:hover{
+    box-shadow: 0px 0px 8px 0 rgba(220, 35, 35, 0.61), 0px 0px 8px 0 rgba(206, 50, 50, 0.26);
+    border-radius: 35px;
+}
+
+.map-wrap-tools .btns>.multi-items{
+    display: inline-block;
+    vertical-align: top;
+    background: #f1f1f1;
+    padding: 7px 15px;
+    margin: 12px 5px;
+    border-radius: 5px;
+}
+
+.map-wrap-tools .btns>.multi-items label{
+    margin-right: 10px;
+}
+
+.map-wrap-tools .btns>.multi-items label:last-child{
+    margin-right: 0;
+}
+
+.map-wrap-tools .ct_btn.text-panel{
+    vertical-align: top;
+    display: inline-block;
+    margin-top: 8px;
+    margin-left: 15px;
+    font-size: 13px;
+}
+
+.map-wrap-tools .ct_btn.a.export-excel {
+    color: #F44336;
+}
+
+.map-wrap-tools .ct_btn.clock{
+    display: inline-block;
+    vertical-align: top;
+    margin-top: 22px;
+    font-size: 22px;
+    color: #8b8686;
+    margin-right: 10px;
+}
+
+.play_back_form_shade{
+    background: rgb(196, 194, 194);
+    position: absolute;
+    width: 98%;
+    height: 205px;
+    left: 2%;
+    z-index: 99;
+    top: 0;
+    opacity: .2;
+    display: none;
 }
 \ No newline at end of file