update

潘钊
1 parent 99f4fec2
Showing 4 changed files with 24 additions and 10 deletions
src/main/java/com/bsth/StartCommand.java
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/keyboardListen.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
@@ -103,7 +103,7 @@ public class StartCommand implements CommandLineRunner{
 			 * 每15秒从数据库抓取到离站信息和班次匹配
 			 * （网关生成的到离站数据也是延迟批量入库，所以缩短该线程执行周期并不会提高 “实际到离站” 的实时性）
 			 */
-			//scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 15, 20, TimeUnit.SECONDS);
+			scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 15, 20, TimeUnit.SECONDS);
 			/**
 			 * 首个调度指令下发（2分钟运行一次）
@@ -69,7 +69,7 @@
         </div>
     </div>
     <div class="portlet-body" id="top-tabs-wrap" >
-		<ul class="nav nav-tabs" >
+		<ul class="nav nav-tabs top-nav" >
 			<li class="active">
 				<a href="#tab_home" data-toggle="tab" aria-expanded="false" style="padding: 10px 15px;"> 
 					<i class="fa fa-home"></i> 主页 
@@ -24,13 +24,20 @@ $(document.body).on(&#39;keydown&#39;, function(e){
 		  success: function(){
 			  createVehSearch($('#ctrlFSearchSelect'))
 			  	.on('change', function(){
-			  		var array = _data.findByCl($(this).val());
+			  		var nbbm = $(this).val();
+			  		var array = _data.findByCl(nbbm);
 			  		if(!array || array.length == 0)
 			  			layer.msg('没有找到相关班次信息！');
 			  		else{
+			  			var tab = $('#tab_line_' + array[0].xlBm);
+			  			//清除对应tab 的样式
+			  			$('.pb-table tr.selected', tab).removeClass('selected,dir_0,dir_1');
+			  			
+			  			//console.log(tab, array[0].xlBm, array);
 			  			var runingSch,nearestSch;
 			  			//当前时间戳，忽略毫秒
 			  			var t = Date.parse(new Date());
+			  			var sch;//要定位到的班次
 			  			$.each(array, function(){
 			  				//正在执行的班次
 			  				if(this.status == 1)
@@ -42,7 +49,7 @@ $(document.body).on(&#39;keydown&#39;, function(e){
 			  					nearestSch = this;
 			  				//高亮所有班次
-			  				$('.pb-table tr[data-id='+this.id+']').addClass('selected dir_' + this.xlDir);
+			  				$('.pb-table tr[data-id='+this.id+']', tab).addClass('selected dir_' + this.xlDir);
 			  			});
 			  			if(!sch)
@@ -50,7 +57,8 @@ $(document.body).on(&#39;keydown&#39;, function(e){
 			  			var delay;
 			  			//当前选中的选项卡
-			  			var activeTab = $('#top-tabs-wrap ul li.active a');
+			  			var activeTab = $('#top-tabs-wrap ul.top-nav li.active a');
+			  			
 			  			if(activeTab.data('id') == sch.xlBm){
 			  				//搜索的班次就在当前页面
 			  				delay = 0;
@@ -63,7 +71,6 @@ $(document.body).on(&#39;keydown&#39;, function(e){
 			  			}
 			  			setTimeout(function(){
-			  				$('.pb-table tr.selected').removeClass('selected');
 				  			var tr = $('tr[data-id='+sch.id+']', tab)
 				  						.addClass('selected search');
@@ -76,9 +83,16 @@ $(document.body).on(&#39;keydown&#39;, function(e){
 				  				$(this).removeClass('animated flash');
 				  			});
 			  			}, delay);
+			  			
+			  			msg_ct('高亮车辆 ' + nbbm);
 			  		}
 			  	}).select2("open");
 		  }
 		});
     }
+    
+    
+    function msg_ct(t){
+		layer.msg(t,{offset: 'ct', shift : 5});
+	}
 });
 \ No newline at end of file
@@ -287,7 +287,7 @@
    	 </div>
 	<hr>
 	<div class="form-custom-footer">
-		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
+		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;确&nbsp;定 </button>
 		<button type="button" class="btn layui-layer-close"> 取消 </button>
 	</div>
    </div>
@@ -365,7 +365,7 @@
 	<hr>
 	<div class="form-custom-footer">
-		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
+		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;确&nbsp;定 </button>
 		<button type="button" class="btn layui-layer-close"> 取消 </button>
 	</div>
 </form>
@@ -462,7 +462,7 @@
 	<hr>
 	<div class="form-custom-footer">
-		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
+		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;确&nbsp;定 </button>
 		<button type="button" class="btn layui-layer-close"> 取消 </button>
 	</div>
    </div>
@@ -511,7 +511,7 @@
    	 </div>
 	<hr>
 	<div class="form-custom-footer">
-		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
+		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;确&nbsp;定 </button>
 		<button type="button" class="btn layui-layer-close"> 取消 </button>
 	</div>
 </form>