潘钊 / bsth_control · Commits

Commit a327fcf17b69303b36aa6a1e0337a05743e2bfb0

Authored by 潘钊
1 parent 99f4fec2
build: skipped

update

Inline Side-by-side
Showing 4 changed files with 24 additions and 10 deletions
src/main/java/com/bsth/StartCommand.java
  View file @a327fcf
... ... @@ -103,7 +103,7 @@ public class StartCommand implements CommandLineRunner{
103 103 * 每15秒从数据库抓取到离站信息和班次匹配
104 104 * （网关生成的到离站数据也是延迟批量入库，所以缩短该线程执行周期并不会提高 “实际到离站” 的实时性）
105 105 */
106   - //scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 15, 20, TimeUnit.SECONDS);
  106 + scheduler.scheduleWithFixedDelay(gpsArrivalStationThread, 15, 20, TimeUnit.SECONDS);
107 107  
108 108 /**
109 109 * 首个调度指令下发（2分钟运行一次）
... ...
src/main/resources/static/pages/control/line/index.html
  View file @a327fcf
... ... @@ -69,7 +69,7 @@
69 69 </div>
70 70 </div>
71 71 <div class="portlet-body" id="top-tabs-wrap" >
72   - <ul class="nav nav-tabs" >
  72 + <ul class="nav nav-tabs top-nav" >
73 73 <li class="active">
74 74 <a href="#tab_home" data-toggle="tab" aria-expanded="false" style="padding: 10px 15px;">
75 75 <i class="fa fa-home"></i> 主页
... ...
src/main/resources/static/pages/control/line/js/keyboardListen.js
  View file @a327fcf
... ... @@ -24,13 +24,20 @@ $(document.body).on(&#39;keydown&#39;, function(e){
24 24 success: function(){
25 25 createVehSearch($('#ctrlFSearchSelect'))
26 26 .on('change', function(){
27   - var array = _data.findByCl($(this).val());
  27 + var nbbm = $(this).val();
  28 + var array = _data.findByCl(nbbm);
28 29 if(!array || array.length == 0)
29 30 layer.msg('没有找到相关班次信息！');
30 31 else{
  32 + var tab = $('#tab_line_' + array[0].xlBm);
  33 + //清除对应tab 的样式
  34 + $('.pb-table tr.selected', tab).removeClass('selected,dir_0,dir_1');
  35 +
  36 + //console.log(tab, array[0].xlBm, array);
31 37 var runingSch,nearestSch;
32 38 //当前时间戳，忽略毫秒
33 39 var t = Date.parse(new Date());
  40 + var sch;//要定位到的班次
34 41 $.each(array, function(){
35 42 //正在执行的班次
36 43 if(this.status == 1)
... ... @@ -42,7 +49,7 @@ $(document.body).on(&#39;keydown&#39;, function(e){
42 49 nearestSch = this;
43 50  
44 51 //高亮所有班次
45   - $('.pb-table tr[data-id='+this.id+']').addClass('selected dir_' + this.xlDir);
  52 + $('.pb-table tr[data-id='+this.id+']', tab).addClass('selected dir_' + this.xlDir);
46 53 });
47 54  
48 55 if(!sch)
... ... @@ -50,7 +57,8 @@ $(document.body).on(&#39;keydown&#39;, function(e){
50 57  
51 58 var delay;
52 59 //当前选中的选项卡
53   - var activeTab = $('#top-tabs-wrap ul li.active a');
  60 + var activeTab = $('#top-tabs-wrap ul.top-nav li.active a');
  61 +
54 62 if(activeTab.data('id') == sch.xlBm){
55 63 //搜索的班次就在当前页面
56 64 delay = 0;
... ... @@ -63,7 +71,6 @@ $(document.body).on(&#39;keydown&#39;, function(e){
63 71 }
64 72  
65 73 setTimeout(function(){
66   - $('.pb-table tr.selected').removeClass('selected');
67 74 var tr = $('tr[data-id='+sch.id+']', tab)
68 75 .addClass('selected search');
69 76  
... ... @@ -76,9 +83,16 @@ $(document.body).on(&#39;keydown&#39;, function(e){
76 83 $(this).removeClass('animated flash');
77 84 });
78 85 }, delay);
  86 +
  87 + msg_ct('高亮车辆 ' + nbbm);
79 88 }
80 89 }).select2("open");
81 90 }
82 91 });
83 92 }
  93 +
  94 +
  95 + function msg_ct(t){
  96 + layer.msg(t,{offset: 'ct', shift : 5});
  97 + }
84 98 });
85 99 \ No newline at end of file
... ...
src/main/resources/static/pages/control/line/temps/alone_tp.html
  View file @a327fcf
... ... @@ -287,7 +287,7 @@
287 287 </div>
288 288 <hr>
289 289 <div class="form-custom-footer">
290   - <button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
  290 + <button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;确&nbsp;定 </button>
291 291 <button type="button" class="btn layui-layer-close"> 取消 </button>
292 292 </div>
293 293 </div>
... ... @@ -365,7 +365,7 @@
365 365  
366 366 <hr>
367 367 <div class="form-custom-footer">
368   - <button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
  368 + <button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;确&nbsp;定 </button>
369 369 <button type="button" class="btn layui-layer-close"> 取消 </button>
370 370 </div>
371 371 </form>
... ... @@ -462,7 +462,7 @@
462 462  
463 463 <hr>
464 464 <div class="form-custom-footer">
465   - <button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
  465 + <button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;确&nbsp;定 </button>
466 466 <button type="button" class="btn layui-layer-close"> 取消 </button>
467 467 </div>
468 468 </div>
... ... @@ -511,7 +511,7 @@
511 511 </div>
512 512 <hr>
513 513 <div class="form-custom-footer">
514   - <button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
  514 + <button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;确&nbsp;定 </button>
515 515 <button type="button" class="btn layui-layer-close"> 取消 </button>
516 516 </div>
517 517 </form>
... ...