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

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents 360a1cca 1af80940
Showing 23 changed files with 229 additions and 87 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/summary/entity/TempSchSituation.java
src/main/java/com/bsth/data/summary/service/impl/TempSchSituationServiceImpl.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/entity/directive/Directive.java
src/main/java/com/bsth/service/LineService.java
src/main/java/com/bsth/service/impl/LineServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/base/line/js/line-list-table.js
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/pages/base/timesmodel/js/v2/ParameterObj.js
src/main/resources/static/pages/mforms/singledatas/jquery.table2excel.min.js
src/main/resources/static/pages/summary/temp_sch_detail/list.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
 package com.bsth;
 import com.bsth.data.BasicData;
+import com.bsth.data.LineVersionsData;
 import com.bsth.data.ThreadMonotor;
 import com.bsth.data.car_out_info.UpdateDBThread;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.forecast.SampleTimeDataLoader;
 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata_v2.thread.OfflineMonitorThread;
-import com.bsth.data.line_version.thread.FixedEnableVerionsThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.safe_driv.SafeDrivDataLoadThread;
@@ -73,11 +73,11 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     OfflineMonitorThread offlineMonitorThread;
-    //@Autowired
-    //LineVersionsData lineVersionsData;
-
     @Autowired
-    FixedEnableVerionsThread fixedEnableVerionsThread;
+    LineVersionsData lineVersionsData;
+
+    /*@Autowired
+    FixedEnableVerionsThread fixedEnableVerionsThread;*/
     @Autowired
     SafeDrivDataLoadThread safeDrivDataLoadThread;
@@ -180,9 +180,9 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //线路版本更新
-        //sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
         //线路版本更新
-        sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
     }
 }
 package com.bsth.controller;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.LineVersions;
 import com.bsth.service.LineService;
 import com.bsth.service.LineVersionsService;
 import com.bsth.util.GetUIDAndCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -123,4 +122,14 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	Line findByID(@RequestParam(defaultValue = "id") Integer id){
 		return service.findById(id);
 	}
+
+	/**
+	 * 删除线路
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value ="/remove" , method = RequestMethod.POST)
+	public Map<String, Object> remove(Integer id){
+		return service.remove(id);
+	}
 }
@@ -7,6 +7,8 @@ import com.bsth.entity.directive.Directive;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D60Repository;
 import com.bsth.repository.directive.D64Repository;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,8 @@ public class DirectivesPstThread extends Thread {
     @Autowired
     DayOfSchedule dayOfSchedule;
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+
     @Override
     public void run() {
@@ -52,6 +56,8 @@ public class DirectivesPstThread extends Thread {
                             continue;
                         }
                     }
+                    //日期
+                    d60.setRq(fmtyyyyMMdd.print(d60.getTimestamp()));
                     d60Repository.save(d60);
                 }
@@ -9,6 +9,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * gps 数据缓存
@@ -17,10 +19,10 @@ import java.util.*;
 public class GpsCacheData {
     /**
-     * 每辆车缓存最后300条gps
+     * 每辆车缓存最后200条gps
      */
