update

潘钊
1 parent 45e19c79
Showing 17 changed files with 278 additions and 102 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/DateUtils.java
src/main/resources/ms-jdbc.properties
src/main/resources/static/index.html
src/main/resources/static/pages/control/line/child_pages/child_task.html
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/js/data.js
src/main/resources/static/pages/control/line/js/rightMenu.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
src/main/resources/static/pages/mapmonitor/real/js/playBack.js
@@ -102,17 +102,21 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	 * @Description: TODO(清理内存数据) 
 	 */
 	public void clearRAMData(String lineCode){
-		//allArrivals.removeAll(lineCode);
-		int count = 0;
+		
+		List<ArrivalEntity> remList = new ArrayList<>();
 		//车辆映射的进出站数据，遍历删除对应线路数据。
 		Collection<ArrivalEntity> seList = startAndEndMaps.values();
 		for(ArrivalEntity arr : seList){
-			if(arr.getLineCode().equals(lineCode)){
-				if(startAndEndMaps.remove(arr.getDeviceId(), arr)){
-					count ++;
-				}
-			}
+			if(arr.getLineCode().equals(lineCode))
+				remList.add(arr);
+		}
+		
+		//删除数据
+		int count = 0;
+		for(ArrivalEntity arr : remList){
+			startAndEndMaps.remove(arr.getNbbm(), arr);
+			count ++;
 		}
 		logger.info(lineCode + " 清除到离站数据 ，" + count);
@@ -142,31 +142,37 @@ public class DayOfDirectives {
 	public void clear(String device){
 		int c60 = 0, c64 = 0;
-		//清除60
+		//找到该设备的60数据
 		Collection<D60> d60s = d60Map.values();
+		List<D60> rem60List = new ArrayList<>();
 		for(D60 d60 : d60s){
-			if(d60.getDeviceId().equals(device)){
-				//入库
-				if(d60.getReply47() == null)
-					directiveService.save(d60);
-				
-				if(null != d60Map.remove(d60.getMsgId()))
-					c60 ++;
-			}
+			if(d60.getDeviceId().equals(device))
+				rem60List.add(d60);
+		}
+		//清除60数据
+		for(D60 d60 : rem60List){
+			if(d60.getReply47() == null)
+				directiveService.save(d60);
+			if(null != d60Map.remove(d60.getMsgId()))
+				c60 ++;
 		}
 		logger.info("清除60数据 ，" + c60);
-		//清除64
+		//找到该设备的64数据
 		Collection<D64> d64s = d64Map.values();
+		List<D64> rem64List = new ArrayList<>();
 		for(D64 d64 : d64s){
-			if(d64.getDeviceId().equals(device)){
-				//入库
-				if(d64.getRespAck() == null)
-					directiveService.save64(d64);
-				
-				if(null != d64Map.remove(d64.getKey()))
-					c64 ++;
-			}
+			if(d64.getDeviceId().equals(device))
+				rem64List.add(d64);
+		}
+		
+		//清除64数据
+		for(D64 d64 : rem64List){
+			if(d64.getRespAck() == null)
+				directiveService.save64(d64);
+			
+			if(null != d64Map.remove(d64.getKey()))
+				c64 ++;
 		}
 		logger.info("清除64数据 ，" + c64);
@@ -277,7 +277,9 @@ public class PilotReport {
 	}
 	public void clear(String lineCode){
+		logger.info("清除 80数据 before: " + d80MultiMap.size());
 		d80MultiMap.removeAll(lineCode);
+		logger.info("清除 80数据 after: " + d80MultiMap.size());
 	}
 	public Collection<? extends D80> findByCar(String nbbm) {
 package com.bsth.data.schedule;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -220,11 +221,20 @@ public class DayOfSchedule implements CommandLineRunner {
 	 * @Description: TODO(清理内存数据)
 	 */
 	public void clearRAMData(String lineCode) {
+		int count = 0;
+		List<ScheduleRealInfo> remList = new ArrayList<>();
 		Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
 		for (ScheduleRealInfo sch : schs) {
 			if (sch.getXlBm().equals(lineCode))
-				nbbmScheduleMap.remove(sch.getClZbh(), sch);
+				remList.add(sch);
 		}
+		
+		for(ScheduleRealInfo sch : remList){
+			nbbmScheduleMap.remove(sch.getClZbh(), sch);
+			count ++;
+		}
+		
+		logger.info(lineCode + "排班清理 " + count);
 	}
 	/**
@@ -265,6 +275,15 @@ public class DayOfSchedule implements CommandLineRunner {
 			for (ScheduleRealInfo sch : realList) {
 				sch.setScheduleDateStr(DateUtils.sdfyyyyMMdd.format(sch.getScheduleDate()));
 				sch.setRealExecDate(sch.getScheduleDateStr());
+				// 计划终点时间
+				if (sch.getBcsj() != null) {
+					try{
+						sch.setZdsjT(DateUtils.sdfHHmm.parse(sch.getFcsj()).getTime() + (sch.getBcsj() * 60 * 1000));
+						sch.setZdsj(DateUtils.sdfHHmm.format(sch.getZdsjT()));
+					}catch(ParseException pe){
+						logger.error("loadPlanSch... 计算终点时间失败...");
+					}
+				}
 			}
 		} catch (Exception e) {
 			logger.error("", e);
@@ -584,4 +603,13 @@ public class DayOfSchedule implements CommandLineRunner {
 		}
 		return outList;
 	}
+
+	public ScheduleRealInfo delete(Long id) {
+		ScheduleRealInfo sch = id2SchedulMap.get(id);
+		if(!sch.isSflj())
+			return null;
+		
+		nbbmScheduleMap.remove(sch.getClZbh(), sch);
+		return sch;
+	}
 }
@@ -87,7 +87,7 @@ public class SchAttrCalculator {
 	 * @Description: TODO(计算班次的起点应到时间，list 必须是同一辆车的班次) 
 	 */
 	public void calcQdzTimePlan(List<ScheduleRealInfo> list){
-		Collections.sort(list, new ScheduleComparator.FCSJ());
+		Collections.sort(list, new ScheduleComparator.FCNO());
 		int len = list.size();
 		if(len == 0)
@@ -46,6 +46,7 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.SectionRouteService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.DateUtils;
 import com.bsth.util.ReportRelatedUtils;
 import com.bsth.util.ReportUtils;
 import com.bsth.util.TimeUtils;
@@ -304,32 +305,43 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	 */
 	@Override
 	public Map<String, Object> save(ScheduleRealInfo t) {
-		SysUser user = SecurityUtils.getCurrentUser();
-		Date d = new Date();
-		
-		t.setScheduleDate(d);
-		t.setRealExecDate(sdfMonth.format(d));
-		t.setCreateBy(user);
-		t.setSflj(true);
-		Map<String, Object> map = super.save(t);
-
-		// 加入缓存
-		dayOfSchedule.put(t);
-		dayOfSchedule.calcQdzTimePlan(t.getClZbh());
-		//将该临加之后的班次作为更新返回页面
-		List<ScheduleRealInfo> list = dayOfSchedule.nextAll(t)
-				,rsList = null;
-		
-		for(ScheduleRealInfo sch : list){
-			if(sch.getId() == t.getId())
-				rsList = new ArrayList<>();
+		Map<String, Object> rs = new HashMap<>();
+		try{
+			SysUser user = SecurityUtils.getCurrentUser();
+			String schDate = DayOfSchedule.currSchDateMap.get(t.getXlBm());
+			
+			t.setScheduleDateStr(schDate);
+			t.setScheduleDate(DateUtils.sdfyyyyMMdd.parse(schDate));
+			t.setRealExecDate(schDate);
+			t.setCreateBy(user);
+			t.setSflj(true);
+			//班次历时
+			t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);
+
+			//实时入库
+			rs = super.save(t);
+			// 加入缓存
+			dayOfSchedule.put(t);
+			
+			dayOfSchedule.calcQdzTimePlan(t.getClZbh());
+			//将该临加之后的班次作为更新返回页面
+			List<ScheduleRealInfo> list = dayOfSchedule.nextAll(t)
+					,rsList = null;
-			if(rsList != null)
-				rsList.add(sch);
+			for(ScheduleRealInfo sch : list){
+				if(sch.getId() == t.getId())
+					rsList = new ArrayList<>();
+				
+				if(rsList != null)
+					rsList.add(sch);
+			}
+			
+			rs.put("ups", rsList);
+		}catch(Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
 		}
-		
-		map.put("ups", rsList);
-		return map;
+		return rs;
 	}
 	@Override
@@ -1165,4 +1177,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	public List<ScheduleRealInfo> realScheduleList(String line, String date) {
 		return scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
 	}
+
+	@Override
+	public Map<String, Object> delete(Long id) {
+		Map<String, Object> rs = new HashMap<>();
+		ScheduleRealInfo sch = dayOfSchedule.delete(id);
+		if(null != sch){
+			rs = super.delete(id);
+			rs.put("t", sch);
+		}
+		else
+			rs.put("status", ResponseCode.ERROR);
+
+		return rs;
+	}
 }
@@ -129,4 +129,8 @@ public class DateUtils {
 		}
 		return sdfyyyyMMdd.format(cal.getTime());
 	}
+
+	public static int calcHHmmDiff(String fcsj, String zdsj) throws ParseException {
+		return (int) (sdfHHmm.parse(zdsj).getTime() - sdfHHmm.parse(fcsj).getTime());
+	}
 }
-ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
-ms.mysql.username= root
-ms.mysql.password= panzhao
-
 #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.201:3306/ms?useUnicode=true&characterEncoding=utf-8
 #ms.mysql.username= root
-#ms.mysql.password= root2jsp
 \ No newline at end of file
+#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
 \ No newline at end of file
@@ -111,16 +111,27 @@ tr.row-active td {
 	display: block !important; 
 }
-.page-header.navbar .page-logo {
-        width: 335px;
-}
-
 .page-header.navbar .page-logo .logo-default {
        margin: 0;
 }
 .page-header.navbar .top-menu .navbar-nav>li.dropdown.open .dropdown-toggle {
     background-color: #284a99;
 }
+.page-header.navbar .page-logo{
+	    padding-right: 10px;
+}
+
+.page-logo .logo-default.logo-default-text{
+    font-weight: 600;
+    color: white !important;
+    margin-top: 19px !important;
+    font-size: 24px;
+    text-decoration: none;
+}
+.page-logo .logo-default.logo-default-text:HOVER{
+	color: #dedede !important;
+}
+
 </style>
 <!-- ocLazyLoading载入文件的位置 -->
@@ -128,12 +139,11 @@ tr.row-active td {
 </head>
 <body class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
-    <div class="page-header navbar navbar-fixed-top" style="background: #23438e;">
+    <div class="page-header navbar navbar-fixed-top" style="background: linear-gradient(to bottom ,#124e78, #125688);">
         <div class="page-header-inner ">
             <!-- LOGO -->
             <div class="page-logo">
-                <a href="index.html">
-                    <img src="/assets/img/logo_text.png" alt="logo" class="logo-default" /> </a>
+                <a href="index.html" class="logo-default logo-default-text" > 闵行公交调度系统 </a>
                 <div class="menu-toggler sidebar-toggler">
                 </div>
             </div>
@@ -146,12 +156,12 @@ tr.row-active td {
                         <li class="dropdown dropdown-extended dropdown-notification dropdown-dark" id="header_notification_bar">
                             <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
                                 <i class="fa fa-bell"></i>
-                                <span class="badge badge-success"> 3 </span>
+                                <span class="badge badge-success"> 0 </span>
                             </a>
                             <ul class="dropdown-menu" style="max-width: 345px;width: 345px;">
                                 <li class="external">
-                                    <h3>今日  <span class="bold">318 条</span> 通知</h3>
-                                    <a href="page_user_profile_1.html">查看全部</a>
+                                    <h3>今日  <span class="bold">0 条</span> 通知</h3>
+                                    <a href="javascript:;">查看全部</a>
                                 </li>
                                 <li>
                                     <ul class="dropdown-menu-list scroller" style="height: 250px;" data-handle-color="#637283">
@@ -279,7 +289,7 @@ tr.row-active td {
 <!-- PJAX -->
 <script src="/assets/plugins/jquery.pjax.js"></script>
 <!-- layer 弹层 -->
-<script src="/assets/plugins/layer-v2.4/layer/layer.js" ></script>
+<script src="/assets/plugins/layer-v2.4/layer/layer.js" data-exclude=1></script>
 <!-- jquery.purl URL解析 -->
 <script src="/assets/plugins/purl.js"></script>
 <!-- jquery.serializejson JSON序列化插件 -->
@@ -183,6 +183,7 @@ $(function(){
 	});
 	//主任务点击事件
+	var sch_remove = '<div class="sch_remove">×</div>';
 	$('#childTaskDiv').on('click', '.mainTable tr', function(){
 		$mainTab.find('tr._active').removeClass('_active');
 		$(this).addClass('_active');
@@ -190,13 +191,24 @@ $(function(){
 		//显示班次详细
 		$.each(this.cells, function(i,cell){
 			$('#mainDetailPabel input[data-cell='+i+']').val($.trim($(cell).text()));
-		});
+		})
+		var id = $(this).data('id');
+		//是否是临加班次
+		if(id){
+			var sch = _data.getSchedulById(id);
+			if(sch && sch.sflj)
+				$('#mainDetailPabel').append($(sch_remove).data('id', id));
+			else
+				$('#mainDetailPabel .sch_remove').remove();
+		}
+		
+		//返回false 点击的是空班次
 		if(!changeHandlerPanel(this))
 			return;
-		var id = $(this).data('id');
-		childTaskBtn(scheduleIdMap[id].bcType);
+		childTaskBtn(scheduleIdMap[id].bcType);
+		//刷新子任务列表
 		refreshChildTasks();
 	});
@@ -388,7 +400,6 @@ $(function(){
 		var $tr = $('.mainTable tr[data-id]', '#childTaskDiv').eq(0);
 		if($tr.length > 0){
 			var sch = _data.getSchedulById($tr.data('id'));
-			console.log(sch);
 			//默认车辆
 			$('select[name=clZbh]', schAddPanel).val(sch.clZbh).trigger('change');
 			//默认驾驶员
@@ -465,19 +476,15 @@ $(function(){
 		layer.msg('操作中...', {icon: 16,time:0});
 		$post('/realSchedule', param, function(rs){
 			var sch = rs.t;
-			//前端缓存更新
-			//scheduleLineMap[param.xlBm][param.lpName].push(sch);
-			/* var ups = rs.ups;
-			for(var i in ups){
-				_data.updateSchedule(ups[i]);
-			} */
 			//刷新表格
-			//_alone.updateTableBySch(sch);
-			_alone.update2Table(sch.xlBm, sch);
-			
+			_alone.update2Table(sch.xlBm);
 			//关闭弹出层
 			layer.closeAll();
-			layer.alert('临加班次成功！',{icon:1, shift: 5});
+			
+			layer.alert('临加班次成功！',{icon:1, shift: 5, end: function(){
+				//定位到新的班次
+				_alone.goToSch(sch, true);
+			}});
 		});
 	});
@@ -496,6 +503,24 @@ $(function(){
 				return r.stationName;
 		}
 	}
+	
+	//删除临加班次
+	$('#childTaskDiv').on('click', '#mainDetailPabel .sch_remove', function(){
+		//alert('删除..' + $(this).data('id'));
+		var id = $(this).data('id');
+		if(!id){
+			layer.alert('标识符无效！');
+			return;
+		}
+		removeConfirm('确定删除该班次信息？', '/realSchedule/' + id, function(rs){
+			//刷新表格
+			_alone.update2Table(rs.t.xlBm, function(){
+				//重新从_date.js获取数据
+				scheduleLineMap = _data.getLineLpMap();
+				refreshMainList();
+			});
+		});
+	}); 
 });
 //刷新子任务表格
@@ -1117,6 +1117,7 @@ height: 400px;
 	white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    position: relative;
 }
 .pic-panel{
@@ -1678,6 +1679,39 @@ height: 400px;
 	content: "临加班次";
 }
+/* #mainDetailPabel.close-sch:AFTER {
+    content: "×";
+    position: absolute;
+    top: -11px;
+    right: 10px;
+    font-size: 24px;
+    font-weight: 700;
+    line-height: 1;
+    color: #908a8a;
+    padding: 0 0 0 4px;
+    background: #fff;
+    text-shadow: 0 1px 0 #fff;
+    cursor: pointer;
+} */
+
+#mainDetailPabel .sch_remove{
+	position: absolute;
+    top: -11px;
+    right: 10px;
+    font-size: 24px;
+    font-weight: 700;
+    line-height: 1;
+    color: #908a8a;
+    padding: 0 0 0 4px;
+    background: #fff;
+    text-shadow: 0 1px 0 #fff;
+    cursor: pointer;
+}
+
+#mainDetailPabel .sch_remove_icon:HOVER{
+	color: #636262;
+}
+
 .custom-box-body .row{
 	margin-left: 0px;
 	margin-top: 8px;
@@ -2518,4 +2552,17 @@ span.nt-coord:before{
 	font-size: 13px;
 	text-indent: 15px;
 	margin: 8px 0;
+}
+
+tr.linjia td:nth-child(1):AFTER {
+    content: "\f173";
+    font: normal normal normal 14px/1 FontAwesome;
+    position: absolute;
+    right: 1px;
+    bottom: 2px;
+    font-size: 8px;
+    color: #ffffff;
+    padding: 1px 3px 1px 3px;
+    background: #e7505a;
+    border-radius: 15px;
 }
 \ No newline at end of file
@@ -228,8 +228,8 @@ function countDown(name){
 <script>
 var updateLog = {
-	text: '<div class="updete_log"><p>1、调整实到实发匹配算法，调整了东川路电子围栏。</p><p>2、修复了烂班的班次指令会发送给驾驶员的问题。</p><p>3、修复了车辆到达终点后马上跳出下一班实发的问题。</p><p>4、修复轨迹回放缓冲区重复绘制问题。</p><p class="font-red">注意：进出场班次必须按照起点站划分上下行，如 兰坪路浦江路 ——> 停车场 必须是下行班次，否则该班次将不会有发车时间。</p></div>'
-	,title: '2016年8月25号凌晨更新日志'
+	text: '<div class="updete_log"><p>1、调整停车场进出场算法。</p><p>2、临加班车可被删除，前提是还没有下发调度指令（即使下发失败）。</p><p class="font-red">注意：进出场班次必须按照起点站划分上下行，起点发出则上行，终点发出为下行，否则该班次将不会有发车时间。</p></div>'
+	,title: '2016年8月26号凌晨更新日志'
 }
 var lineCodes = '' //全部线路编码字符串，由data.js初始化
@@ -56,8 +56,6 @@ var _alone = (function(){
 			var type = schedule.xlDir==0?'up':'down';
 			calculateLineNo($('.pb-table[data-type='+type+']', tab)[0]);
-			if(!isBatch)
-				goToSch(schedule);
 		},
 		//刷新多个班次，刷新完数据再统一计算行号
 		refreshScheduleArray: function(array){
@@ -94,9 +92,12 @@ var _alone = (function(){
 					goToSch(schedule);
 			});
 		},
-		update2Table: function(xlBm, schedule){
+		//刷新上行和下行2个表格
+		update2Table: function(xlBm, cb){
 			//上行
 			$.get('/realSchedule/lineCode/' + xlBm, function(array){
+				_data.clearByLineCode(xlBm);
+				
 				//加入_data缓存
 				$.each(array, function(){
 					_data.pushSchedule(this);
@@ -114,13 +115,15 @@ var _alone = (function(){
 						//下行
 						tab.find('table[data-type=down] tbody').html(template('alone_plan_table_temp', {list: rs.down}))[0]
 				);
-				
 				//定位到指定的班次
-				goToSch(schedule);
+				//goToSch(schedule);
+				
+				cb && cb();
 			});
 		},
 		//重新计算行号
 		calculateLineNo: calculateLineNo
+		,goToSch:goToSch
 	}
 	//获取班次所在table
@@ -131,13 +134,16 @@ var _alone = (function(){
 	}
 	//定位到班次所在的行
-	function goToSch(sch){
+	function goToSch(sch, ignoreLock){
 		var table = getTableBySch(sch);
 		if(!table.is(":visible"))
 			return;
-		//表格被锁定
-		if(table.parents('.sch_table_panel').hasClass('lock'))
-			return;
+		
+		if(!ignoreLock){
+			//表格被锁定
+			if(table.parents('.sch_table_panel').hasClass('lock'))
+				return;
+		}
 		var currTr = table.find('tr[data-id='+sch.id+']')
 			,half = table.parents('._body').height() / 2
@@ -165,9 +171,9 @@ var _alone = (function(){
 	}
 	function splitDir(list){
-		/*list.sort(function(a, b){
-			return a.fcno - b.fcno;
-		});*/
+		list.sort(function(a, b){
+			return a.dfsjT - b.dfsjT;
+		});
 		var rs = {up: [], down: []};
 		$.each(list, function(){
 			if(this.xlDir == upCode)
@@ -82,12 +82,28 @@ var _data = (function(){
 			array.sort(fcsjSort);
 			return array;
 		},
+		//清理线路下班次
+		clearByLineCode: function(lineCode){
+			for(var id in schedules){
+				if(schedules[id].xlBm == lineCode){
+					schedules[id] = null;
+					delete schedules[id];
+				}
+			}
+			
+			lineLpMap[lineCode] = {};
+		},
 		//添加一个班次
 		pushSchedule: function(sch){
 			//附加信息
 			attachInfo(sch);
 			schedules[sch.id] = sch;
-			lineLpMap[sch.xlBm][sch.lpName].push(sch);
+			
+			var xl=sch.xlBm,lp=sch.lpName;
+			if(!lineLpMap[xl][lp])
+				lineLpMap[xl][lp] = [];
+			
+			lineLpMap[xl][lp].push(sch);
 		},
 		//更新班次信息
 		updateSchedule: function(sch){
@@ -388,7 +388,7 @@ var _menu = (function() {
 						  	if(rs.ts){
 						  		msg_ct('实发调整成功！');
 								//更新前端数据
-								//_alone.refreshScheduleArray(rs.ts);
+								_alone.refreshScheduleArray(rs.ts);
 							}
 					  });
 				  });
@@ -104,7 +104,7 @@
 <!-- 班次table -->
 <script id="alone_plan_table_temp" type="text/html">
 {{each list as item i}}
-	<tr data-id={{item.id}}>
+<tr data-id={{item.id}} class="{{if item.sflj}}linjia{{/if}}">
 	<td name="lineNo"></td>
 	<td data-name="lpName"><a href="javascript:;">{{item.lpName}}</a></td>
@@ -111,8 +111,10 @@ var playBack = (function() {
 	//添加进出站日志
 	function addInOutText(gps){
-		var info = gps.inout_stop_info
-			,date = moment(gps.ts).format('HH:mm.ss')
+		var info = gps.inout_stop_info;
+		if(!info)
+			return;
+		var date = moment(gps.ts).format('HH:mm.ss')
 			,clazz = info.inOut==1?'out':'in';
 		if(!info)
 			return;