Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

# Conflicts: # src/main/java/com/bsth/data/gpsdata/analyse/CircleQueue.java # src/main/java/com/bsth/data/gpsdata/analyse/GeoCacheData.java # src/main/java/com/bsth/data/gpsdata/analyse/GpsAnalyse.java # src/main/java/com/bsth/data/gpsdata/analyse/StationRoute.java

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
# Conflicts: # src/main/java/com/bsth/data/gpsdata/analyse/CircleQueue.java # src/main/java/com/bsth/data/gpsdata/analyse/GeoCacheData.java # src/main/java/com/bsth/data/gpsdata/analyse/GpsAnalyse.java # src/main/java/com/bsth/data/gpsdata/analyse/StationRoute.java
潘钊
2 parents 93905332 feba253d
Showing 33 changed files with 1285 additions and 1096 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/data/gpsdata/analyse/CircleQueue.java
src/main/java/com/bsth/data/gpsdata/analyse/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/analyse/GpsAnalyse.java
src/main/java/com/bsth/data/gpsdata/analyse/StationRoute.java
src/main/java/com/bsth/entity/mcy_forms/Changetochange.java
src/main/java/com/bsth/service/forms/FormsService.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/forms/mould/linepasswengerflow.xls
src/main/resources/static/pages/forms/mould/operationservice.xls
src/main/resources/static/pages/forms/mould/shifday.xls
src/main/resources/static/pages/forms/mould/shiftuehiclemanth.xls
src/main/resources/static/pages/forms/mould/singledata.xls
src/main/resources/static/pages/forms/mould/vehicleloading.xls
src/main/resources/static/pages/forms/statement/allline.html
src/main/resources/static/pages/forms/statement/changetochange.html
src/main/resources/static/pages/forms/statement/executionrate.html
src/main/resources/static/pages/forms/statement/linepassengerflow.html
@@ -65,10 +65,12 @@ public class ExportController {
 			i++;
 		}
+		
+		
 		try {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepassengerflow.xls",
+			ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepasswengerflow.xls",
 					path + "export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -189,7 +191,7 @@ public class ExportController {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould\\singledata.xls",
-					path + "export\\路单报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+					path + "export\\路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -203,8 +205,8 @@ public class ExportController {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-		List<Vehicleloading> vehicleloading = formsService.vehicleloading(/*map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),*/map.get("line").toString(),
-				map.get("date").toString());
+		List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),map.get("line").toString(),
+				map.get("data").toString());
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		int i = 1;
 		for (Vehicleloading l : vehicleloading) {
@@ -214,8 +216,8 @@ public class ExportController {
 			m.put("gS", l.getgS());
 			m.put("xL", l.getxL());
 			m.put("clzbh", l.getClzbh());
-			m.put("hyl", l.getHyl());
 			m.put("jzl", l.getJzl());
+			m.put("hyl", l.getHyl());
 			m.put("ls", l.getLs());
 			m.put("jhlc", l.getJhlc());
 			m.put("unyyyl", l.getUnyyyl());
@@ -229,7 +231,7 @@ public class ExportController {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould\\vehicleloading.xls",
-					path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+					path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("dat").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -417,5 +419,9 @@ public class ExportController {
 		}
 		return resList;
 	}
+	
+	
+	
+	
 }
@@ -80,9 +80,9 @@ public class MCY_FormsController {
 	// 车辆加注
 	@RequestMapping(value = "/vehicleloading", method = RequestMethod.POST)
-	public List<Vehicleloading> vehicleloading(/*@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,*/
+	public List<Vehicleloading> vehicleloading(@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,
 			@RequestParam String line, @RequestParam String data) {
-		return formsService.vehicleloading(/*gsdmVehic, fgsdmVehic, */line, data);
+		return formsService.vehicleloading(gsdmVehic, fgsdmVehic, line, data);
 	}
 	// 运营服务阶段报表
@@ -113,4 +113,4 @@ public class CircleQueue&lt;T&gt; {
     public T getTail(){
         return elementData[tail] == null?null:(T)elementData[tail];
     }
 -}
+}
 \ No newline at end of file
@@ -167,4 +167,4 @@ public class GeoCacheData {
         return cds;
     }
 -}
+}
 \ No newline at end of file
@@ -36,4 +36,4 @@ public class GpsAnalyse {
             GpsArrival.arrival(gps);
         }
     }
 -}
+}
 \ No newline at end of file
@@ -4,39 +4,58 @@ import com.vividsolutions.jts.geom.Point;
 import com.vividsolutions.jts.geom.Polygon;
 /**
- *
  * Created by panzhao on 2016/12/23.
  */
 public class StationRoute {
-    /** 线路编码 */
+    /**
+     * 线路编码
+     */
     private String lineCode;
-    /** 上下行 */
+    /**
+     * 上下行
+     */
     private int directions;
-    /** 站点编码 */
+    /**
+     * 站点编码
+     */
     private String code;
-    /** 路由顺序 */
+    /**
+     * 路由顺序
+     */
     private int routeSort;
-    /** 站点位置 */
+    /**
+     * 站点位置
+     */
     private Point point;
-    /** 圆形半径 */
+    /**
+     * 圆形半径
+     */
     private Float radius;
-    /** 多边形电子围栏 */
+    /**
+     * 多边形电子围栏
+     */
     private Polygon polygon;
-    /** 站点标记 */
+    /**
+     * 站点标记
+     */
     private String mark;
-    /** 下一站 */
+    /**
+     * 下一站
+     */
     private StationRoute next;
-    /** 上一站 */
+    /**
+     * 上一站
+     */
     private StationRoute prve;
     public String getCode() {
@@ -119,3 +138,4 @@ public class StationRoute {
         this.mark = mark;
     }
 }
+
 package com.bsth.entity.mcy_forms;
-import java.util.Date;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -30,7 +30,7 @@ public interface FormsService {
 	public List<Singledata> singledata(Map<String, Object> map);
-	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line,String data);
+	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line,String data);
 	public List<Operationservice> operationservice(Map<String, Object> map);
@@ -26,6 +26,7 @@ import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
 import com.bsth.entity.mcy_forms.Executionrate;
+import com.bsth.service.forms.CommonService;
 import com.bsth.service.forms.FormsService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