-    private static final int CACHE_SIZE = 300;
-    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
+    private static final int CACHE_SIZE = 200;
+    private static ConcurrentMap<String, CircleQueue<GpsEntity>> gpsCacheMap = new ConcurrentHashMap<>();
     /**
      * 车辆执行班次的详细 进出站数据
@@ -104,6 +104,7 @@ public class DayOfSchedule {
     static {
         nbbmScheduleMap = ArrayListMultimap.create();
         lpScheduleMap = ArrayListMultimap.create();
+        lineNbbmsMap = HashMultimap.create();
         id2SchedulMap = new ConcurrentHashMap<>();
         pstBuffer = new ConcurrentLinkedQueue<>();
@@ -31,8 +31,6 @@ public class TempSchSituation {
     private String sGh;
-    private String reason;
-
     private int size;
     private Double mileage;
@@ -99,14 +97,6 @@ public class TempSchSituation {
         this.sGh = sGh;
     }
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
     public int getSize() {
         return size;
     }
@@ -162,4 +152,4 @@ public class TempSchSituation {
     public void setFgsBm(String fgsBm) {
         this.fgsBm = fgsBm;
     }
-}
+}
 \ No newline at end of file
@@ -37,19 +37,14 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl&lt;TempSchSituatio
             @Override
             public int compare(TempSchSituation o1, TempSchSituation o2) {
                 int i = o1.getRq().compareTo(o2.getRq());
-                if(i != 0)
+                if (i != 0)
                     return i;
                 i = o1.getLineName().compareTo(o2.getLineName());
-                if(i != 0)
+                if (i != 0)
                     return i;
                 i = (int) (o1.getT() - o2.getT());
-                if(i != 0)
-                    return i;
-
-                i = o1.getReason().compareTo(o2.getReason());
-
                 return i;
             }
         });
@@ -64,10 +59,10 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl&lt;TempSchSituatio
             List<TempSchSituation> list = (List<TempSchSituation>) super.list(map);
-            if(list.size() == 0){
+            if (list.size() == 0) {
                 response.setHeader("Content-type", "text/html;charset=UTF-8");
                 response.getWriter().print("<span style='color:red;font-size:24px;'>根据查询条件没有搜索到数据，别导了！</span>");
-                return ;
+                return;
             }
             //排序
@@ -75,19 +70,14 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl&lt;TempSchSituatio
                 @Override
                 public int compare(TempSchSituation o1, TempSchSituation o2) {
                     int i = o1.getRq().compareTo(o2.getRq());
-                    if(i != 0)
+                    if (i != 0)
                         return i;
                     i = o1.getLineName().compareTo(o2.getLineName());
-                    if(i != 0)
+                    if (i != 0)
                         return i;
                     i = (int) (o1.getT() - o2.getT());
-                    if(i != 0)
-                        return i;
-
-                    i = o1.getReason().compareTo(o2.getReason());
-
                     return i;
                 }
             });
@@ -103,7 +93,7 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl&lt;TempSchSituatio
             Row row;
             TempSchSituation tss;
             SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-            for(int i = 0; i < list.size(); i++){
+            for (int i = 0; i < list.size(); i++) {
                 tss = list.get(i);
                 row = sheet.createRow(i + 1);
                 row.createCell(0).setCellValue(tss.getRq());
@@ -132,5 +122,4 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl&lt;TempSchSituatio
             logger.error("", e);
         }
     }
-
 }
 \ No newline at end of file
@@ -160,6 +160,11 @@ public class Line implements Serializable {
 	/** 是否在使用 <1:是;0:否> bit length(50) */
 	private Integer inUse;
