潘钊 / bsth_control · Commits

Commit 6d35011e35e000aa2c5f893e8276b2be2d8582dc

Authored by 潘钊
1 parent ee48439a
build: skipped

update...

Inline Side-by-side
Showing 9 changed files with 45 additions and 202 deletions
src/main/java/com/bsth/XDApplication.java
  View file @6d35011
... ... @@ -88,14 +88,14 @@ public class XDApplication implements CommandLineRunner {
88 88 ScheduledExecutorService sexec = Application.mainServices;
89 89 //抓取GPS数据
90 90 gpsDataLoader.setFlag(-1);
91   - sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
  91 + //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
92 92 //实际排班更新线程
93   - sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
  93 + //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
94 94 //实际排班延迟入库线程
95   - sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
  95 + //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
96 96  
97 97 //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
98   - sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
  98 + //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
99 99 }
100 100  
101 101 public void prodInit(){
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/badge_tooltip.html
  View file @6d35011
... ... @@ -65,7 +65,7 @@
65 65 <script id="sch-table-ldks-tootip-temp" type="text/html">
66 66 <div class="tl-tip-panel">
67 67 <div style="font-size: 13px;">
68   - {{qdzName}} 至 {{zdzName}}
  68 + {{qdzName}} 空驶至 {{zdzName}}
69 69 </div>
70 70 </div>
71 71 </script>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
  View file @6d35011
... ... @@ -100,7 +100,7 @@
100 100 {{else if sch.bcType == "region"}}
101 101 <span class="uk-badge">区间</span>
102 102 {{else if sch.bcType == "ldks"}}
103   - <span class="uk-badge sch_ldks">空2</span>
  103 + <span class="uk-badge sch_ldks">空驶</span>
104 104 {{/if}}
105 105 {{if sch.sflj}}
106 106 <span class="uk-badge uk-badge-danger">临加</span>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
  View file @6d35011
... ... @@ -75,7 +75,7 @@
75 75 {{else if sch.bcType == "region"}}
76 76 <span class="uk-badge sch_region">区间</span>
77 77 {{else if sch.bcType == "ldks"}}
78   - <span class="uk-badge sch_ldks">空2</span>
  78 + <span class="uk-badge sch_ldks">空驶</span>
79 79 {{/if}}
80 80 {{if sch.sflj}}
81 81 <span class="uk-badge uk-badge-danger">临加</span>
... ... @@ -128,8 +128,8 @@
128 128 <span class="uk-badge uk-badge-danger">放站</span>
129 129 {{else if bcType == "region"}}
130 130 <span class="uk-badge sch_region">区间</span>
131   - {{else if sch.bcType == "ldks"}}
132   - <span class="uk-badge uk-badge-notification sch_ldks">空2</span>
  131 + {{else if bcType == "ldks"}}
  132 + <span class="uk-badge uk-badge-notification sch_ldks">空驶</span>
133 133 {{/if}}
134 134 {{if sflj}}
135 135 <span class="uk-badge uk-badge-danger">临加</span>
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/edit.html deleted 100644 → 0
  View file @ee48439
1   -<div class="uk-modal ct-form-modal ct_move_modal" id="history-sch-edit-modal">
2   - <div class="uk-modal-dialog" style="width: 900px;">
3   - <a href="" class="uk-modal-close uk-close"></a>
4   - <div class="uk-modal-header">
5   - <h2>历史班次编辑</h2></div>
6   - <form class="uk-form uk-form-horizontal">
7   - </form>
8   - </div>
9   -
10   - <script id="history-sch-edit-form-temp" type="text/html">
11   - <input type="hidden" name="id" value="{{id}}"/>
12   -
13   - <div class="uk-grid">
14   - <div class="uk-width-1-3">
15   - <div class="uk-form-row">
16   - <label class="uk-form-label" >班次类型</label>
17   - <div class="uk-form-controls">
18   - <select class="form-control nt-dictionary" disabled data-code="{{bcType}}" name="bcType" data-group=ScheduleType></select>
19   - </div>
20   - </div>
21   - </div>
22   - <div class="uk-width-1-3">
23   - <div class="uk-form-row">
24   - <label class="uk-form-label" >起点</label>
25   - <div class="uk-form-controls">
26   - <input type="text" value="{{qdzName}}" disabled>
27   - </div>
28   - </div>
29   - </div>
30   - <div class="uk-width-1-3">
31   - <div class="uk-form-row">
32   - <label class="uk-form-label" >终点</label>
33   - <div class="uk-form-controls">
34   - <input type="text" value="{{zdzName}}" disabled>
35   - </div>
36   - </div>
37   - </div>
38   - </div>
39   -
40   - <div class="uk-grid">
41   - <div class="uk-width-1-3">
42   - <div class="uk-form-row">
43   - <label class="uk-form-label" >车辆</label>
44   - <div class="uk-form-controls">
45   - <div class="uk-autocomplete uk-form car-autocom">
46   - <input type="text" value="{{clZbh}}" name="clZbh" required>
47   - </div>
48   - </div>
49   - </div>
50   - </div>
51   - <div class="uk-width-1-3">
52   - <div class="uk-form-row">
53   - <label class="uk-form-label" >驾驶员</label>
54   - <div class="uk-form-controls">
55   - <div class="uk-autocomplete uk-form jsy-autocom">
56   - <input type="text" value="{{jGh}}/{{jName}}" name="jsy" required>
57   - </div>
58   - </div>
59   - </div>
60   - </div>
61   - </div>
62   -
63   - <div class="uk-grid">
64   - <div class="uk-width-1-3">
65   - <div class="uk-form-row">
66   - <label class="uk-form-label" >计发</label>
67   - <div class="uk-form-controls">
68   - <input type="text" value="{{fcsj}}" disabled>
69   - </div>
70   - </div>
71   - </div>
72   - <div class="uk-width-1-3">
73   - <div class="uk-form-row">
74   - <label class="uk-form-label" >待发</label>
75   - <div class="uk-form-controls">
76   - <input type="text" name="dfsj" value="{{dfsj}}" required>
77   - </div>
78   - </div>
79   - </div>
80   - <div class="uk-width-1-3">
81   - <div class="uk-form-row">
82   - <label class="uk-form-label" >实发</label>
83   - <div class="uk-form-controls">
84   - <input type="text" name="fcsjActual" value="{{fcsjActual}}" >
85   - </div>
86   - </div>
87   - </div>
88   - </div>
89   -
90   - <div class="uk-grid">
91   - <div class="uk-width-1-3">
92   - <div class="uk-form-row">
93   - <label class="uk-form-label" >计划里程</label>
94   - <div class="uk-form-controls">
95   - <input type="text" value="{{jhlc}}" disabled>
96   - </div>
97   - </div>
98   - </div>
99   - <div class="uk-width-1-3">
100   - <div class="uk-form-row">
101   - <label class="uk-form-label" >计划终点</label>
102   - <div class="uk-form-controls">
103   - <input type="text" value="{{zdsj}}" disabled>
104   - </div>
105   - </div>
106   - </div>
107   - <div class="uk-width-1-3">
108   - <div class="uk-form-row">
109   - <label class="uk-form-label" >实际终点</label>
110   - <div class="uk-form-controls">
111   - <input type="text" name="zdsjActual" value="{{zdsjActual}}" >
112   - </div>
113   - </div>
114   - </div>
115   - </div>
116   -
117   - <div class="uk-grid">
118   - <div class="uk-width-1-1">
119   - <div class="uk-form-row ct-stacked">
120   - <label class="uk-form-label" >备注</label>
121   - <div class="uk-form-controls" style="margin-top: 5px;">
122   - <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="100" placeholder="备注">{{remarks}}</textarea>
123   - </div>
124   - </div>
125   - </div>
126   - </div>
127   - <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
128   - <button type="button" class="uk-button uk-modal-close">取消</button>
129   - <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
130   - </div>
131   - </script>
132   -
133   - <script>
134   - (function() {
135   - var modal = '#history-sch-edit-modal'
136   - ,sch,parentModal;
137   - $(modal).on('init', function(e, data) {
138   - var id = data.id;
139   - parentModal=data.parentModal;
140   -
141   - $.get('/realSchedule/'+id, function (sch) {
142   - var htmlStr = template('history-sch-edit-form-temp', sch);
143   - $('form', modal).html(htmlStr);
144   -
145   - //字典转换
146   - dictionaryUtils.transformDom($('.nt-dictionary', modal));
147   -
148   - //----------- Autocomplete --------------
149   - $.get('/basic/cars', function(rs) {
150   - //车辆
151   - gb_common.carAutocomplete($('.car-autocom', modal), rs);
152   - });
153   - $.get('/basic/all_personnel', function(rs) {
154   - //驾驶员
155   - gb_common.personAutocomplete($('.jsy-autocom', modal), rs);
156   - //售票员
157   - gb_common.personAutocomplete($('.spy-autocom', modal), rs);
158   - });
159   -
160   -
161   - //submit
162   - var f = $('form', modal).formValidation(gb_form_validation_opts);
163   - f.on('success.form.fv', function(e) {
164   - e.preventDefault();
165   - var data = $(this).serializeJSON();
166   -
167   - //拆分驾驶员工号和姓名
168   - data.jGh = data.jsy.split('/')[0];
169   - data.jName = data.jsy.split('/')[1];
170   - delete data.jsy;
171   - //拆分售票员工号和姓名
172   - if(data.sGh != null){
173   - data.sGh = data.spy.split('/')[0];
174   - data.sName = data.spy.split('/')[1];
175   - delete data.spy;
176   - }
177   -
178   - gb_common.$post('/realSchedule/history', data, function (rs) {
179   - //console.log(rs);
180   - UIkit.modal(modal).hide();
181   - $(parentModal).trigger('refresh');
182   - });
183   - });
184   - });
185   - });
186   - })();
187   - </script>
188   -</div>
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
  View file @6d35011
... ... @@ -86,6 +86,8 @@
86 86 <span class="uk-badge uk-badge-danger">放站</span>
87 87 {{else if sch.bcType == "region"}}
88 88 <span class="uk-badge sch_region">区间</span>
  89 + {{else if sch.bcType == "ldks"}}
  90 + <span class="uk-badge sch_ldks">空驶</span>
89 91 {{/if}}
90 92 {{if sch.sflj}}
91 93 <span class="uk-badge uk-badge-danger">临加</span>
... ...
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
  View file @6d35011
... ... @@ -55,7 +55,7 @@
55 55 </li>
56 56 {{/each}}
57 57 </ul>
58   - <a class="uk-navbar-brand op-beijingtime-time" title="每次秒数到0与服务器同步一次，睡眠状态唤醒会短暂异常，可鼠标右击横幅任意区域立刻同步！">
  58 + <a class="uk-navbar-brand op-beijingtime-time" >
59 59 <span></span>
60 60 </a>
61 61 <div class="uk-navbar-content uk-navbar-flip uk-hidden-small" style="padding-left: 0;">
... ...
src/main/resources/static/real_control_v2/js/line_schedule/badge_tooltip.js
  View file @6d35011
... ... @@ -124,7 +124,6 @@ var gb_schedule_badge_tootip = (function () {
124 124 $(this).qtip({
125 125 show: _opts.show,
126 126 content: {
127   - title:'两点间空驶',
128 127 text: function() {
129 128 return temps['sch-table-ldks-tootip-temp'](getSch(this));
130 129 }
... ...
src/main/resources/static/real_control_v2/js/north/second_timer.js
  View file @6d35011
... ... @@ -19,7 +19,7 @@ var gb_second_timer = (function () {
19 19 setTime();
20 20  
21 21 secondTimer = window.setInterval(function () {
22   - if(0 == now.getSeconds() || true == contextFlag){
  22 + if (0 == now.getSeconds() || true == contextFlag) {
23 23 minuteTimer();
24 24 contextFlag = false;
25 25 }
... ... @@ -48,7 +48,7 @@ var gb_second_timer = (function () {
48 48 })
49 49 };
50 50  
51   - var timeFormat = function(str) {
  51 + var timeFormat = function (str) {
52 52 return ("0" + str).slice(-2)
53 53 };
54 54  
... ... @@ -57,11 +57,41 @@ var gb_second_timer = (function () {
57 57 };
58 58  
59 59 var minuteTimer = function () {
60   - getServerTime(function(time) {
  60 + getServerTime(function (time) {
61 61 now = time;
62 62 setTime()
63 63 })
64 64 };
65 65  
66 66 window.setTimeout(init, 6000);
  67 +
  68 +/* $(document).on('mouseenter', '.op-beijingtime-time', function () {
  69 + $(this).qtip({
  70 + show: {ready: true, delay: 300},
  71 + content: {
  72 + text: function () {
  73 + return '<div class="tl-tip-panel">' +
  74 + '<div style="font-size: 13px;">' +
  75 + '每次秒数到0与服务器同步一次<br>服务器每10分钟与国家授时中心标准时间同步一次<br>睡眠状态唤醒会短暂异常，可鼠标右击横幅任意区域立刻同步' +
  76 + '</div>' +
  77 + '</div>';
  78 + }
  79 + },
  80 + position: {
  81 + viewport: $(window),
  82 + my: 'top center',
  83 + at: 'bottom center'
  84 + },
  85 + style: {
  86 + classes: 'qtip-shadow qtip-tipped sch-badge-tip'
  87 + },
  88 + hide: {fixed: true, delay: 300},
  89 + events: {
  90 + hidden: function(event, api) {
  91 + //destroy dom
  92 + $(this).qtip('destroy', true);
  93 + }
  94 + }
  95 + });
  96 + });*/
67 97 })();
68 98 \ No newline at end of file
... ...