@@ -38,20 +39,32 @@ public class FormsServiceImpl implements FormsService {
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
+	@Autowired
+	CommonService commonService;
+
 	// 行车路单日报表
 	@Override
 	public List<Waybillday> waybillday(Map<String, Object> map) {
+		
 		String sql ="select x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name "
 				+ " from bsth_c_s_sp_info_real x  INNER join "
 				+ " ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,c.personnel_name from"
 				+ " bsth_c_ylb y LEFT JOIN bsth_c_personnel c  ON c.job_code=y.JSY   " 
-				+ " where to_days(y.RQ)=to_days('"+map.get("date").toString() + "')  and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) "
-				+ " z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"')  "
-				+ " and x.xl_bm='"+map.get("line").toString()+"'"
-				/*+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'"
-				+ " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'"*/
-				+ " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name";
-		//x.cl_zbh,j_gh 
+				+ " where 1=1  ";
+		if(map.get("date").toString()!=""){
+			sql+=" and to_days(y.RQ)=to_days('"+map.get("date").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) ";
+		}
+			sql+= " z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"') ";
+		if(map.get("gsdmWaybillday").toString()!=""){
+			sql+=" and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'";
+		}
+		if(map.get("fgsdmWaybillday").toString()!=""){
+			sql+=" and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'";
+		}	
+			sql	+= " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ";
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
 			@Override
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -60,21 +73,16 @@ public class FormsServiceImpl implements FormsService {
 				wbd.setJzl(arg0.getString("JZL"));
 				wbd.setYh(arg0.getString("YH"));
 				wbd.setjName(arg0.getString("personnel_name"));
-				// wbd.setZlc(arg0.getInt("zlc"));
-				// System.out.println(arg0.getObject("yl"));
-				// wbd.setYl(arg0.getString("yl"));
-				// wbd.setNbbm(arg0.getString("nbbm"));
 				wbd.setRq(arg0.getString("schedule_date"));
 				wbd.setJgh(arg0.getString("j_gh"));
 				return wbd;
-
 			}
 		});
 		for(int i=0;i<list.size();i++){
 			Waybillday w=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC2(w.getJgh(), w.getCarPlate(),
+			maps = commonService.findKMBC2(w.getJgh(), w.getCarPlate(),
 					w.getRq());
 			w.setJzl1(maps.get("ksgl").toString());
 			w.setZlc(maps.get("realMileage").toString());
@@ -86,18 +94,25 @@ public class FormsServiceImpl implements FormsService {
 	// 线路客流量报表
 	@Override
 	public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) {
-		String sql = " SELECT s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"
+		String sql = " SELECT r.schedule_date,s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"
 				+ " from bsth_c_stationroute s "
 				+ " LEFT JOIN bsth_c_line l on s.line_code=l.line_code "
 				+ " LEFT JOIN bsth_c_s_sp_info_real r on r.xl_bm=l.line_code" 
-				+ " where to_days(l.create_date)=to_days('"+map.get("date").toString() + "') " 
-				+ " and l.line_code=" + map.get("line").toString() 
-				+ " AND r.gs_bm is not null"
-				/*+ " and r.gs_bm='"+map.get("gsdmLine").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'"*/
-				+ " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
-
-		//s.station_name
+		        + " where 1=1  ";
+		if(map.get("date").toString()!=""){
+			sql+="and  to_days(r.schedule_date)=to_days('"+map.get("date").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and l.line_code=" + map.get("line").toString();
+		}
+			sql+= " AND r.gs_bm is not null";
+		if(map.get("gsdmLine").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmLine").toString()+"' ";
+		}
+		if(map.get("fgsdmLine").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'";
+		}	
+			sql	+= " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		List<Linepasswengerflow> list = jdbcTemplate.query(sql, new RowMapper<Linepasswengerflow>() {
 			@Override
@@ -109,8 +124,6 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
-		
-		
 		return list;
 	}
@@ -122,16 +135,26 @@ public class FormsServiceImpl implements FormsService {
 	public List<Shiftuehiclemanth> shiftuehiclemanth(Map<String, Object> map) {
 		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
 		        + " from bsth_c_s_sp_info_real r "
-				+ " where  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') "
-				+ " and  to_days('" + map.get("endDate").toString() + "') " 
-				+ " and r.xl_bm='"+ map.get("line").toString() + "'" 
-				+ " AND r.gs_bm is not null"
-				+ " and r.bc_type not in('in','out')"
-			/*	+ " and r.gs_bm='"+map.get("gsdmManth").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmManth").toString()+"'"*/
-				+ " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name" 
-				+ " ORDER BY r.j_name";
-		//r.j_name 
+		    	+ " where 1=1  ";
+		if(map.get("startDate").toString()!=""){
+			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
+		}
+		
+		if(map.get("endDate").toString()!=""){
+			sql+=" and  to_days('" + map.get("endDate").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
+		}
+			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
+		if(map.get("gsdmManth").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmManth").toString()+"' ";
+		}
+		if(map.get("fgsdmManth").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmManth").toString()+"' ";
+		}	
+			sql	+= " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type ";
+			
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
 		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
@@ -150,7 +173,7 @@ public class FormsServiceImpl implements FormsService {
 			Shiftuehiclemanth s=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC1(s.getjName(),s.getZbh(), startDate,
+			maps = commonService.findKMBC1(s.getjName(),s.getZbh(), startDate,
 					endDate);
 			s.setJhlc(maps.get("jhlc").toString());
@@ -172,13 +195,22 @@ public class FormsServiceImpl implements FormsService {
 		String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
 				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type   "
 				+ " FROM bsth_c_s_sp_info_real r " 
-				+ " where to_days(r.schedule_date)=to_days('"
-				+  map.get("date").toString() + "') and r.xl_bm=" + map.get("line").toString()
-				+ " and r.bc_type not in('in','out')"
-				/*+ " and r.gs_bm='"+map.get("gsdmShif").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'"*/
-				+ " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
-				+ " ORDER BY  r.lp_name asc";
+				+ " where 1=1  ";
+		if(map.get("date").toString()!=""){
+			sql+=" and to_days(r.schedule_date)=to_days('"+  map.get("date").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and r.xl_bm=" + map.get("line").toString();
+		}
+			sql+= " and r.bc_type not in('in','out')";
+		if(map.get("gsdmShif").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmShif").toString()+"'";
+		}
+		if(map.get("fgsdmShif").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'";
+		}	
+			sql	+= " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
+				+ "  ORDER BY  r.lp_name asc";
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
@@ -200,7 +232,7 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			Shifday shi=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC2(shi.getJgh(), shi.getCarPlate(),
+			maps = commonService.findKMBC2(shi.getJgh(), shi.getCarPlate(),
 					shi.getRq());
 			shi.setJhlc(maps.get("jhlc").toString());// 计划里程
 			//shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程
@@ -261,7 +293,6 @@ public class FormsServiceImpl implements FormsService {
 			@Override
 			public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Changetochange chan = new Changetochange();
-
 				chan.setRq(rq);
 				chan.setGs(arg0.getString("gs"));
 				chan.setFgs(arg0.getString("fgs"));
@@ -302,18 +333,22 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
-		String sql = " SELECT r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
+		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
 		          + "  FROM bsth_c_s_sp_info_real r "
-		          + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
-		          + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
-		          + "  and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH)  y on r.cl_zbh=y.nbbm "
+		          + "  left join bsth_c_ylb y"
+		          + " ON r.cl_zbh = y.nbbm   "
 				  + "  where r.schedule_date_str BETWEEN '" + map.get("startDate").toString() + "'"
 		          + "  and '"+ map.get("endDate").toString() + "'" 
 				  + "  and r.xl_bm='" + map.get("line").toString() + "'"
-				  + " AND r.gs_bm is not null"
-				/*  + " and r.gs_bm='"+map.get("gsdmSing").toString()+"'"
-				  + " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'"*/
-				  + "  GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
+				  + "  AND r.gs_bm is not null";
+				  
+			if(map.get("gsdmSing").toString()!=""){
+				sql+=" and r.gs_bm='"+map.get("gsdmSing").toString()+"'";
+			}
+			if(map.get("fgsdmSing").toString()!=""){
+				sql+=" and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'";
+			}
+				 sql += "  GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
@@ -324,7 +359,7 @@ public class FormsServiceImpl implements FormsService {
 				Singledata sin = new Singledata();
 				sin.setrQ(rq);
 				sin.setgS(arg0.getString("gs_name"));
-				sin.setxL(arg0.getString("xl_bm"));
+				sin.setxL(arg0.getString("xl_name"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
 				sin.setjName(arg0.getString("j_name"));
@@ -339,7 +374,7 @@ public class FormsServiceImpl implements FormsService {
 			for(int i=0;i<list.size();i++){
 				Singledata si=list.get(i);
 				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
+				maps = commonService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
 						endDate);
 				//sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
 				si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
@@ -356,24 +391,30 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Operationservice> operationservice(Map<String, Object> map) {
-		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
+		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
 		        + "  FROM bsth_c_s_sp_info_real r "
 		       // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
-		        + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
-		        + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
-		        + "  and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH)  y on r.cl_zbh=y.nbbm "
-				+ "  where r.schedule_date_str BETWEEN '"+ map.get("startDate").toString() 
-		        + "'" + "  and '" + map.get("endDate").toString() + "'"
-				+ "  and r.xl_bm='" + map.get("line").toString() + "'" 
-				+ " and r.bc_type not in('in','out')"
-			   /* + " and r.gs_bm='"+map.get("gsdmOperat").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'"*/
-				+ "  AND r.gs_bm is not null"
-				+ "  GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
+		        + "  left join bsth_c_ylb y ON r.cl_zbh = y.nbbm "
+				+ "  where 1=1 ";
+		if(map.get("startDate").toString()!=""){
+			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
+		}
-		//r.j_name
-		startDate = map.get("startDate").toString();
-		endDate = map.get("endDate").toString();
+		if(map.get("endDate").toString()!=""){
+			sql+=" and  to_days('" + map.get("endDate").toString() + "') ";
+		}
+			sql+="  and r.xl_bm='" + map.get("line").toString() + "'" ;
+			sql+="  and r.bc_type not in('in','out')";
+		if(map.get("gsdmOperat").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmOperat").toString()+"'";
+		}
+		if(map.get("fgsdmOperat").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'";
+		}
+			sql	+= "  AND r.gs_bm is not null";
+			sql	+= "  GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
+			startDate = map.get("startDate").toString();
+			endDate = map.get("endDate").toString();
 		List<Operationservice> list = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
 			@Override
@@ -392,9 +433,9 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			Operationservice o=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
+			maps = commonService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
 					endDate);
-			o.setXsgl(maps.get("yygl").toString() == null ? "" : maps.get("yygl").toString());
+			o.setXsgl(maps.get("jhlc").toString() == null ? "" : maps.get("jhlc").toString());
 			o.setEmptMileage(maps.get("ksgl").toString() == null ? "" : maps.get("ksgl").toString());
 			o.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());
 		}
@@ -404,7 +445,7 @@ public class FormsServiceImpl implements FormsService {
 	// 车辆加注
 	@Override
-	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line, String date) {
+	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line, String date) {
 		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type  " 
 		        + "  FROM bsth_c_s_sp_info_real r "
@@ -414,13 +455,14 @@ public class FormsServiceImpl implements FormsService {
 				+ "  where to_days(r.schedule_date_str)=to_days('" + date + "')" 
 		        + "  and r.xl_bm='" + line + "' "
 		        + " AND r.gs_bm is not null"
-		        + " and r.bc_type not in('in','out')"
-		        /* + " and r.gs_bm='"+gsdmVehic +"'"
-				+ " and r.fgs_bm='"+fgsdmVehic +"'"*/
-				+ "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
-
-		
-		//r.cl_zbh
+		        + " and r.bc_type not in('in','out')";
+		if(gsdmVehic.toString()!=""){
+			sql+=" and r.gs_bm='"+gsdmVehic+"'";
+		}
+		if(fgsdmVehic.toString()!=""){
+			sql+=" and r.fgs_bm='"+fgsdmVehic +"'";
+		}
+			sql	+= "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
 			@Override
 			public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -429,8 +471,8 @@ public class FormsServiceImpl implements FormsService {
 				ve.setgS(arg0.getString("gs_name"));
 				ve.setxL(arg0.getString("xl_name"));
 				ve.setClzbh(arg0.getString("cl_zbh"));
-				ve.setHyl(arg0.getString("YH"));
 				ve.setJzl(arg0.getString("JZL"));
+				ve.setHyl(arg0.getString("YH"));
 				// ve.setLs(arg0.getString("").toString());//尿素
 				ve.setJgh(arg0.getString("j_gh").toString());
 				return ve;
@@ -440,9 +482,9 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			Vehicleloading v=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC2(v.getJgh(), line,
-					date);
-			v.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
+			maps = commonService.findKMBC2(v.getJgh(), v.getClzbh(),
+					v.getrQ());
+			v.setJhlc(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
 			v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
 			v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
 		}
@@ -476,8 +518,8 @@ public class FormsServiceImpl implements FormsService {
 				+ " and '" + map.get("endDate").toString() + "'  and xl_bm='"+ map.get("line").toString() + "' "
 				+ " AND gs_bm is not null "
 				+ " AND bc_type NOT IN ('in', 'out')"
-				/*+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"*/
+				+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
 				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
@@ -510,7 +552,7 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcjh(arg0.getString("jbc").toString());
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
-				// tu.setSm(arg0.getString("gs_name").toString());
+				tu.setSm(arg0.getString("gs_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
@@ -547,8 +589,8 @@ public class FormsServiceImpl implements FormsService {
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
-				/*+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"*/
+				+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl  "
 				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
@@ -618,8 +660,8 @@ public class FormsServiceImpl implements FormsService {
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out') "
-				/*+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"*/
+				+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ "SELECT  COUNT(*"
 				+ ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b."
@@ -655,18 +697,13 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
-				// tu.setSm(arg0.getString("xl_name").toString());
+			    tu.setSm(arg0.getString("xl_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
-			}
-
-			
+			}			
 		});
-
-		
-		
 		return list;
 	}
 }
@@ -3,7 +3,13 @@
 #ms.mysql.username= root
 #ms.mysql.password= 123456
+#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.username= root
+#ms.mysql.password= root2jsp
+
+
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.117:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.password= root
@@ -43,14 +43,18 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_allline">
-						<span class="item-label" style="width: 80px;">公司: </span>
-						<select class="form-control" name="company" id="gsdmAllline" style="width: 140px;"></select>
-					</div> 
-					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_allline">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdmAllline" style="width: 140px;"></select>
-					</div> -->
+					<div style="display: inline-block; margin-left: 33px;"
+						id="gsdmDiv_allline">
+						<span class="item-label" style="width: 80px;">公司: </span> <select
+							class="form-control" name="company" id="gsdmAllline"
+							style="width: 140px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 24px;"
+						id="fgsdmDiv_allline">
+						<span class="item-label" style="width: 80px;">分公司: </span> <select
+							class="form-control" name="subCompany" id="fgsdmAllline"
+							style="width: 140px;"></select>
+					</div>
 					<div style="display: inline-block;">
 						<span class="item-label" style="width: 80px;">线路: </span> <select
 							class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -188,15 +192,20 @@
 		var endDate;
 		var gsdmAllline;
 		var fgsdmAllline;
-		$("#query").on("click",function() {
+		$("#query")
+				.on(
+						"click",
+						function() {
 							line = $("#line").val();
 							startDate1 = $("#startDate").val();
 							endDate1 = $("#endDate").val();
 							gsdmAllline = $("#gsdmAllline").val();
 							fgsdmAllline = $("#fgsdmAllline").val();
 							if (startDate1 != '' && endDate1 != '') {
-								$post('/mcy_forms/allline',{
-									/* gsdmAllline:gsdmAllline,fgsdmAllline:fgsdmAllline, */
+								$post(
+										'/mcy_forms/allline',
+										{
+										    gsdmAllline:gsdmAllline,fgsdmAllline:fgsdmAllline, 
 											line : line,
 											startDate : $("#startDate").val(),
 											endDate : $("#endDate").val(),
@@ -285,7 +294,14 @@
 		$("#export").on(
 				"click",
 				function() {
+					line = $("#line").val();
+					startDate1 = $("#startDate").val();
+					endDate1 = $("#endDate").val();
+					gsdmAllline = $("#gsdmAllline").val();
+					fgsdmAllline = $("#fgsdmAllline").val();
 					$post('/mcy_export/alllineExport', {
+						gsdmAllline : gsdmAllline,
+						fgsdmAllline : fgsdmAllline,
 						line : line,
 						startDate : startDate,
 						endDate : endDate,
@@ -43,18 +43,22 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-					 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_change">
-						<span class="item-label" style="width: 80px;">公司: </span>
-						<select class="form-control" name="company" id="gsdmChange" style="width: 140px;"></select>
-					</div> 
-					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_change">
-						<span class="item-label" style="width: 80px;">分公司: </span>
-						<select class="form-control" name="subCompany" id="fgsdmChange" style="width: 140px;"></select>
-					</div> 
+					<div style="display: inline-block; margin-left: 33px;"
+						id="gsdmDiv_change">
+						<span class="item-label" style="width: 80px;">公司: </span> <select
+							class="form-control" name="company" id="gsdmChange"
+							style="width: 140px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 24px;"
+						id="fgsdmDiv_change">
+						<span class="item-label" style="width: 80px;">分公司: </span> <select
+							class="form-control" name="subCompany" id="fgsdmChange"
+							style="width: 140px;"></select>
+					</div>
 					<div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;">线路: </span>
-                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
-                    </div>
+						<span class="item-label" style="width: 80px;">线路: </span> <select
+							class="form-control" name="line" id="line" style="width: 180px;"></select>
+					</div>
 					<div style="display: inline-block; margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span> <input
 							class="form-control" type="text" id="startDate"
@@ -139,51 +143,55 @@
 			locale : 'zh-cn'
 		});
-		
 		var obj = [];
-		$.get('/user/companyData', function(result){
+		$.get('/user/companyData', function(result) {
 			obj = result;
 			var options = '';
-			for(var i = 0; i < obj.length; i++){
-				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			for (var i = 0; i < obj.length; i++) {
+				options += '<option value="'+obj[i].companyCode+'">'
+						+ obj[i].companyName + '</option>';
 			}
-			if(obj.length ==0){
-				 $("#gsdmDiv_change").css('display','none');
-				 $('#fgsdmDiv_change').css('display','none');
-			}else if(obj.length ==1){
-				 $("#gsdmDiv_change").css('display','none');
-				if(obj[0].children.length == 1  || obj[0].children.length ==0)
-					$('#fgsdmDiv_change').css('display','none');
+			if (obj.length == 0) {
+				$("#gsdmDiv_change").css('display', 'none');
+				$('#fgsdmDiv_change').css('display', 'none');
+			} else if (obj.length == 1) {
+				$("#gsdmDiv_change").css('display', 'none');
+				if (obj[0].children.length == 1 || obj[0].children.length == 0)
+					$('#fgsdmDiv_change').css('display', 'none');
 			}
 			$('#gsdmChange').html(options);
 			updateCompany();
 		});
-		$("#gsdmChange").on("change",updateCompany);
-		function updateCompany(){
+		$("#gsdmChange").on("change", updateCompany);
+		function updateCompany() {
 			var company = $('#gsdmChange').val();
 			var options = '';
-			for(var i = 0; i < obj.length; i++){
-				if(obj[i].companyCode == company){
+			for (var i = 0; i < obj.length; i++) {
+				if (obj[i].companyCode == company) {
 					var children = obj[i].children;
-					for(var j = 0; j < children.length; j++){
-						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					for (var j = 0; j < children.length; j++) {
+						options += '<option value="'+children[j].code+'">'
+								+ children[j].name + '</option>';
 					}
 				}
 			}
 			$('#fgsdmChange').html(options);
-		} 
+		}
+
+		$.get('/basic/lineCode2Name', function(result) {
+			var data = [];
-		$.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			
-			for(var code in result){
-				data.push({id: code, text: result[code]});
+			for ( var code in result) {
+				data.push({
+					id : code,
+					text : result[code]
+				});
 			}
-			initPinYinSelect2('#line',data,'');
-			
+			initPinYinSelect2('#line', data, '');
+
 		})
-		
+
 		var line;
 		var startDate;
 		var endDate;
@@ -194,7 +202,8 @@
 					sel = $("#sel").val();
 					var startDate1 = $("#startDate").val();
 					var endDate1 = $("#endDate").val();
-
+					var gsdmChange= $("#gsdmChange").val();
+				    var fgsdmChange= $("#fgsdmChange").val();
 					if (startDate1 != '' && endDate1 != '') {
 						$post('/mcy_forms/changetochange', {
 							sel : sel,
@@ -235,7 +244,17 @@
 		$("#export").on(
 				"click",
 				function() {
+					var sel = $("#sel").val();
+					 var startDate = $("#startDate").val();
+					    var endDate = $("#endDate").val();
+					    var lpName = $("#lpName").val(); 
+					    var gsdmChange= $("#gsdmChange").val();
+					    var fgsdmChange= $("#fgsdmChange").val();
 					$post('/mcy_export/changetochangeExport', {
+						sel:sel,
+						line:line,
+						gsdmChange:gsdmChange,
+						fgsdmChange:fgsdmChange,
 						startDate : startDate,
 						endDate : endDate,
 						type : 'export'
@@ -37,14 +37,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ececut">
+			  <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ececut">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmEcecut" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_ececut">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmEcecut" style="width: 140px;"></select>
-					</div> -->
+					</div> 
 				<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -71,7 +71,7 @@
 								<th colspan="11">班次执行率统计表</th>
 							</tr>
 							<tr>
-								<td  rowspan="2" style=" padding-top: 20px;">日期</td> 
+								<td rowspan="2" style=" padding-top: 20px;">日期</td> 
 								<td rowspan="2" style=" padding-top: 20px;">公司</td>
 								<td rowspan="2" style=" padding-top: 20px;">直属公司</td>
 								<td rowspan="2" style=" padding-top: 20px;">线路条数</td>
@@ -181,15 +181,15 @@
 	   	  gsdmEcecut=$("#gsdmEcecut").val();
 	   	  fgsdmEcecut=$("#fgsdmEcecut").val();
 			 if(startDate1!=''&&endDate1!=''){
-				 $post('/mcy_forms/executionrate',{/* gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut, */line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+				 $post('/mcy_forms/executionrate',{ gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
 					 // 把数据填充到模版中
 						var tbodyHtml = template('executionrate',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#tbody').html(tbodyHtml);
-					  line = $("#line").val();
+					    line = $("#line").val();
-					  startDate = $("#startDate").val();
-					   endDate = $("#endDate").val();
+					    startDate = $("#startDate").val();
+					    endDate = $("#endDate").val();
 					    $("#sDate").text(startDate);
 				        $("#eDate").text(endDate);
@@ -240,7 +240,12 @@
 	});
 	$("#export").on("click",function(){
-		$post('/mcy_export/executionrateExport',{line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+		  line = $("#line").val();
+		  startDate=$("#startDate").val();
+	   	  endDate=$("#endDate").val();
+	   	  gsdmEcecut=$("#gsdmEcecut").val();
+	   	  fgsdmEcecut=$("#fgsdmEcecut").val();
+		$post('/mcy_export/executionrateExport',{gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
 			window.open("/downloadFile/download?fileName=班次执行率统计表"+moment(startDate).format("YYYYMMDD"));
 		});
 	});
@@ -27,14 +27,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_line">
+				<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_line">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmLine" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_line">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmLine" style="width: 140px;"></select>
-					</div> -->
+					</div> 
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -140,7 +140,7 @@
 			var date = $("#date").val();
 			var gsdmLine = $("#gsdmLine").val();
 			var fgsdmLine = $("#fgsdmLine").val();
-		    $post('/mcy_forms/linepasswengerflow',{/* gsdmLine:gsdmLine,fgsdmLine:fgsdmLine, */line:line,date:date,type:'query'},function(result){
+		    $post('/mcy_forms/linepasswengerflow',{ gsdmLine:gsdmLine,fgsdmLine:fgsdmLine,line:line,date:date,type:'query'},function(result){
 				$.each(result, function(i, obj) {
 					obj.requestType = reqCodeMap[obj.requestType];
                 }); 
@@ -150,6 +150,16 @@
 				$('#forms tbody').html(tbodyHtml);
 			});	
 		}); 
+		
+		$("#export").on("click",function(){
+			var line = $("#line").val();
+			var date = $("#date").val();
+			var gsdmLine = $("#gsdmLine").val();
+			var fgsdmLine = $("#fgsdmLine").val();
+			$post('/mcy_export/linepasswengerflowExport',{gsdmLine:gsdmLine,fgsdmLine:fgsdmLine,line:line,date:date,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=线路客流量报表"+moment(date).format("YYYYMMDD"));
+			});
+		});
 	});
 </script>
 <script type="text/html" id="list_linepasswengerflow">
@@ -30,7 +30,7 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-					<!--<div style="display: inline-block; margin-left: 33px;"
+					 <div style="display: inline-block; margin-left: 33px;"
 						id="gsdmDiv_operat">
 						 <span class="item-label" style="width: 80px;">公司: </span> <select
 							class="form-control" name="company" id="gsdmOperat"
@@ -41,7 +41,7 @@
 						<span class="item-label" style="width: 80px;">分公司: </span> <select
 							class="form-control" name="subCompany" id="fgsdmOperat"
 							style="width: 140px;"></select>
-					</div> -->
+					</div>  
 					<div style="display: inline-block;">
 						<span class="item-label" style="width: 80px;">线路: </span> <select
 							class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -173,11 +173,11 @@
 					var startDate = $("#startDate").val();
 					var endDate = $("#endDate").val();
 					var lpName = $("#lpName").val();
-					/* var gsdmOperat = $("#gsdmOperat").val();
-					var fgsdmOperat = $("#fgsdmOperat").val(); */
+					var gsdmOperat = $("#gsdmOperat").val();
+					var fgsdmOperat = $("#fgsdmOperat").val(); 
 					$post("/mcy_forms/operationservice", {
-						/* gsdmOperat : gsdmOperat,
-						fgsdmOperat : fgsdmOperat, */
+						gsdmOperat : gsdmOperat,
+						fgsdmOperat : fgsdmOperat, 
 						line : line,
 						startDate : startDate,
 						endDate : endDate,
@@ -206,6 +206,18 @@
 					});
 				});
+		$("#export").on("click",function(){
+			  line = $("#line").val();
+			  startDate=$("#startDate").val();
+		   	  endDate=$("#endDate").val();
+		   	gsdmOperat=$("#gsdmOperat").val();
+		   	  fgsdmOperat=$("#fgsdmOperat").val();
+			$post('/mcy_export/operationserviceExport',{gsdmOperat:gsdmOperat,fgsdmOperat:fgsdmOperat,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=运营服务阶段报表"+moment(startDate).format("YYYYMMDD"));
+			});
+		});
+		
+		
 	});
 </script>
 <script type="text/html" id="operationservice">
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 		   <div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-					<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_shif">
+				<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_shif">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmShif" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_shif">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmShif" style="width: 140px;"></select>
-					</div> -->
+					</div>  
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -154,9 +154,9 @@ $(function(){
 		$("#query").on("click",function(){
 		   		var line = $("#line").val();
 				var date = $("#date").val();
-				/* var gsdmShif = $("#gsdmShif").val();
-				var fgsdmShif = $("#fgsdmShif").val(); */
-				$post('/mcy_forms/shifday',{/* gsdmShif:gsdmShif,fgsdmShif:fgsdmShif, */line:line,date:date},function(result){
+				var gsdmShif = $("#gsdmShif").val();
+				var fgsdmShif = $("#fgsdmShif").val(); 
+				$post('/mcy_forms/shifday',{gsdmShif:gsdmShif,fgsdmShif:fgsdmShif, line:line,date:date},function(result){
 					 $.each(result, function(i, obj) {
 						obj.requestType = reqCodeMap[obj.requestType];
 	                }); 
@@ -166,6 +166,16 @@ $(function(){
 					$('#forms tbody').html(tbodyHtml);
 				});
 		});
+	
+	$("#export").on("click",function(){
+		var line = $("#line").val();
+		var date = $("#date").val();
+		var gsdmShif = $("#gsdmShif").val();
+		var fgsdmShif = $("#fgsdmShif").val();
+		$post('/mcy_export/shifdayExport',{gsdmShif:gsdmShif,fgsdmShif:fgsdmShif,line:line,date:date,type:'export'},function(result){
+			window.open("/downloadFile/download?fileName=班次车辆人员日报表"+moment(date).format("YYYYMMDD"));
+		});
+	});
 });
 </script>
 <script type="text/html" id="shifday">
@@ -175,7 +185,6 @@ $(function(){
 			<td>{{obj.sName}}</td>
  			<td>{{obj.lpName}}</td>
 			<td>{{obj.carPlate}}</td>
-
    			<td>{{obj.jhlc}}</td>
 			<td>{{obj.sjjhlc}}</td>
 			<td>{{obj.yygl}}</td>
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-					<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_manth">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_manth">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmManth" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_manth">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmManth" style="width: 140px;"></select>
-					</div> -->
+					</div>  
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 136px;"></select>
@@ -183,9 +183,9 @@
 		    var startDate = $("#startDate").val();
 		    var endDate = $("#endDate").val();
 		    var lpName = $("#lpName").val(); 
-		    /* var gsdmManth= $("#gsdmManth").val();
-		    var fgsdmManth= $("#fgsdmManth").val(); */
-		   	$post("/mcy_forms/shiftuehiclemanth",{/* gsdmManth:gsdmManth,fgsdmManth:fgsdmManth, */line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){		        
+		    var gsdmManth= $("#gsdmManth").val();
+		    var fgsdmManth= $("#fgsdmManth").val(); 
+		   	$post("/mcy_forms/shiftuehiclemanth",{gsdmManth:gsdmManth,fgsdmManth:fgsdmManth, line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){		        
 		   		$("#sDate").text(startDate);
 		        $("#eDate").text(endDate);
 		        var temp = {};
@@ -203,7 +203,20 @@
 		        $('#forms tbody').html(list_shiftuehiclemanth);
 		    }); 
-		});
+		});
+		
+		$("#export").on("click",function(){
+			 var line = $("#line").val();
+			    var startDate = $("#startDate").val();
+			    var endDate = $("#endDate").val();
+			    var lpName = $("#lpName").val(); 
+			    var gsdmManth= $("#gsdmManth").val();
+			    var fgsdmManth= $("#fgsdmManth").val(); 
+			$post('/mcy_export/shiftuehiclemanthExport',{gsdmManth:gsdmManth,fgsdmManth:fgsdmManth,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment(startDate).format("YYYYMMDD"));
+			});
+		});
+		
 	});
 </script>
 <script type="text/html" id="list_shiftuehiclemanth">
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-					<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_sing">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_sing">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmSing" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_sing">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmSing" style="width: 140px;"></select>
-					</div> -->
+					</div> 
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 136px;"></select>
@@ -152,9 +152,9 @@
 		    var startDate = $("#startDate").val();
 		    var endDate = $("#endDate").val();
 		    var lpName = $("#lpName").val(); 
-		    /* var gsdmSing = $("#gsdmSing").val();
-		    var fgsdmSing = $("#fgsdmSing").val(); */
-		   	$post("/mcy_forms/singledata",{/* gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, */line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){		        
+		    var gsdmSing = $("#gsdmSing").val();
+		    var fgsdmSing = $("#fgsdmSing").val(); 
+		   	$post("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){		        
 		   		$("#sDate").text(startDate);
 		        $("#eDate").text(endDate);
 		        var temp = {};
@@ -172,6 +172,18 @@
 		    }); 
 		});
+		
+		$("#export").on("click",function(){
+			 var line = $("#line").val();
+			    var startDate = $("#startDate").val();
+			    var endDate = $("#endDate").val();
+			    var lpName = $("#lpName").val(); 
+			    var gsdmSing = $("#gsdmSing").val();
+			    var fgsdmSing = $("#fgsdmSing").val(); 
+			$post('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
+			});
+		});
 	});
 </script>
 <script type="text/html" id="singledata">
@@ -37,14 +37,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_turn">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_turn">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmTurn" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_turn">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;"></select>
-					</div> -->
+					</div>  
 				<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -183,7 +183,7 @@
 	   	  gsdmTurn=$("#gsdmTurn").val();
 	   	  fgsdmTurn=$("#fgsdmTurn").val();
 			 if(startDate1!=''&&endDate1!=''){
-				 $post('/mcy_forms/turnoutrate',{/* gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, */line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+				 $post('/mcy_forms/turnoutrate',{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
 					 // 把数据填充到模版中
 						var tbodyHtml = template('turnoutrate',{list:result});
 						// 把渲染好的模版html文本追加到表格中
@@ -243,7 +243,12 @@
 	});
 	$("#export").on("click",function(){
-		$post('/mcy_export/turnoutrateExport',{line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
+		line = $("#line").val();
+		  startDate=$("#startDate").val();
+	   	  endDate=$("#endDate").val();
+	   	  gsdmTurn=$("#gsdmTurn").val();
+	   	  fgsdmTurn=$("#fgsdmTurn").val();
+		$post('/mcy_export/turnoutrateExport',{gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
 			window.open("/downloadFile/download?fileName=营运线路出车率统计表"+moment(startDate).format("YYYYMMDD"));
 		});
 	});
@@ -19,7 +19,7 @@
 <div class="page-head">
 	<div class="page-title">
-		<h1>车辆加注/消耗量</h1>
+		<h1>车辆加注</h1>
 	</div>
 </div>
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_vehic">
+			       <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_vehic">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmVehic" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_vehic">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmVehic" style="width: 140px;"></select>
-					</div> -->
+					</div>
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -135,18 +135,32 @@
 		})
+		var line ;
+		var date ;
+	    var gsdmVehic ;
+		var fgsdmVehic ;
 		$("#query").on("click",function(){
-			var line = $("#line").val();
-			var date = $("#date").val();
-			/* var gsdmVehic = $("#gsdmVehic").val();
-			var fgsdmVehic = $("#fgsdmVehic").val(); */
-			$post('/mcy_forms/vehicleloading',{line:line,data:date},function(result){
+			line = $("#line").val();
+			date = $("#date").val();
+		    gsdmVehic = $("#gsdmVehic").val();
+			fgsdmVehic = $("#fgsdmVehic").val(); 
+			$post('/mcy_forms/vehicleloading',{line:line,data:date, gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic},function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('vehicleloading',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
 		   	});
-		});
+		});
+		
+		$("#export").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+		    gsdmVehic = $("#gsdmVehic").val();
+			fgsdmVehic = $("#fgsdmVehic").val();
+			$post('/mcy_export/vehicleloadingExport',{line:line,data:date,gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic,type:'export'},function(result){
+				window.open("/downloadFile/download?fileName=车辆加注"+moment(date).format("YYYYMMDD"));
+			});
+		});
 	});
 </script>
 <script type="text/html" id="vehicleloading">
@@ -157,8 +171,8 @@
 			<td>{{obj.gS}}</td>
  			<td>{{obj.xL}}</td>
 			<td>{{obj.clzbh}}</td>
+            <td>{{obj.jzl}}</td>
 			<td>{{obj.hyl}}</td>
-			<td>{{obj.jzl}}</td>
 			<td>  </td>
 			<td>{{obj.jhlc}}</td>
 			<td>  </td>
@@ -28,14 +28,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				<!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_waybillday">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_waybillday">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmWaybillday" style="width: 140px;"></select>
 					</div> 
 					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_waybillday">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmWaybillday" style="width: 140px;"></select>
-					</div> -->
+					</div>
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -142,7 +142,7 @@
 			gsdmWaybillday=$("#gsdmWaybillday").val();
 			fgsdmWaybillday = $("#fgsdmWaybillday").val();
-			$post('/mcy_forms/waybillday',{/* gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday, */line:line,date:$("#date").val(),type:'query'},function(result){
+			$post('/mcy_forms/waybillday',{gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday, line:line,date:$("#date").val(),type:'query'},function(result){
 				 $.each(result, function(i, obj) {
 					obj.requestType = reqCodeMap[obj.requestType];
                 }); 
@@ -154,7 +154,11 @@
 		});
 		$("#export").on("click",function(){
-			$post('/mcy_export/waybilldayExport',{line:line,date:date,type:'export'},function(result){
+			line = $("#line").val();
+			date = $("#date").val();
+			gsdmWaybillday=$("#gsdmWaybillday").val();
+			fgsdmWaybillday = $("#fgsdmWaybillday").val();
+			$post('/mcy_export/waybilldayExport',{gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday,line:line,date:date,type:'export'},function(result){
 				window.open("/downloadFile/download?fileName=行车路单日报表"+moment(date).format("YYYYMMDD"));
 			});
 		});
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-progress{box-sizing:border-box;height:20px;margin-bottom:15px;background:#f7f7f7;overflow:hidden;line-height:20px;box-shadow:inset 0 0 0 1px rgba(0,0,0,.07),inset 0 2px 2px rgba(0,0,0,.07);border-radius:4px}*+.uk-progress{margin-top:15px}.uk-progress-bar{width:0;height:100%;background:#009dd8;float:left;-webkit-transition:width .6s ease;transition:width .6s ease;font-size:12px;color:#fff;text-align:center;background-image:-webkit-linear-gradient(top,#00b4f5,#008dc5);background-image:linear-gradient(to bottom,#00b4f5,#008dc5);box-shadow:inset 0 -1px 0 rgba(0,0,0,.2),inset 0 0 0 1px rgba(0,0,0,.1);text-shadow:0 -1px 0 rgba(0,0,0,.2)}.uk-progress-mini{height:6px}.uk-progress-small{height:12px}.uk-progress-success .uk-progress-bar{background-color:#82bb42;background-image:-webkit-linear-gradient(top,#9fd256,#6fac34);background-image:linear-gradient(to bottom,#9fd256,#6fac34)}.uk-progress-warning .uk-progress-bar{background-color:#f9a124;background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406)}.uk-progress-danger .uk-progress-bar{background-color:#d32c46;background-image:-webkit-linear-gradient(top,#ee465a,#c11a39);background-image:linear-gradient(to bottom,#ee465a,#c11a39)}.uk-progress-striped .uk-progress-bar{background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:30px 30px}.uk-progress-striped.uk-active .uk-progress-bar{-webkit-animation:uk-progress-bar-stripes 2s linear infinite;animation:uk-progress-bar-stripes 2s linear infinite}@-webkit-keyframes uk-progress-bar-stripes{0%{background-position:0 0}100%{background-position:30px 0}}@keyframes uk-progress-bar-stripes{0%{background-position:0 0}100%{background-position:30px 0}}.uk-progress-mini,.uk-progress-small{border-radius:500px}
 \ No newline at end of file
-<!-- 站点路由间距图 -->
-<a class="ct-bottom-drawer-close" style="right: calc(20% + 10px);"></a>
-<div id="station_route_spacing_chart_drawer" style="width: 100%;height: 100%;font-size: 0;">
-    <div class="tl_desc_text" style="z-index: 999;">
-        （鼠标滚轮滚动）单位：米 | <a class="delete_route_spacing_link" style="color: red;">删除</a>
-    </div>
-    <div class="svg_wrap"></div>
-
-    <div class="drawer_right_map" >
-
-    </div>
-
-    <script>
-
-        (function () {
-            var drawer = '#station_route_spacing_chart_drawer'
-                    , sch, locData, stationArr, len;
-            var cy = 120;
-            var tCy = cy - 15;
-            //站点marker对照
-            var map, markers = {};
-
-            $('.delete_route_spacing_link', drawer).on('click', function () {
-                alt_confirm('确定要删除【'+sch.xlName+'】基于空间坐标计算的站间距数据？', function () {
-                    window.localStorage.removeItem('control_route_distance_' + sch.xlBm);
-                    $(drawer).parents('.uk-modal').trigger('refresh_station_space');
-                    toGeoCalcPage();
-                }, '确定删除');
-            });
-
-            $(drawer).on('drawer-init', function (e, data) {
-                sch = data.sch;
-                locData = window.localStorage.getItem('control_route_distance_' + sch.xlBm);
-
-                if(locData)
-                    drawCharts();
-                else{
-                    toGeoCalcPage();
-                    return;
-                }
-
-                setTimeout(initMap, 800);
-            });
-
-            function initMap() {
-                //初始化地图
-                map = new BMap.Map($('.drawer_right_map', drawer)[0]);
-                //中心点和缩放级别
-                map.centerAndZoom(new BMap.Point(121.544336, 31.221315), 15);
-                map.enableScrollWheelZoom();
-
-                //绘制线路
-                var routes = JSON.parse(locData).sections[sch.xlDir==0?'up':'down'];
-
-                var pos = [], bdCoord;
-                $.each(routes, function () {
-                    bdCoord = TransGPS.wgsToBD(this.latitude, this.longitude);
-                    pos.push(new BMap.Point(bdCoord.lng, bdCoord.lat));
-                });
-
-                var polyline = new BMap.Polyline(pos, {strokeWeight:6, strokeColor: 'blue'});
-                map.addOverlay(polyline);
-
-                //绘制站点
-                var station;
-                $.each(stationArr, function () {
-                    station=this.station;
-                    bdCoord = TransGPS.wgsToBD(station.G_LATY, station.G_LONX);
-
-                    var point = new BMap.Point(bdCoord.lng, bdCoord.lat);
-                    var marker = new BMap.Marker(point);
-
-                    //根据站点名称 计算marker 宽度
-                    var w = station.STATION_NAME.length * 12 + 4;
-                    station.stationName = station.STATION_NAME;
-                    station.directions = station.DIRECTIONS;
-                    var icon = new BMap.Icon(gb_map_imap.createStationIcon(station, w), new BMap.Size(w-2,24), {anchor: new BMap.Size((w-2)/2,24)})
-                    marker.setIcon(icon);
-
-                    map.addOverlay(marker);
-                    markers[station.STATION_CODE] = marker;
-                });
-
-                autoPosition();
-            }
-
-            function drawCharts() {
-                try {
-                    stationArr = JSON.parse(locData).stations[sch.xlDir == 0 ? 'up' : 'down'];
-                }catch (e){
-                    alert('数据异常！！');
-                    return;
-                }
-
-                //console.log('locData...', JSON.parse(locData));
-                len = stationArr.length;
-                var width = cx(len - 1) + 20;
-                var svgCont = $('<div style="width: '+width+'px;" class="svg_cont_body"></div>');
-                var svg = d3.select(svgCont[0]).append('svg').classed({down: sch.xlDir==0?false:true});
-
-                //初始化 X 比例尺
-                var sum=0;
-                $.each(stationArr, function () {
-                    sum += this.toDistance;
-                });
-
-                var items = svg.selectAll('g._item').data(stationArr)
-                        .enter()
-                        .append('g')
-                        .attr('data-code', function (d) {
-                            return d.station.STATION_CODE;
-                        })
-                        .classed({_item: true});
-
-                //rect
-                items.append('rect').attr('x', xScale).attr('y', cy);
-                //text
-                items.append('text').attr('x', xScale).attr('y', cy)
-                        .text(stationText).attr('title', stationText);
-
-                //path
-                items.append('path').attr('d', function (d, i) {
-                    return i>=len-1?'':line([i , i + 1]);
-                });
-
-                //上弧线
-                items.append('path').classed({arc_path: true}).attr('d', route_arc_path);
-
-                //path circle
-                items.append('circle').attr('cx', function (d, i) {
-                    return cx(i);
-                }).attr('cy', tCy);
-
-                //站距
-                items.filter(secFilter).append('rect')
-                        .attr('x', function (d, i) {
-                            return cx(i) - 6;
-                        })
-                        .attr('y', tCy - 42)
-                        .classed({distance_rect: true})
-                        .style('transform', distTranslate);
-
-                items.filter(secFilter).append('text')
-                        .attr('x', xScale)
-                        .attr('y', tCy - 26)
-                        .text(function (d, i) {
-                            return d.toDistance;
-                        })
-                        .classed({distance_text: true})
-                        .style('transform', distTranslate);
-
-                $('.svg_wrap', drawer).append(svgCont);
-            }
-
-            var xpdd = 20;
-            //var halfWidth = 15;
-            var xScale = function (d, i) {
-                return cx(i);
-            };
-
-            var cx = function (i) {
-                var sum=0;
-                for(var j = 0; j <= i; j++){
-                    sum+=stationArr[j].toDistance;
-                }
-                return sum / 2.5 + xpdd;
-            };
-
-            var stationText = function (d) {
-                return d.station['STATION_NAME'];
-            };
-
-            var line = d3.svg.line().x(cx).y(tCy);
-
-            var route_arc_path = function (d, i) {
-                if(i >= len - 1) return;
-                var x1 = cx(i);
-                var x2 = cx(i + 1);
-
-                var c1 = (x1 + (x2 - x1) / 3) + ' ' + (tCy - 40);
-                var c2 = (x2 - (x2 - x1) / 3) +' '+ (tCy - 40);
-
-                return 'M'+x1+' '+tCy+' C '+ c1 +', '+ c2 +', '+ x2 +' '+tCy;
-            };
-
-            var secFilter = function (d, i) {
-                return i > 0;
-            };
-
-            //地图定位
-            var posMarker, posing=false;
-            function autoPosition() {
-                var left = Math.abs(parseInt($('.svg_cont_body', drawer).css('left').replace('px', '')));
-
-                var g;
-                $('svg g._item text', drawer).each(function () {
-                    if($(this).attr('x') > left){
-                        g = $(this).parent();
-                        return false;
-                    }
-                });
-                posMarker = markers[g.data('code')];
-
-                if(posing) return;
-                posing = true;
-                setTimeout(function () {
-                    map.panTo(posMarker.point/*, {noAnimation: true}*/);
-                    posing = false;
-                }, 500);
-            }
-
-            var distTranslate = function (d, i) {
-                return 'translate('+(d.toDistance / 2.5 / 2 - 16)+'px, 0px)';
-            };
-
-            function toGeoCalcPage() {
-                drawerLoadPage('/real_control_v2/fragments/geo/calc_station_space.html','cal_station_space_drawer');
-            }
-
-            //页面切换
-            function drawerLoadPage(url, id) {
-                $(drawer).parent('.ct-bottom-drawer-body').load(url, function () {
-                    $('#' + id).trigger('drawer-init', {sch: sch});
-                });
-            }
-
-            var threshold = 30;
-            $(drawer).on('mousewheel', '.svg_cont_body', function (e) {
-                var event = e.originalEvent;
-                var code = delta = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3;
-
-                var left = parseInt($(this).css('left').replace('px',''))
-                        ,width = $(this).width()
-                        ,max = width - $(this).parent().width();
-                if(code > 0){
-                    left += threshold;
-                    if(left >= 0)
-                        left = 0;
-                    $(this).css('left', left + 'px');
-                }
-                else{
-                    left -= threshold;
-                    if(Math.abs(left) >= max)
-                        left = -max;
-                    $(this).css('left', left + 'px');
-                }
-
-                autoPosition();
-            });
-        })();
-    </script>
-
+<!-- 站点路由间距图 -->
+<a class="ct-bottom-drawer-close" style="right: calc(20% + 10px);"></a>
+<div id="station_route_spacing_chart_drawer" style="width: 100%;height: 100%;font-size: 0;">
+    <div class="tl_desc_text" style="z-index: 999;">
+        （鼠标滚轮滚动）单位：米 | <a class="delete_route_spacing_link" style="color: red;">删除</a>
+    </div>
+    <div class="svg_wrap"></div>
+
+    <div class="drawer_right_map" >
+
+    </div>
+
+    <script>
+
+        (function () {
+            var drawer = '#station_route_spacing_chart_drawer'
+                    , sch, locData, stationArr, len;
+            var cy = 120;
+            var tCy = cy - 15;
+            //站点marker对照
+            var map, markers = {};
+
+            $('.delete_route_spacing_link', drawer).on('click', function () {
+                alt_confirm('确定要删除【'+sch.xlName+'】基于空间坐标计算的站间距数据？', function () {
+                    window.localStorage.removeItem('control_route_distance_' + sch.xlBm);
+                    $(drawer).parents('.uk-modal').trigger('refresh_station_space');
+                    toGeoCalcPage();
+                }, '确定删除');
+            });
+
+            $(drawer).on('drawer-init', function (e, data) {
+                sch = data.sch;
+                locData = window.localStorage.getItem('control_route_distance_' + sch.xlBm);
+
+                if(locData)
+                    drawCharts();
+                else{
+                    toGeoCalcPage();
+                    return;
+                }
+
+                setTimeout(initMap, 800);
+            });
+
+            function initMap() {
+                //初始化地图
+                map = new BMap.Map($('.drawer_right_map', drawer)[0]);
+                //中心点和缩放级别
+                map.centerAndZoom(new BMap.Point(121.544336, 31.221315), 15);
+                map.enableScrollWheelZoom();
+
+                //绘制线路
+                var routes = JSON.parse(locData).sections[sch.xlDir==0?'up':'down'];
+
+                var pos = [], bdCoord;
+                $.each(routes, function () {
+                    bdCoord = TransGPS.wgsToBD(this.latitude, this.longitude);
+                    pos.push(new BMap.Point(bdCoord.lng, bdCoord.lat));
+                });
+
+                var polyline = new BMap.Polyline(pos, {strokeWeight:6, strokeColor: 'blue'});
+                map.addOverlay(polyline);
+
+                //绘制站点
+                var station;
+                $.each(stationArr, function () {
+                    station=this.station;
+                    bdCoord = TransGPS.wgsToBD(station.G_LATY, station.G_LONX);
+
+                    var point = new BMap.Point(bdCoord.lng, bdCoord.lat);
+                    var marker = new BMap.Marker(point);
+
+                    //根据站点名称 计算marker 宽度
+                    var w = station.STATION_NAME.length * 12 + 4;
+                    station.stationName = station.STATION_NAME;
+                    station.directions = station.DIRECTIONS;
+                    var icon = new BMap.Icon(gb_map_imap.createStationIcon(station, w), new BMap.Size(w-2,24), {anchor: new BMap.Size((w-2)/2,24)})
+                    marker.setIcon(icon);
+
+                    map.addOverlay(marker);
+                    markers[station.STATION_CODE] = marker;
+                });
+
+                autoPosition();
+            }
+
+            function drawCharts() {
+                try {
+                    stationArr = JSON.parse(locData).stations[sch.xlDir == 0 ? 'up' : 'down'];
+                }catch (e){
+                    alert('数据异常！！');
+                    return;
+                }
+
+                //console.log('locData...', JSON.parse(locData));
+                len = stationArr.length;
+                var width = cx(len - 1) + 20;
+                var svgCont = $('<div style="width: '+width+'px;" class="svg_cont_body"></div>');
+                var svg = d3.select(svgCont[0]).append('svg').classed({down: sch.xlDir==0?false:true});
+
+                //初始化 X 比例尺
+                var sum=0;
+                $.each(stationArr, function () {
+                    sum += this.toDistance;
+                });
+
+                var items = svg.selectAll('g._item').data(stationArr)
+                        .enter()
+                        .append('g')
+                        .attr('data-code', function (d) {
+                            return d.station.STATION_CODE;
+                        })
+                        .classed({_item: true});
+
+                //rect
+                items.append('rect').attr('x', xScale).attr('y', cy);
+                //text
+                items.append('text').attr('x', xScale).attr('y', cy)
+                        .text(stationText).attr('title', stationText);
+
+                //path
+                items.append('path').attr('d', function (d, i) {
+                    return i>=len-1?'':line([i , i + 1]);
+                });
+
+                //上弧线
+                items.append('path').classed({arc_path: true}).attr('d', route_arc_path);
+
+                //path circle
+                items.append('circle').attr('cx', function (d, i) {
+                    return cx(i);
+                }).attr('cy', tCy);
+
+                //站距
+                items.filter(secFilter).append('rect')
+                        .attr('x', function (d, i) {
+                            return cx(i) - 6;
+                        })
+                        .attr('y', tCy - 42)
+                        .classed({distance_rect: true})
+                        .style('transform', distTranslate);
+
+                items.filter(secFilter).append('text')
+                        .attr('x', xScale)
+                        .attr('y', tCy - 26)
+                        .text(function (d, i) {
+                            return d.toDistance;
+                        })
+                        .classed({distance_text: true})
+                        .style('transform', distTranslate);
+
+                $('.svg_wrap', drawer).append(svgCont);
+            }
+
+            var xpdd = 20;
+            //var halfWidth = 15;
+            var xScale = function (d, i) {
+                return cx(i);
+            };
+
+            var cx = function (i) {
+                var sum=0;
+                for(var j = 0; j <= i; j++){
+                    sum+=stationArr[j].toDistance;
+                }
+                return sum / 2.5 + xpdd;
+            };
+
+            var stationText = function (d) {
+                return d.station['STATION_NAME'];
+            };
+
+            var line = d3.svg.line().x(cx).y(tCy);
+
+            var route_arc_path = function (d, i) {
+                if(i >= len - 1) return;
+                var x1 = cx(i);
+                var x2 = cx(i + 1);
+
+                var c1 = (x1 + (x2 - x1) / 3) + ' ' + (tCy - 40);
+                var c2 = (x2 - (x2 - x1) / 3) +' '+ (tCy - 40);
+
+                return 'M'+x1+' '+tCy+' C '+ c1 +', '+ c2 +', '+ x2 +' '+tCy;
+            };
+
+            var secFilter = function (d, i) {
+                return i > 0;
+            };
+
+            //地图定位
+            var posMarker, posing=false;
+            function autoPosition() {
+                var left = Math.abs(parseInt($('.svg_cont_body', drawer).css('left').replace('px', '')));
+
+                var g;
+                $('svg g._item text', drawer).each(function () {
+                    if($(this).attr('x') > left){
+                        g = $(this).parent();
+                        return false;
+                    }
+                });
+                posMarker = markers[g.data('code')];
+
+                if(posing) return;
+                posing = true;
+                setTimeout(function () {
+                    map.panTo(posMarker.point/*, {noAnimation: true}*/);
+                    posing = false;
+                }, 500);
+            }
+
+            var distTranslate = function (d, i) {
+                return 'translate('+(d.toDistance / 2.5 / 2 - 16)+'px, 0px)';
+            };
+
+            function toGeoCalcPage() {
+                drawerLoadPage('/real_control_v2/fragments/geo/calc_station_space.html','cal_station_space_drawer');
+            }
+
+            //页面切换
+            function drawerLoadPage(url, id) {
+                $(drawer).parent('.ct-bottom-drawer-body').load(url, function () {
+                    $('#' + id).trigger('drawer-init', {sch: sch});
+                });
+            }
+
+            var threshold = 30;
+            $(drawer).on('mousewheel', '.svg_cont_body', function (e) {
+                var event = e.originalEvent;
+                var code = delta = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3;
+
+                var left = parseInt($(this).css('left').replace('px',''))
+                        ,width = $(this).width()
+                        ,max = width - $(this).parent().width();
+                if(code > 0){
+                    left += threshold;
+                    if(left >= 0)
+                        left = 0;
+                    $(this).css('left', left + 'px');
+                }
+                else{
+                    left -= threshold;
+                    if(Math.abs(left) >= max)
+                        left = -max;
+                    $(this).css('left', left + 'px');
+                }
+
+                autoPosition();
+            });
+        })();
+    </script>
+
     </div>
 \ No newline at end of file
-<div class="uk-alert uk-alert-success">开始~结束时间最大间隔24小时</div>
-<div style="width: 68%;margin: auto;" id="playback_before_form">
-    <form class="uk-form uk-form-horizontal" style="margin-bottom: 0 !important;">
-        <div class="uk-grid">
-            <div class="uk-width-1-1">
-                <div class="uk-form-row">
-                    <label class="uk-form-label">车辆编码</label>
-                    <div class="uk-form-controls">
-                        <div class="uk-autocomplete uk-form autocomplete-nbbm">
-                            <input name="nbbm" required/>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="uk-grid">
-            <div class="uk-width-2-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label">开始时间</label>
-                    <div class="uk-form-controls">
-                        <input name="sDate" type="date" required/>
-                    </div>
-                </div>
-            </div>
-            <div class="uk-width-1-3" style="padding-left: 15px;">
-                <div class="uk-form-row">
-                    <div class="uk-form-controls" style="margin-left: 0;">
-                        <input name="sTime" type="time" required/>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="uk-grid">
-            <div class="uk-width-2-3">
-                <div class="uk-form-row">
-                    <label class="uk-form-label">结束时间</label>
-                    <div class="uk-form-controls">
-                        <input name="eDate" type="date" required/>
-                    </div>
-                </div>
-            </div>
-            <div class="uk-width-1-3" style="padding-left: 15px;">
-                <div class="uk-form-row">
-                    <div class="uk-form-controls" style="margin-left: 0;">
-                        <input name="eTime" type="time" required/>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div style="text-align: center;margin-top: 25px;">
-            <button class="uk-button uk-button-large uk-button-primary" type="submit"><i
-                    class="uk-icon-play-circle"> </i> 开始回放
-            </button>
-        </div>
-        <i class="uk-icon-spinner uk-icon-spin"
-           style="font-size: 18px;color: rgb(213, 31, 31);position: absolute;bottom: 25px;left: calc(50% + 70px);display: none;"></i>
-    </form>
-
-    <script>
-        (function () {
-            $('#playback_before_form').on('init_form', function (e, data) {
-                //车辆 autocomplete
-                $.get('/basic/cars', function (rs) {
-                    gb_common.carAutocomplete($('#playback_before_form .autocomplete-nbbm'), rs);
-                });
-
-                if (data.nbbm)
-                    $('[name=nbbm]', this).val(data.nbbm);
-                //默认时间
-                var m = moment()
-                        , rq = 'YYYY-MM-DD', sj = 'HH:mm';
-                $('[name=eDate]', this).val(m.format(rq));
-                $('[name=eTime]', this).val(m.format('HH:mm'));
-                $('[name=sDate]', this).val(m.subtract(2, 'hour').format(rq));
-                $('[name=sTime]', this).val(m.format(sj));
-
-                //test
-                $('[name=nbbm]', this).val('W9H-003');
-                $('[name=eDate]', this).val('2016-12-10');
-                $('[name=eTime]', this).val('09:00');
-                $('[name=sDate]', this).val('2016-12-10');
-                $('[name=sTime]', this).val('07:00');
-            });
-
-            var ONE_DAY = 1000 * 60 * 60 * 24;
-            var f = $('form', '#playback_before_form').formValidation({
-                framework: 'uikit',
-                locale: 'zh_CN'
-            });
-            f.on('success.form.fv', function (e) {
-                e.preventDefault();
-                disabledBtn();
-                var data = $(this).serializeJSON();
-
-                //校验时间间隔
-                var fs = 'YYYY-MM-DDHH:mm';
-                var st = moment(data.sDate + data.sTime, fs).format('X');
-                var et = moment(data.eDate + data.eTime, fs).format('X');
-
-                if (et < st)
-                    return abortSubmit('结束时间小于开始时间？？？');
-                else if ((et - st) > ONE_DAY)
-                    return abortSubmit('时间间隔不能超过24小时！');
-                else if (et == st)
-                    return abortSubmit('一点时间间隔都不给？？？');
-
-                $('#playback_before_form i.uk-icon-spinner').show();
-                $.ajax({
-                    url: '/gps/gpsHistory/multiple',
-                    traditional: true,
-                    data: {nbbmArray: [data.nbbm], st: st, et: et},
-                    success: function (rs) {
-                        if (!rs || rs.length == 0)
-                            return abortSubmit('失败，服务器没有返回轨迹数据！');
-
-                        //排序
-                        rs.sort(function (a, b) {
-                            return a.timestamp - b.timestamp;
-                        });
-                        //格式化时间
-                        $.each(rs, function () {
-                            var mom = moment(this.timestamp);
-                            this.timeStr = mom.format('HH:mm.ss');
-                            this.timeStr2 = mom.format('YYYY-MM-DD HH:mm.ss');
-                        });
-
-                        //获取路段信息
-                        if (!rs[0] || !rs[0].lineId)
-                            return notify_err('首个点位无效....');
-
-                        jsQueryRoads(rs[0].lineId, function (roads) {
-                            //gps关联到路段
-                            matchRoad(rs, roads);
-
-                            var f = $('#playback_before_form');
-                            var fileName = $('[name=nbbm]', f).val() + '轨迹数据'
-                                    + $('[name=sDate]', f).val() + $('[name=sTime]', f).val() + '至'
-                                    + $('[name=eDate]', f).val() + $('[name=eTime]', f).val() + '.xls';
-
-                            $('#playback_before_form').parents('.uk-modal').trigger('show_play_body', {
-                                gpsList: rs,
-                                roads: roads,
-                                lineCode: rs[0].lineId,
-                                fileName: fileName.replace(new RegExp(/-/g),'').replace(new RegExp(/:/g),'')
-                            });
-                        });
-                    }
-                });
-            });
-
-            function abortSubmit(t) {
-                $('#playback_before_form i.uk-icon-spinner').hide();
-                notify_err(t);
-                $('form button[type=submit]', '#playback_before_form').removeClass('disabled').removeAttr('disabled');
-            }
-
-            function disabledBtn() {
-                $('form button[type=submit]', '#playback_before_form').addClass('disabled').attr('disabled', 'disabled');
-            }
-
-            function jsQueryRoads(lineCode, cb) {
-                gb_common.$get('/gps/findRoadSpeed', {lineCode: lineCode}, function (rs) {
-                    //处理路段坐标集合
-                    var roads = rs.roads;
-                    var cds, coordArray, array;
-
-                    for (var i = 0, road; road = roads[i++];) {
-                        cds = road['GROAD_VECTOR'];
-                        cds = cds.substring(11, cds.length - 1);
-                        coordArray = cds.split(',');
-
-                        array = [];
-
-                        for (var j = 0, cd; cd = coordArray[j++];) {
-                            var cdArray = cd.split(' ');
-
-                            //wgs84 to baidu
-                            var bdCd = TransGPS.wgsToBD(parseFloat(cdArray[1]), parseFloat(cdArray[0]));
-                            array.push({
-                                longitude: bdCd.lng,
-                                latitude: bdCd.lat
-                            });
-                        }
-                        road.coords = array;
-                    }
-                    cb && cb(roads);
-                });
-            }
-
-
-            function matchRoad(gpsArray, roads) {
-                var rs;
-                $.each(gpsArray, function () {
-                    rs = gpsMatchRoad(this, roads);
-                    this.road = rs.road;
-                    this.minDistance = rs.min;
-                });
-            }
-
-            function gpsMatchRoad(gps, roads) {
-                var point = {latitude: gps.bd_lat, longitude: gps.bd_lon};
-
-                var min, road;
-                $.each(roads, function () {
-
-                    var len = this.coords.length;
-                    for (var i = 0; i < len - 1; i++) {
-                        //点到线的距离
-                        var distance = geolib.getDistanceFromLine(point, this.coords[i], this.coords[i + 1]);
-                        if (min > distance || min == null) {
-                            min = distance;
-                            road = this;
-                        }
-                    }
-                });
-
-                return {road: road, min: min};
-            }
-        })();
-    </script>
+<div class="uk-alert uk-alert-success">开始~结束时间最大间隔24小时</div>
+<div style="width: 68%;margin: auto;" id="playback_before_form">
+    <form class="uk-form uk-form-horizontal" style="margin-bottom: 0 !important;">
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">车辆编码</label>
+                    <div class="uk-form-controls">
+                        <div class="uk-autocomplete uk-form autocomplete-nbbm">
+                            <input name="nbbm" required/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-2-3">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">开始时间</label>
+                    <div class="uk-form-controls">
+                        <input name="sDate" type="date" required/>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-3" style="padding-left: 15px;">
+                <div class="uk-form-row">
+                    <div class="uk-form-controls" style="margin-left: 0;">
+                        <input name="sTime" type="time" required/>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-2-3">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">结束时间</label>
+                    <div class="uk-form-controls">
+                        <input name="eDate" type="date" required/>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-3" style="padding-left: 15px;">
+                <div class="uk-form-row">
+                    <div class="uk-form-controls" style="margin-left: 0;">
+                        <input name="eTime" type="time" required/>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div style="text-align: center;margin-top: 25px;">
+            <button class="uk-button uk-button-large uk-button-primary" type="submit"><i
+                    class="uk-icon-play-circle"> </i> 开始回放
+            </button>
+        </div>
+        <i class="uk-icon-spinner uk-icon-spin"
+           style="font-size: 18px;color: rgb(213, 31, 31);position: absolute;bottom: 25px;left: calc(50% + 70px);display: none;"></i>
+    </form>
+
+    <script>
+        (function () {
+            $('#playback_before_form').on('init_form', function (e, data) {
+                //车辆 autocomplete
+                $.get('/basic/cars', function (rs) {
+                    gb_common.carAutocomplete($('#playback_before_form .autocomplete-nbbm'), rs);
+                });
+
+                if (data.nbbm)
+                    $('[name=nbbm]', this).val(data.nbbm);
+                //默认时间
+                var m = moment()
+                        , rq = 'YYYY-MM-DD', sj = 'HH:mm';
+                $('[name=eDate]', this).val(m.format(rq));
+                $('[name=eTime]', this).val(m.format('HH:mm'));
+                $('[name=sDate]', this).val(m.subtract(2, 'hour').format(rq));
+                $('[name=sTime]', this).val(m.format(sj));
+
+                //test
+                $('[name=nbbm]', this).val('W9H-003');
+                $('[name=eDate]', this).val('2016-12-10');
+                $('[name=eTime]', this).val('09:00');
+                $('[name=sDate]', this).val('2016-12-10');
+                $('[name=sTime]', this).val('07:00');
+            });
+
+            var ONE_DAY = 1000 * 60 * 60 * 24;
+            var f = $('form', '#playback_before_form').formValidation({
+                framework: 'uikit',
+                locale: 'zh_CN'
+            });
+            f.on('success.form.fv', function (e) {
+                e.preventDefault();
+                disabledBtn();
+                var data = $(this).serializeJSON();
+
+                //校验时间间隔
+                var fs = 'YYYY-MM-DDHH:mm';
+                var st = moment(data.sDate + data.sTime, fs).format('X');
+                var et = moment(data.eDate + data.eTime, fs).format('X');
+
+                if (et < st)
+                    return abortSubmit('结束时间小于开始时间？？？');
+                else if ((et - st) > ONE_DAY)
+                    return abortSubmit('时间间隔不能超过24小时！');
+                else if (et == st)
+                    return abortSubmit('一点时间间隔都不给？？？');
+
+                $('#playback_before_form i.uk-icon-spinner').show();
+                $.ajax({
+                    url: '/gps/gpsHistory/multiple',
+                    traditional: true,
+                    data: {nbbmArray: [data.nbbm], st: st, et: et},
+                    success: function (rs) {
+                        if (!rs || rs.length == 0)
+                            return abortSubmit('失败，服务器没有返回轨迹数据！');
+
+                        //排序
+                        rs.sort(function (a, b) {
+                            return a.timestamp - b.timestamp;
+                        });
+                        //格式化时间
+                        $.each(rs, function () {
+                            var mom = moment(this.timestamp);
+                            this.timeStr = mom.format('HH:mm.ss');
+                            this.timeStr2 = mom.format('YYYY-MM-DD HH:mm.ss');
+                        });
+
+                        //获取路段信息
+                        if (!rs[0] || !rs[0].lineId)
+                            return notify_err('首个点位无效....');
+
+                        jsQueryRoads(rs[0].lineId, function (roads) {
+                            //gps关联到路段
+                            matchRoad(rs, roads);
+
+                            var f = $('#playback_before_form');
+                            var fileName = $('[name=nbbm]', f).val() + '轨迹数据'
+                                    + $('[name=sDate]', f).val() + $('[name=sTime]', f).val() + '至'
+                                    + $('[name=eDate]', f).val() + $('[name=eTime]', f).val() + '.xls';
+
+                            $('#playback_before_form').parents('.uk-modal').trigger('show_play_body', {
+                                gpsList: rs,
+                                roads: roads,
+                                lineCode: rs[0].lineId,
+                                fileName: fileName.replace(new RegExp(/-/g),'').replace(new RegExp(/:/g),'')
+                            });
+                        });
+                    }
+                });
+            });
+
+            function abortSubmit(t) {
+                $('#playback_before_form i.uk-icon-spinner').hide();
+                notify_err(t);
+                $('form button[type=submit]', '#playback_before_form').removeClass('disabled').removeAttr('disabled');
+            }
+
+            function disabledBtn() {
+                $('form button[type=submit]', '#playback_before_form').addClass('disabled').attr('disabled', 'disabled');
+            }
+
+            function jsQueryRoads(lineCode, cb) {
+                gb_common.$get('/gps/findRoadSpeed', {lineCode: lineCode}, function (rs) {
+                    //处理路段坐标集合
+                    var roads = rs.roads;
+                    var cds, coordArray, array;
+
+                    for (var i = 0, road; road = roads[i++];) {
+                        cds = road['GROAD_VECTOR'];
+                        cds = cds.substring(11, cds.length - 1);
+                        coordArray = cds.split(',');
+
+                        array = [];
+
+                        for (var j = 0, cd; cd = coordArray[j++];) {
+                            var cdArray = cd.split(' ');
+
+                            //wgs84 to baidu
+                            var bdCd = TransGPS.wgsToBD(parseFloat(cdArray[1]), parseFloat(cdArray[0]));
+                            array.push({
+                                longitude: bdCd.lng,
+                                latitude: bdCd.lat
+                            });
+                        }
+                        road.coords = array;
+                    }
+                    cb && cb(roads);
+                });
+            }
+
+
+            function matchRoad(gpsArray, roads) {
+                var rs;
+                $.each(gpsArray, function () {
+                    rs = gpsMatchRoad(this, roads);
+                    this.road = rs.road;
+                    this.minDistance = rs.min;
+                });
+            }
+
+            function gpsMatchRoad(gps, roads) {
+                var point = {latitude: gps.bd_lat, longitude: gps.bd_lon};
+
+                var min, road;
+                $.each(roads, function () {
+
+                    var len = this.coords.length;
+                    for (var i = 0; i < len - 1; i++) {
+                        //点到线的距离
+                        var distance = geolib.getDistanceFromLine(point, this.coords[i], this.coords[i + 1]);
+                        if (min > distance || min == null) {
+                            min = distance;
+                            road = this;
+                        }
+                    }
+                });
+
+                return {road: road, min: min};
+            }
+        })();
+    </script>
 </div>
 \ No newline at end of file
-<div class="uk-modal ct-form-modal" id="map-playback-modal">
-    <div class="uk-modal-dialog" >
-        <a href="" class="uk-modal-close uk-close"></a>
-        <h1>轨迹回放</h1>
-        <div class="pb_modal_body"></div>
-    </div>
-    <script>
-        (function () {
-            var modal = '#map-playback-modal';
-
-            $(modal).on('show_form', function (e, data) {
-                $('.pb_modal_body', modal).load('/real_control_v2/mapmonitor/fragments/playback/before_form.html', function () {
-                    $('#playback_before_form', modal).trigger('init_form', data);
-                });
-            });
-
-            //show播放界面
-            $(modal).on('show_play_body', function (e, data) {
-                $('.pb_modal_body', modal).empty();
-                $('.uk-modal-dialog', modal).addClass('play-back-run-modal').one('transitionend', function () {
-                    //最小宽度
-                    $(this).css('min-width', '1280px');
-                });
-                $('.pb_modal_body', modal).load('/real_control_v2/mapmonitor/fragments/playback/run.html', function () {
-                   $('#playback_run_body', modal).trigger('init', data);
-                });
-            });
-        })();
-    </script>
-</div>
+<div class="uk-modal ct-form-modal" id="map-playback-modal">
+    <div class="uk-modal-dialog" >
+        <a href="" class="uk-modal-close uk-close"></a>
+        <h1>轨迹回放</h1>
+        <div class="pb_modal_body"></div>
+    </div>
+    <script>
+        (function () {
+            var modal = '#map-playback-modal';
+
+            $(modal).on('show_form', function (e, data) {
+                $('.pb_modal_body', modal).load('/real_control_v2/mapmonitor/fragments/playback/before_form.html', function () {
+                    $('#playback_before_form', modal).trigger('init_form', data);
+                });
+            });
+
+            //show播放界面
+            $(modal).on('show_play_body', function (e, data) {
+                $('.pb_modal_body', modal).empty();
+                $('.uk-modal-dialog', modal).addClass('play-back-run-modal').one('transitionend', function () {
+                    //最小宽度
+                    $(this).css('min-width', '1280px');
+                });
+                $('.pb_modal_body', modal).load('/real_control_v2/mapmonitor/fragments/playback/run.html', function () {
+                   $('#playback_run_body', modal).trigger('init', data);
+                });
+            });
+        })();
+    </script>
+</div>
-<div id="playback_run_body">
-    <div class="map_wrap"></div>
-    <!-- 日志输出 -->
-    <div class="pb_log_panel uk-animation-slide-right" style="overflow: auto;">
-        <div class="ct_table" style="height: calc(100% - 30px);">
-            <div class="ct_table_head">
-                <dl>
-                    <dt>时间</dt>
-                    <dt>速度</dt>
-                    <dt>路段</dt>
-                    <dt>状态</dt>
-                </dl>
-            </div>
-            <div class="ct_table_body">
-            </div>
-        </div>
-    </div>
-    <div class="pb_footer_tools uk-animation-slide-bottom"  onselectstart="return false;" style="-moz-user-select:none;">
-        <span class="ui-slider-tip">08:30.50</span>
-        <div class="uk-progress uk-progress-small uk-progress-success uk-progress-striped">
-            <div class="uk-progress-bar" style="width: 0;"></div>
-        </div>
-
-        <div class="pb_tools_icon">
-            <div class="uk-button-group">
-                <a class="uk-button" data-uk-tooltip title="快退" data-type="rewind"><i class="uk-icon-fast-backward"></i></a>
-                <a class="uk-button" data-uk-tooltip title="停止" data-type="stop"><i class="uk-icon-stop"></i></a>
-                <a class="uk-button play-btn" data-type="play"><i class="uk-icon-play"></i></a>
-                <a class="uk-button" data-uk-tooltip title="快进" data-type="fast_forward"><i class="uk-icon-fast-forward"></i></a>
-            </div>
-        </div>
-
-        <div class="pb_tools_icon">
-            <div class="uk-button-dropdown" data-uk-dropdown="{mode:'hover', pos:'top-left'}">
-                <button class="uk-button"><i class="uk-icon-cog"> </i> 工具 <i class="uk-icon-caret-down"></i></button>
-                <div class="uk-dropdown uk-dropdown-bottom uk-dropdown-small" style="top: 30px; left: 0px;">
-                    <ul class="uk-nav uk-nav-dropdown pb_dropdown_tool">
-                        <!--<li><a>显示站点</a></li>
-                        <li><a>显示电子围栏</a></li>
-                        <li class="uk-nav-divider"></li>
-                        <li><a>关闭日志输出</a></li>
-                        <li class="uk-nav-divider"></li>-->
-                        <li><a data-name="exportExcel" href="javascript:;" >导出轨迹</a></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script>
-        (function () {
-
-            var logTemp = template.compile('{{each list as gps i}}<dl data-code="{{gps.road.ROAD_CODE}}">' +
-                            '<dd>{{gps.timeStr}}</dd>' +
-                            '<dd>{{gps.speed}}</dd>' +
-                            '<dd>{{gps.road.ROAD_NAME}}</dd><dd>正常</dd></dl>{{/each}}');
-
-
-
-            var _body = '#playback_run_body'
-                    , map, gpsArray, roads, marker, width, trailArray = [], trailPolyline;
-
-            var upRoutePos = [], downRoutePos = [];
-            var storage = window.localStorage;
-            var lineCode;
-
-            //进度条
-            var progress = $('.pb_footer_tools .uk-progress', _body);
-            var bar = $('.uk-progress-bar', progress);
-            var step;
-            var prsTip = $('.ui-slider-tip', _body);
-            progress.mousemove(function (e) {
-                var x = e.offsetX;
-                var i = parseInt(x / step);
-                var time = moment(gpsArray[i].timestamp).format('HH:mm.ss');
-
-                prsTip.text(time).css('left', x - 11).css('visibility', 'visible');
-            }).mouseout(function () {
-                prsTip.css('visibility', 'hidden')
-            }).on('click', function (e) {
-                var x = e.offsetX;
-                goto(parseInt(x / step));
-            });
-
-            $(_body).on('init', function (e, data) {
-                roads = data.roads;
-                lineCode = data.lineCode;
-
-                setTimeout(function () {
-                    initMap(data.gpsList);
-                    len = gpsArray.length;
-                    step = progress.width() / gpsArray.length;
-                }, 600);
-
-                //导出的文件名
-                $('a[data-name=exportExcel]').attr('download', data.fileName);
-            });
-
-            $('.pb_tools_icon a.uk-button', _body).on('click', function () {
-                var type = $(this).data('type');
-                switch (type) {
-                    case 'play':
-                        play();
-                        break;
-                    case 'pause':
-                        pause();
-                        break;
-                    case 'fast_forward':
-                        goto(index + 10);
-                        break;
-                    case 'rewind':
-                        goto(index - 10);
-                        break;
-                    case 'stop':
-                        pause();
-                        break;
-                }
-            });
-
-            $('.pb_dropdown_tool li a', _body).on('click', function () {
-                var name = $(this).data('name');
-                switch (name) {
-                    case 'exportExcel':
-                        var base64Str = gb_map_play_back.listToExcel(gpsArray);
-                        $(this).attr('href', base64Str);
-                        break;
-                }
-            });
-
-            function goto(ei) {
-                if(ei < 0 || ei >= len)
-                    return;
-
-                bar.css('width', ei * step);
-                var gps = gpsArray[ei];
-                //重新定位marker
-                try {
-                    drawLine(gps.direction);
-                } catch (e) {
-                    console.log(e);
-                }
-                var point = new BMap.Point(gps.bd_lon, gps.bd_lat);
-                marker.setPosition(point);
-                marker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gps, width), new BMap.Size(width, 75)));
-
-                //重新填充轨迹线，更新日志面板
-                trailArray = [];
-                var logs = [];
-                for (var i = 0; i <= ei; i++) {
-                    trailArray.push(new BMap.Point(gpsArray[i].bd_lon, gpsArray[i].bd_lat));
-                    if(i > 0 && logs[logs.length - 1].road.ROAD_CODE == gpsArray[i].road.ROAD_CODE)
-                        logs.pop();
-
-                    logs.push(gpsArray[i]);
-                }
-                trailPolyline.setPath(trailArray);
-
-                index = ei;
-                map.panTo(marker.getPosition());
-                //更新日志面板
-                logPanel.empty().html(logTemp({list: logs}));
-                logWrap.scrollTop(logWrap[0].scrollHeight);
-            }
-
-            //播放
-            function play() {
-                $('.play-btn', _body)
-                        .data('type', 'pause')
-                        .find('i')
-                        .removeClass('uk-icon-play')
-                        .addClass('uk-icon-pause');
-                pauseFlag = false;
-                progress.addClass('uk-active');
-                run();
-
-                //定时居中
-                fixedToCenter();
-            }
-
-            var toCenterTimer;
-
-            function fixedToCenter() {
-                toCenterTimer = setInterval(function () {
-                    map.panTo(marker.getPosition());
-                }, 5000);
-            }
-
-            //暂停
-            var pauseFlag;
-
-            function pause() {
-                $('.play-btn', _body)
-                        .data('type', 'play')
-                        .find('i')
-                        .removeClass('uk-icon-pause')
-                        .addClass('uk-icon-play');
-                pauseFlag = true;
-                progress.removeClass('uk-active');
-                clearInterval(toCenterTimer);
-            }
-
-            var index = 1;
-            var len;
-
-            function run() {
-                //暂停
-                if (pauseFlag) {
-                    pauseFlag = false;
-                    return
-                }
-                //结束
-                if (index >= len) {
-                    bar.css('width', '100%')
-                    pause();
-                    return;
-                }
-
-                //marker 移动
-                var gps = gpsArray[index];
-
-                //线路走向
-                if (gps.direction != gpsArray[index - 1].direction || index == 1)
-                    drawLine(gps.direction);
-
-                var point = new BMap.Point(gps.bd_lon, gps.bd_lat);
-                marker.setPosition(point);
-                marker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gps, width), new BMap.Size(width, 75)));
-
-                //轨迹线
-                trailArray.push(point);
-                trailPolyline.setPath(trailArray);
-
-                //进度条
-                bar.css('width', step * index);
-
-                //日志输出
-                logWrite(gps, gpsArray[index - 1]);
-
-                index++;
-                setTimeout(run, 1000);
-            }
-
-            //初始化地图
-            function initMap(data) {
-                gpsArray = data;
-                var firstPoint = new BMap.Point(data[0].bd_lon, data[0].bd_lat);
-                map = new BMap.Map($('.map_wrap', _body)[0]);
-                map.centerAndZoom(firstPoint, 17);
-                map.enableScrollWheelZoom();
-
-                //创建车辆marker
-                marker = new BMap.Marker(firstPoint);
-                width = gb_map_imap.calcGpsMarkerWidth(data[0].nbbm);
-                //渲染icon
-                marker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(data[0], width), new BMap.Size(width, 75)));
-                marker.disableMassClear();
-                map.addOverlay(marker);
-
-                //线路图层 数据
-                var routeCache = JSON.parse(storage.getItem(lineCode + '_route'));
-                upRoutePos = initRoutePosData(routeCache.up_bd);
-                downRoutePos = initRoutePosData(routeCache.down_bd);
-
-                trailArray.push(firstPoint);
-                drawTrailLine();
-                //输出第一个点
-                logWrite(data[0], null);
-            }
-
-            function drawTrailLine() {
-                trailPolyline = new BMap.Polyline(trailArray, {strokeWeight: 3, strokeColor: 'black'});
-                map.addOverlay(trailPolyline);
-            }
-
-            function initRoutePosData(routeStr) {
-                var array = [], temps;
-                $.each(routeStr, function (i, item) {
-                    var pos = [];
-                    $.each(item.split(','), function () {
-                        temps = this.split(' ');
-                        pos.push(new BMap.Point(temps[0], temps[1]));
-                    });
-                    array.push(pos);
-                });
-                return array;
-            }
-
-            function drawLine(updown) {
-                map.clearOverlays();
-
-                var pos = updown == 0 ? upRoutePos : downRoutePos;
-                $.each(pos, function () {
-                    map.addOverlay(new BMap.Polyline(this, {strokeWeight: 12, strokeColor: 'rgba(0, 0, 255, 0.6)'}));
-                });
-
-                drawTrailLine();
-            }
-
-            //日志输出
-            var logWrap = $('.pb_log_panel', _body);
-            var logPanel = $('.pb_log_panel .ct_table_body', _body);
-            gb_ct_table.fixedHead(logWrap);
-
-            function logWrite(gps, prve) {
-                var code = gps.road.ROAD_CODE;
-                if (!prve || code != prve.road.ROAD_CODE) {
-                    logPanel.append('<dl data-code="' + code + '" ><dd>' + gps.timeStr + '</dd><dd>' + gps.speed + '</dd><dd>' + gps.road.ROAD_NAME + '</dd><dd>正常</dd></dl>');
-                }
-                else {
-                    var dds = logPanel.find('dl[data-code=' + code + ']').last().find('dd');
-                    $(dds[0]).text(gps.timeStr);
-                    $(dds[1]).text(gps.speed);
-                }
-
-                logWrap.scrollTop(logWrap[0].scrollHeight);
-            }
-        })();
-    </script>
+<div id="playback_run_body">
+    <div class="map_wrap"></div>
+    <!-- 日志输出 -->
+    <div class="pb_log_panel uk-animation-slide-right" style="overflow: auto;">
+        <div class="ct_table" style="height: calc(100% - 30px);">
+            <div class="ct_table_head">
+                <dl>
+                    <dt>时间</dt>
+                    <dt>速度</dt>
+                    <dt>路段</dt>
+                    <dt>状态</dt>
+                </dl>
+            </div>
+            <div class="ct_table_body">
+            </div>
+        </div>
+    </div>
+    <div class="pb_footer_tools uk-animation-slide-bottom"  onselectstart="return false;" style="-moz-user-select:none;">
+        <span class="ui-slider-tip">08:30.50</span>
+        <div class="uk-progress uk-progress-small uk-progress-success uk-progress-striped">
+            <div class="uk-progress-bar" style="width: 0;"></div>
+        </div>
+
+        <div class="pb_tools_icon">
+            <div class="uk-button-group">
+                <a class="uk-button" data-uk-tooltip title="快退" data-type="rewind"><i class="uk-icon-fast-backward"></i></a>
+                <a class="uk-button" data-uk-tooltip title="停止" data-type="stop"><i class="uk-icon-stop"></i></a>
+                <a class="uk-button play-btn" data-type="play"><i class="uk-icon-play"></i></a>
+                <a class="uk-button" data-uk-tooltip title="快进" data-type="fast_forward"><i class="uk-icon-fast-forward"></i></a>
+            </div>
+        </div>
+
+        <div class="pb_tools_icon">
+            <div class="uk-button-dropdown" data-uk-dropdown="{mode:'hover', pos:'top-left'}">
+                <button class="uk-button"><i class="uk-icon-cog"> </i> 工具 <i class="uk-icon-caret-down"></i></button>
+                <div class="uk-dropdown uk-dropdown-bottom uk-dropdown-small" style="top: 30px; left: 0px;">
+                    <ul class="uk-nav uk-nav-dropdown pb_dropdown_tool">
+                        <!--<li><a>显示站点</a></li>
+                        <li><a>显示电子围栏</a></li>
+                        <li class="uk-nav-divider"></li>
+                        <li><a>关闭日志输出</a></li>
+                        <li class="uk-nav-divider"></li>-->
+                        <li><a data-name="exportExcel" href="javascript:;" >导出轨迹</a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        (function () {
+
+            var logTemp = template.compile('{{each list as gps i}}<dl data-code="{{gps.road.ROAD_CODE}}">' +
+                            '<dd>{{gps.timeStr}}</dd>' +
+                            '<dd>{{gps.speed}}</dd>' +
+                            '<dd>{{gps.road.ROAD_NAME}}</dd><dd>正常</dd></dl>{{/each}}');
+
+
+
+            var _body = '#playback_run_body'
+                    , map, gpsArray, roads, marker, width, trailArray = [], trailPolyline;
+
+            var upRoutePos = [], downRoutePos = [];
+            var storage = window.localStorage;
+            var lineCode;
+
+            //进度条
+            var progress = $('.pb_footer_tools .uk-progress', _body);
+            var bar = $('.uk-progress-bar', progress);
+            var step;
+            var prsTip = $('.ui-slider-tip', _body);
+            progress.mousemove(function (e) {
+                var x = e.offsetX;
+                var i = parseInt(x / step);
+                var time = moment(gpsArray[i].timestamp).format('HH:mm.ss');
+
+                prsTip.text(time).css('left', x - 11).css('visibility', 'visible');
+            }).mouseout(function () {
+                prsTip.css('visibility', 'hidden')
+            }).on('click', function (e) {
+                var x = e.offsetX;
+                goto(parseInt(x / step));
+            });
+
+            $(_body).on('init', function (e, data) {
+                roads = data.roads;
+                lineCode = data.lineCode;
+
+                setTimeout(function () {
+                    initMap(data.gpsList);
+                    len = gpsArray.length;
+                    step = progress.width() / gpsArray.length;
+                }, 600);
+
+                //导出的文件名
+                $('a[data-name=exportExcel]').attr('download', data.fileName);
+            });
+
+            $('.pb_tools_icon a.uk-button', _body).on('click', function () {
+                var type = $(this).data('type');
+                switch (type) {
+                    case 'play':
+                        play();
+                        break;
+                    case 'pause':
+                        pause();
+                        break;
+                    case 'fast_forward':
+                        goto(index + 10);
+                        break;
+                    case 'rewind':
+                        goto(index - 10);
+                        break;
+                    case 'stop':
+                        pause();
+                        break;
+                }
+            });
+
+            $('.pb_dropdown_tool li a', _body).on('click', function () {
+                var name = $(this).data('name');
+                switch (name) {
+                    case 'exportExcel':
+                        var base64Str = gb_map_play_back.listToExcel(gpsArray);
+                        $(this).attr('href', base64Str);
+                        break;
+                }
+            });
+
+            function goto(ei) {
+                if(ei < 0 || ei >= len)
+                    return;
+
+                bar.css('width', ei * step);
+                var gps = gpsArray[ei];
+                //重新定位marker
+                try {
+                    drawLine(gps.direction);
+                } catch (e) {
+                    console.log(e);
+                }
+                var point = new BMap.Point(gps.bd_lon, gps.bd_lat);
+                marker.setPosition(point);
+                marker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gps, width), new BMap.Size(width, 75)));
+
+                //重新填充轨迹线，更新日志面板
+                trailArray = [];
+                var logs = [];
+                for (var i = 0; i <= ei; i++) {
+                    trailArray.push(new BMap.Point(gpsArray[i].bd_lon, gpsArray[i].bd_lat));
+                    if(i > 0 && logs[logs.length - 1].road.ROAD_CODE == gpsArray[i].road.ROAD_CODE)
+                        logs.pop();
+
+                    logs.push(gpsArray[i]);
+                }
+                trailPolyline.setPath(trailArray);
+
+                index = ei;
+                map.panTo(marker.getPosition());
+                //更新日志面板
+                logPanel.empty().html(logTemp({list: logs}));
+                logWrap.scrollTop(logWrap[0].scrollHeight);
+            }
+
+            //播放
+            function play() {
+                $('.play-btn', _body)
+                        .data('type', 'pause')
+                        .find('i')
+                        .removeClass('uk-icon-play')
+                        .addClass('uk-icon-pause');
+                pauseFlag = false;
+                progress.addClass('uk-active');
+                run();
+
+                //定时居中
+                fixedToCenter();
+            }
+
+            var toCenterTimer;
+
+            function fixedToCenter() {
+                toCenterTimer = setInterval(function () {
+                    map.panTo(marker.getPosition());
+                }, 5000);
+            }
+
+            //暂停
+            var pauseFlag;
+
+            function pause() {
+                $('.play-btn', _body)
+                        .data('type', 'play')
+                        .find('i')
+                        .removeClass('uk-icon-pause')
+                        .addClass('uk-icon-play');
+                pauseFlag = true;
+                progress.removeClass('uk-active');
+                clearInterval(toCenterTimer);
+            }
+
+            var index = 1;
+            var len;
+
+            function run() {
+                //暂停
+                if (pauseFlag) {
+                    pauseFlag = false;
+                    return
+                }
+                //结束
+                if (index >= len) {
+                    bar.css('width', '100%')
+                    pause();
+                    return;
+                }
+
+                //marker 移动
+                var gps = gpsArray[index];
+
+                //线路走向
+                if (gps.direction != gpsArray[index - 1].direction || index == 1)
+                    drawLine(gps.direction);
+
+                var point = new BMap.Point(gps.bd_lon, gps.bd_lat);
+                marker.setPosition(point);
+                marker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(gps, width), new BMap.Size(width, 75)));
+
+                //轨迹线
+                trailArray.push(point);
+                trailPolyline.setPath(trailArray);
+
+                //进度条
+                bar.css('width', step * index);
+
+                //日志输出
+                logWrite(gps, gpsArray[index - 1]);
+
+                index++;
+                setTimeout(run, 1000);
+            }
+
+            //初始化地图
+            function initMap(data) {
+                gpsArray = data;
+                var firstPoint = new BMap.Point(data[0].bd_lon, data[0].bd_lat);
+                map = new BMap.Map($('.map_wrap', _body)[0]);
+                map.centerAndZoom(firstPoint, 17);
+                map.enableScrollWheelZoom();
+
+                //创建车辆marker
+                marker = new BMap.Marker(firstPoint);
+                width = gb_map_imap.calcGpsMarkerWidth(data[0].nbbm);
+                //渲染icon
+                marker.setIcon(new BMap.Icon(gb_map_imap.createCarIconRotation(data[0], width), new BMap.Size(width, 75)));
+                marker.disableMassClear();
+                map.addOverlay(marker);
+
+                //线路图层 数据
+                var routeCache = JSON.parse(storage.getItem(lineCode + '_route'));
+                upRoutePos = initRoutePosData(routeCache.up_bd);
+                downRoutePos = initRoutePosData(routeCache.down_bd);
+
+                trailArray.push(firstPoint);
+                drawTrailLine();
+                //输出第一个点
+                logWrite(data[0], null);
+            }
+
+            function drawTrailLine() {
+                trailPolyline = new BMap.Polyline(trailArray, {strokeWeight: 3, strokeColor: 'black'});
+                map.addOverlay(trailPolyline);
+            }
+
+            function initRoutePosData(routeStr) {
+                var array = [], temps;
+                $.each(routeStr, function (i, item) {
+                    var pos = [];
+                    $.each(item.split(','), function () {
+                        temps = this.split(' ');
+                        pos.push(new BMap.Point(temps[0], temps[1]));
+                    });
+                    array.push(pos);
+                });
+                return array;
+            }
+
+            function drawLine(updown) {
+                map.clearOverlays();
+
+                var pos = updown == 0 ? upRoutePos : downRoutePos;
+                $.each(pos, function () {
+                    map.addOverlay(new BMap.Polyline(this, {strokeWeight: 12, strokeColor: 'rgba(0, 0, 255, 0.6)'}));
+                });
+
+                drawTrailLine();
+            }
+
+            //日志输出
+            var logWrap = $('.pb_log_panel', _body);
+            var logPanel = $('.pb_log_panel .ct_table_body', _body);
+            gb_ct_table.fixedHead(logWrap);
+
+            function logWrite(gps, prve) {
+                var code = gps.road.ROAD_CODE;
+                if (!prve || code != prve.road.ROAD_CODE) {
+                    logPanel.append('<dl data-code="' + code + '" ><dd>' + gps.timeStr + '</dd><dd>' + gps.speed + '</dd><dd>' + gps.road.ROAD_NAME + '</dd><dd>正常</dd></dl>');
+                }
+                else {
+                    var dds = logPanel.find('dl[data-code=' + code + ']').last().find('dd');
+                    $(dds[0]).text(gps.timeStr);
+                    $(dds[1]).text(gps.speed);
+                }
+
+                logWrap.scrollTop(logWrap[0].scrollHeight);
+            }
+        })();
+    </script>
 </div>
 \ No newline at end of file
-/* 地图模块 轨迹回放 */
-
-var gb_map_play_back = (function () {
-
-    var dom;
-    $.get('/real_control_v2/mapmonitor/fragments/playback/main.html', function (rs) {
-        dom = rs;
-    });
-
-    var initParams = function (deviceId, nbbm) {
-        //关闭infowindow
-        if (deviceId)
-            gb_map_imap.call('closeWin', deviceId);
-
-        //show modal
-        var modal = '#map-playback-modal';
-        $(document.body).append(dom);
-        UIkit.modal(modal, {bgclose: false}).show();
-        $(modal).trigger('show_form', {deviceId: deviceId, nbbm: nbbm});
-    };
-
-    //导出excel
-    var listToExcel = function (list) {
-        var temp = '<html>' +
-            '   <head> '+
-            ' </head>' +
-            '  <body>' +
-            '  <table border="1">' +
-            '   <tr><th>序号</th><th>车辆</th><th>所在道路</th><th>经度</th><th>纬度</th><th>时间</th><th>速度</th></tr>' +
-            '  {{each list as gps i}}' +
-            '   <tr><td>{{i+1}}</td><td>{{gps.nbbm}}</td><td>{{gps.road.ROAD_NAME}}</td><td>{{gps.bd_lon}}</td><td>{{gps.bd_lat}}</td><td>{{gps.timeStr2}}</td><td>{{gps.speed}}</td></tr>' +
-            '  {{/each}}' +
-            '  </table>' +
-            '    </body>' +
-            '   </html>';
-
-        var rs = template.compile(temp)({list: list});
-
-        var uri = 'data:application/vnd.ms-excel;base64,';
-        return uri + base64(rs);
-        //location.href = uri + base64(rs);
-    };
-
-
-    function base64(string) {
-        return window.btoa(unescape(encodeURIComponent(string)));
-    }
-
-    return {
-        initParams: initParams,
-        listToExcel: listToExcel
-    }
+/* 地图模块 轨迹回放 */
+
+var gb_map_play_back = (function () {
+
+    var dom;
+    $.get('/real_control_v2/mapmonitor/fragments/playback/main.html', function (rs) {
+        dom = rs;
+    });
+
+    var initParams = function (deviceId, nbbm) {
+        //关闭infowindow
+        if (deviceId)
+            gb_map_imap.call('closeWin', deviceId);
+
+        //show modal
+        var modal = '#map-playback-modal';
+        $(document.body).append(dom);
+        UIkit.modal(modal, {bgclose: false}).show();
+        $(modal).trigger('show_form', {deviceId: deviceId, nbbm: nbbm});
+    };
+
+    //导出excel
+    var listToExcel = function (list) {
+        var temp = '<html>' +
+            '   <head> '+
+            ' </head>' +
+            '  <body>' +
+            '  <table border="1">' +
+            '   <tr><th>序号</th><th>车辆</th><th>所在道路</th><th>经度</th><th>纬度</th><th>时间</th><th>速度</th></tr>' +
+            '  {{each list as gps i}}' +
+            '   <tr><td>{{i+1}}</td><td>{{gps.nbbm}}</td><td>{{gps.road.ROAD_NAME}}</td><td>{{gps.bd_lon}}</td><td>{{gps.bd_lat}}</td><td>{{gps.timeStr2}}</td><td>{{gps.speed}}</td></tr>' +
+            '  {{/each}}' +
+            '  </table>' +
+            '    </body>' +
+            '   </html>';
+
+        var rs = template.compile(temp)({list: list});
+
+        var uri = 'data:application/vnd.ms-excel;base64,';
+        return uri + base64(rs);
+        //location.href = uri + base64(rs);
+    };
+
+
+    function base64(string) {
+        return window.btoa(unescape(encodeURIComponent(string)));
+    }
+
+    return {
+        initParams: initParams,
+        listToExcel: listToExcel
+    }
 })();
 \ No newline at end of file