+
+	/**
+	 * 逻辑删除标记 为 1：标识已删除
+	 */
+	private Integer remove;
 	public Integer getSpacGrade() {
 		return spacGrade;
@@ -492,6 +497,13 @@ public class Line implements Serializable {
 	public void setSfyy(Integer sfyy) {
 		this.sfyy = sfyy;
 	}
-    
-    
+
+
+	public Integer getRemove() {
+		return remove;
+	}
+
+	public void setRemove(Integer remove) {
+		this.remove = remove;
+	}
 }
@@ -28,6 +28,8 @@ public class Directive {
 	 * 时间戳
 	 */
 	protected Long timestamp;
+
+	private String rq;
 	/**
 	 * 时间 HH:mm
@@ -113,4 +115,12 @@ public class Directive {
 	public void setSender(String sender) {
 		this.sender = sender;
 	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
 }
 package com.bsth.service;
-import java.util.Map;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.bsth.entity.Line;
+import java.util.Map;
+
 /**
  * 
  * @Interface: LineService(线路service业务层实现接口)
@@ -38,4 +35,6 @@ public interface LineService extends BaseService&lt;Line, Integer&gt; {
 	String lineCodeVerification(String lineCode);
 	Map<String, Object> update(Line l);
+
+    Map<String,Object> remove(Integer id);
 }
 package com.bsth.service.impl;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.repository.LineRepository;
 import com.bsth.service.LineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -34,6 +34,9 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 	@Autowired
 	private LineRepository repository;
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
 	/**
 	 * 获取线路编码
 	 * 
@@ -86,4 +89,32 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 		return map;
 	}
+	@Override
+	public Map<String, Object> remove(Integer id) {
+		Map<String, Object> map = new HashMap<>();
+
+		try{
+			if(null == id){
+				map.put("status", ResponseCode.ERROR);
+				map.put("msg", "参数异常");
+				return map;
+			}
+
+			int destroy = jdbcTemplate.queryForObject("select destroy from bsth_c_line where id=" + id, Integer.class);
+
+			if(destroy==0){
+				map.put("status", ResponseCode.ERROR);
+				map.put("msg", "你只能删除已撤销的线路！");
+				return map;
+			}
+
+			jdbcTemplate.update("update bsth_c_line set `remove`=1 where id=?", id);
+			map.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			logger.error("", e);
+			map.put("status", ResponseCode.ERROR);
+			map.put("msg", e.getMessage());
+		}
+		return map;
+	}
 }
@@ -1234,7 +1234,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleModifyLogger.sftz(sch, fcsjActual, remarks);
             sch.setFcsjActualAll(fcsjActual);
-            sch.addRemarks(remarks);
+            sch.setRemark(remarks);
             sch.calcStatus();
             //if(sch.isLate2()){
                 //取消应发未到标记
@@ -180,6 +180,7 @@
 		params['order'] = 'id';
 		// 记录当前页数
 		params['page'] = page;
+		params['remove_ne'] = 1;
 		// 弹出正在加载层
 		var i = layer.load(2);
 		getComp(function(rs) {
 <!-- <link href="/pages/base/line/css/animate.css" rel="stylesheet" type="text/css" />
 <link href="/pages/base/line/css/tipso.css" rel="stylesheet" type="text/css" /> -->
 <!-- 片段标题 START -->
+<style>
+	a.ct_base_line_delete_link{
+		font-size: 12px;
+		color: red;
+		vertical-align: bottom;
+		display: inline-block;
+		margin-left: 5px;
+		text-decoration: underline;
+	}
+
+	a.ct_base_line_delete_link:hover{
+		color: #d11608;
+	}
+</style>
 <div class="page-head">
 	<div class="page-title">
 		<h1>线路信息</h1>
@@ -355,6 +369,10 @@
 			<td>
 				<a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
 				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+
+				{{if obj.destroy==1}}
+				<a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>
+				{{/if}}
 			</td>
 		</tr>
 	{{/each}}
@@ -365,4 +383,23 @@
 	{{/if}}
 </script>
 <!-- 线路信息片段JS模块 -->
-<script src="/pages/base/line/js/line-list-table.js"></script>
 \ No newline at end of file
+<script src="/pages/base/line/js/line-list-table.js"></script>
+<script>
+	(function () {
+		$(document).on('click', 'a.ct_base_line_delete_link', function () {
+			var id = $(this).data('id'),
+					name = $(this).data('name');
+
+			layer.confirm('你确定要删除线路【'+name+'】？', {
+				btn: ['确定删除','取消'] //按钮
+			}, function(){
+				layer.msg('操作中...', {icon: 16,shade: 0.01});
+				$post('/line/remove', {id: id}, function (rs) {
+					layer.msg('删除成功！');
+					$('.filter-submit.margin-bottom').trigger('click');
+				});
+
+			});
+		});
+	})();
+</script>
 \ No newline at end of file
@@ -390,9 +390,18 @@ var ParameterObj = function() {
          */
         getUpLastDtimeObj: function() {
             _validInternal(); // 验证
-            return this.toTimeObj(
+            var oStartTime = this.toTimeObj(
+                _firstLastDepartureTimeStrObj.up.firstVehicleDepartureTimeStr
+            );
+            var oEndTime = this.toTimeObj(
                 _firstLastDepartureTimeStrObj.up.lastVehicleDepartureTimeStr
             );
+            if (oEndTime.isBefore(oStartTime)) {
+                // 如果末班车时间早于首班车时间，则末班车时间跨天，需要加1天
+                oEndTime.add(1, "day");
+            }
+
+            return oEndTime;
         },
         /**
          * 获取下行首班时间对象。
@@ -410,9 +419,18 @@ var ParameterObj = function() {
          */
         getDownLastDTimeObj: function() {
             _validInternal(); // 验证
-            return this.toTimeObj(
+            var oStartTime = this.toTimeObj(
+                _firstLastDepartureTimeStrObj.down.firstVehicleDepartureTimeStr
+            );
+            var oEndTime = this.toTimeObj(
                 _firstLastDepartureTimeStrObj.down.lastVehicleDepartureTimeStr
             );
+            if (oEndTime.isBefore(oStartTime)) {
+                // 如果末班车时间早于首班车时间，则末班车时间跨天，需要加1天
+                oEndTime.add(1, "day");
+            }
+
+            return oEndTime;
         },
         //-------------- 获取吃饭时间 ----------------//
-/*
- *  jQuery table2excel - v1.1.1
- *  jQuery plugin to export an .xls file in browser from an HTML table
- *  https://github.com/rainabba/jquery-table2excel
- *
- *  Made by rainabba
- *  Under MIT License
- */
+/*
+ *  jQuery table2excel - v1.1.1
+ *  jQuery plugin to export an .xls file in browser from an HTML table
+ *  https://github.com/rainabba/jquery-table2excel
+ *
+ *  Made by rainabba
+ *  Under MIT License
+ */
 !function(a,b,c,d){function e(b,c){this.element=b,this.settings=a.extend({},k,c),this._defaults=k,this._name=j,this.init()}function f(a){return a.filename?a.filename:"table2excel"}function g(a){var b=/(\s+alt\s*=\s*"([^"]*)"|\s+alt\s*=\s*'([^']*)')/i;return a.replace(/<img[^>]*>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}function h(a){return a.replace(/<a[^>]*>|<\/a>/gi,"")}function i(a){var b=/(\s+value\s*=\s*"([^"]*)"|\s+value\s*=\s*'([^']*)')/i;return a.replace(/<input[^>]*>|<\/input>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}var j="table2excel",k={exclude:".noExl",name:"Table2Excel",filename:"table2excel",fileext:".xls",exclude_img:!0,exclude_links:!0,exclude_inputs:!0};e.prototype={init:function(){var b=this;b.template={head:'<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><meta http-equiv="content-type" content="application/vnd.ms-excel; charset=UTF-8"><head>\x3c!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets>',sheet:{head:"<x:ExcelWorksheet><x:Name>",tail:"</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>"},mid:"</x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--\x3e</head><body>",table:{head:"<table>",tail:"</table>"},foot:"</body></html>"},b.tableRows=[],a(b.element).each(function(c,d){var e="";a(d).find("tr").not(b.settings.exclude).each(function(c,d){e+="<tr>",a(d).find("td,th").not(b.settings.exclude).each(function(c,d){var f={rows:a(this).attr("rowspan"),cols:a(this).attr("colspan"),flag:a(d).find(b.settings.exclude)};f.flag.length>0?e+="<td> </td>":f.rows&f.cols?e+="<td>"+a(d).html()+"</td>":(e+="<td",f.rows>0&&(e+=" rowspan='"+f.rows+"' "),f.cols>0&&(e+=" colspan='"+f.cols+"' "),e+="/>"+a(d).html()+"</td>")}),e+="</tr>"}),b.settings.exclude_img&&(e=g(e)),b.settings.exclude_links&&(e=h(e)),b.settings.exclude_inputs&&(e=i(e)),b.tableRows.push(e)}),b.tableToExcel(b.tableRows,b.settings.name,b.settings.sheetName)},tableToExcel:function(d,e,g){var h,i,j,k=this,l="";if(k.format=function(a,b){return a.replace(/{(\w+)}/g,function(a,c){return b[c]})},g=void 0===g?"Sheet":g,k.ctx={worksheet:e||"Worksheet",table:d,sheetName:g},l=k.template.head,a.isArray(d))for(h in d)l+=k.template.sheet.head+g+h+k.template.sheet.tail;if(l+=k.template.mid,a.isArray(d))for(h in d)l+=k.template.table.head+"{table"+h+"}"+k.template.table.tail;l+=k.template.foot;for(h in d)k.ctx["table"+h]=d[h];if(delete k.ctx.table,!c.documentMode){var m=new Blob([k.format(l,k.ctx)],{type:"application/vnd.ms-excel"});b.URL=b.URL||b.webkitURL,i=b.URL.createObjectURL(m),j=c.createElement("a"),j.download=f(k.settings),j.href=i,c.body.appendChild(j),j.click(),c.body.removeChild(j)}else if("undefined"!=typeof Blob){l=k.format(l,k.ctx),l=[l];var n=new Blob(l,{type:"text/html"});b.navigator.msSaveBlob(n,f(k.settings))}else txtArea1.document.open("text/html","replace"),txtArea1.document.write(k.format(l,k.ctx)),txtArea1.document.close(),txtArea1.focus(),sa=txtArea1.document.execCommand("SaveAs",!0,f(k.settings));return!0}},a.fn[j]=function(b){var c=this;return c.each(function(){a.data(c,"plugin_"+j)||a.data(c,"plugin_"+j,new e(this,b))}),c}}(jQuery,window,document);
 \ No newline at end of file
@@ -172,8 +172,8 @@
                     <th>司机</th>
                     <th>售票员</th>
                     <th>班次</th>
-                    <th>烂班公里</th>
-                    <th>烂班时间</th>
+                    <th>临加公里</th>
+                    <th>临加时间</th>
                     <th>备注</th>
                 </tr>
                 </thead>
@@ -338,6 +338,9 @@ svg.line-chart g.merge-item text {
 .tooltip span.field {
     color: #7d7d7b;
     margin-right: 5px;
+    width: 52px;
+    display: inline-block;
+    text-align: right;
 }
 .tooltip .tip_map_wrap {
@@ -2026,4 +2029,10 @@ dl.active &gt; dd.disabled {
     100% {
         background: rgba(254, 235, 69, 0.38);
     }
+}
+
+.home_svg_tips>div{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 \ No newline at end of file
@@ -3,7 +3,7 @@
       <div class="tooltip" data-id="{{deviceId}}">
         <div class="tooltip-container">
-            <div class="cont-text-panel">
+            <div class="cont-text-panel home_svg_tips">
                 <div class="title">
                     <a href="javascript:;" data-for="station" class="tip_modal">
                         {{nbbm}}
@@ -21,7 +21,7 @@
                 <div>
                     <span class="field">车牌号：</span>{{plateNo}}
                 </div>
-                <div>
+                <div title="{{stationName}}">
                     <span class="field">站点：</span>{{stationName}}
                 </div>
                 <!-- <div>
@@ -30,9 +30,19 @@
                 <div>
                     <span class="field">设备：</span>{{deviceId}}
                 </div>
-                <div>
+                <!--<div>
                     <span class="field">坐标：</span>{{lon}} {{lat}}
-                </div>
+                </div>-->
+                {{if sch!=null}}
+                    <div>
+                        <span class="field">驾驶员：</span>{{sch.jGh}}/{{sch.jName}}
+                    </div>
+                    {{if sch.sGh!=null && sch.sGh!=""}}
+                        <div>
+                            <span class="field">售票员：</span>{{sch.sGh}}/{{sch.sName}}
+                        </div>
+                    {{/if}}
+                {{/if}}
                 <div>
                     <span class="field">速度：</span>{{speed>99?'..':speed}}</div>
                 <div>
@@ -181,7 +181,7 @@
                     if(lineCode)
                         data.lineId=lineCode;
                 }
-                $.get('/gps/real/all', data, function(rs) {
+                $.get('/gps/real/all?t=' + Math.random(), data, function(rs) {
                     //数据转换
                     var code2Name=gb_data_basic.lineCode2NameAll();
                     $.each(rs.list, function(){
@@ -438,9 +438,9 @@
                     });
                     //统计路单 -娄高峰
-                    /*gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
+                    gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
                         reCountEp.emitLater('calcWaybill');
-                    });*/
+                    });
                     //统计油 -廖磊
                     gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () {
@@ -472,6 +472,11 @@ var gb_schedule_table = (function () {
             //滚动到下一个班次
             scroToDl(nextSch);
         }
+
+        //如果有打开轨迹回放
+        if($('.layui-layer.play_back-layer').is(':visible')){
+            gb_map_play_back.setParam(sch);
+        }
     });
     //路牌点击
@@ -10,6 +10,18 @@ var gb_map_play_back = (function () {
         dom = rs;
     });
+    var setParam = function (sch) {
+        console.log('sch', sch);
+        var f = $('.play-back-form form'),
+            st = (sch['fcsjActualTime']?sch['fcsjActualTime']:sch['dfsjT']) - 1000 * 60 * 5,
+            et = (sch['zdsjActualTime']?sch['zdsjActualTime']:sch['zdsjT']) + 1000 * 60 * 5,
+            fs = 'YYYY-MM-DD HH:mm';
+
+        $('[name=nbbm]', f).val(sch.clZbh);
+        $('[name=startTime]', f).val(moment(st).format(fs));
+        $('[name=endTime]', f).val(moment(et).format(fs));
+    };
+
     var initParams = function (deviceId, nbbm) {
         //关闭infowindow
         if (deviceId)
@@ -96,6 +108,7 @@ var gb_map_play_back = (function () {
     return {
         initParams: initParams,
-        listToExcel: listToExcel
+        listToExcel: listToExcel,
+        setParam: setParam
     }
 })();
 \ No newline at end of file