潘钊 / bsth_control · Commits

Commit 99c56521d95f88bec593457203c73f37a6ac8a1e

Authored by 潘钊
1 parent d91fbcf1

update...

Inline Side-by-side
Showing 8 changed files with 99 additions and 34 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
  View file @99c5652
... ... @@ -482,7 +482,7 @@ public class InOutStationSignalHandle extends SignalHandle{
482 482 boolean limitPark = StringUtils.isNotEmpty(park);
483 483  
484 484  
485   - if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().equals(0))
  485 + if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().intValue()==0)
486 486 && (!limitPark || park.equals(next.getZdzCode()))) {
487 487  
488 488 next.setFcsjActualAll(sch.getZdsjActualTime());
... ...
src/main/resources/static/real_control_v2/css/main.css
  View file @99c5652
... ... @@ -1411,10 +1411,11 @@ ul.left_tabs_lg li{
1411 1411 border-bottom: none;
1412 1412 }
1413 1413  
1414   -.add_range_wrap>.err_panel{
1415   - font-size: 16px;
1416   - color: #a44a4a;
  1414 +.err_panel{
  1415 + font-size: 12px;
  1416 + color: #7e7d7d;
1417 1417 font-family: 微软雅黑;
  1418 + margin-top: 5px;
1418 1419 }
1419 1420  
1420 1421 #schedule-lp_change-modal .ct_table dl{
... ... @@ -1458,6 +1459,16 @@ ul.left_tabs_lg li{
1458 1459 background: #ffffff;
1459 1460 }
1460 1461  
  1462 +.sub_task_form_v2.service_form.temp_service:before{
  1463 + content: '营运 (临加)';
  1464 + color: #9C27B0;
  1465 + background: #ffffff;
  1466 +}
  1467 +
  1468 +.sub_task_form_v2.service_form.temp_service {
  1469 + background: #faf0fd;
  1470 +}
  1471 +
1461 1472 .sub_task_form_v2.empty_form:before{
1462 1473 content: '空驶';
1463 1474 color: #928f92;
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_custom.html
  View file @99c5652
... ... @@ -3,7 +3,7 @@
3 3 <span class="plus_icon_span">
4 4 <i class="uk-icon-plus"></i>
5 5 </span>
6   - <form class="uk-form remarks_form">
  6 +<!-- <form class="uk-form remarks_form">
7 7 <div class="uk-grid">
8 8 <div class="uk-width-1-1">
9 9 <div class="uk-form-row ct-stacked">
... ... @@ -14,7 +14,7 @@
14 14 </div>
15 15 </div>
16 16 </div>
17   - </form>
  17 + </form>-->
18 18 <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
19 19 <button type="button" class="uk-button uk-modal-close">取消</button>
20 20 <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
... ... @@ -76,7 +76,7 @@
76 76 e.preventDefault();
77 77  
78 78 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
79   - , {remarks: $('#form-s-t',wrap).val(), 'schedule.id': sch.id}));
  79 + , {/*remarks: $('#form-s-t',wrap).val(), */'schedule.id': sch.id}));
80 80 $(this).data('valid', true);
81 81  
82 82 if(allValidSuccess()){
... ... @@ -93,21 +93,21 @@
93 93 }
94 94 var data = dataArray[i];
95 95 //营运里程为0的不保存
96   - if(data.mileageType == 'service' && data.mileage==0){
  96 + /*if(data.mileageType == 'service' && data.mileage==0){
97 97 i++;
98 98 f();
99 99 }
100   - else{
  100 + else{*/
101 101 //营运子任务不写备注
102   - if(data.mileageType == 'service' && !data.destroy)
103   - data.remarks = '';
  102 + /*if(data.mileageType == 'service' && !data.destroy)
  103 + data.remarks = '';*/
104 104 gb_common.$post('/childTask', data, function (rs) {
105 105 notify_succ('子任务添加成功');
106 106 rst = rs.t;
107 107 i++;
108 108 f();
109 109 });
110   - }
  110 + //}
111 111 })();
112 112 }
113 113 });
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_in_out.html
  View file @99c5652
1 1 <div class="add_inOut_wrap">
2 2 <div class="forms"></div>
3   - <form class="uk-form remarks_form">
  3 +<!-- <form class="uk-form remarks_form">
4 4 <div class="uk-grid">
5 5 <div class="uk-width-1-1">
6 6 <div class="uk-form-row ct-stacked">
... ... @@ -11,7 +11,7 @@
11 11 </div>
12 12 </div>
13 13 </div>
14   - </form>
  14 + </form>-->
15 15 <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
16 16 <button type="button" class="uk-button uk-modal-close">取消</button>
17 17 <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
... ... @@ -276,7 +276,7 @@
276 276 e.preventDefault();
277 277  
278 278 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
279   - , {remarks: $('#form-s-t',wrap).val(), 'schedule.id': sch.id}));
  279 + , {/*remarks: $('#form-s-t',wrap).val(), */'schedule.id': sch.id}));
280 280 $(this).data('valid', true);
281 281  
282 282 if(allValidSuccess()){
... ... @@ -299,8 +299,8 @@
299 299 }
300 300 else{
301 301 //营运子任务不写备注
302   - if(data.mileageType == 'service' && !data.destroy)
303   - data.remarks = '';
  302 + /*if(data.mileageType == 'service' && !data.destroy)
  303 + data.remarks = '';*/
304 304 gb_common.$post('/childTask', data, function (rs) {
305 305 notify_succ('子任务添加成功');
306 306 rst = rs.t;
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_range_normal.html 0 → 100644
  View file @99c5652
  1 +<!-- 区间变全程 -->
  2 +<div class="add_range_2_normal">
  3 + <div class="err_panel">暂不开放使用</div>
  4 + <!--<div class="forms"></div>
  5 +
  6 + <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
  7 + <button type="button" class="uk-button uk-modal-close">取消</button>
  8 + <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
  9 + </div>
  10 + <script>
  11 + (function () {
  12 + var wrap = '#add-sub-task-main-modal .add_range_2_normal',
  13 + sch,f1,tf1;
  14 +
  15 + $(wrap).on('init', function (e, data) {
  16 + e.stopPropagation();
  17 + sch = data.sch;
  18 +
  19 + f1 = addTaskForm();
  20 + tf1 = addTaskForm();
  21 + tf1.addClass('temp_service');
  22 + });
  23 +
  24 + function addTaskForm() {
  25 + var htmlStr = template('sub-task-v2-form-temp', {sch: sch});
  26 + var f = $(htmlStr);
  27 + $('.forms', wrap).append(f);
  28 + //字典转换
  29 + dictionaryUtils.transformDom($('.nt-dictionary', f));
  30 +
  31 + //班次类型切换
  32 + $('select[name=type2]', f).trigger('change');
  33 +
  34 + //滚动条到底
  35 + $('.forms', wrap).scrollTop($('.forms', wrap)[0].scrollHeight);
  36 +
  37 + f.formValidation({
  38 + framework: 'uikit',
  39 + locale: 'zh_CN'
  40 + }).on('add_reason_field', function () {
  41 + $(this).formValidation('addField', 'reason');
  42 + });
  43 + return f;
  44 + }
  45 + })();
  46 + </script>-->
  47 +</div>
0 48 \ No newline at end of file
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_range_turn.html
  View file @99c5652
... ... @@ -30,7 +30,7 @@
30 30 </div>
31 31  
32 32 <div class="forms"></div>
33   - <form class="uk-form remarks_form">
  33 +<!-- <form class="uk-form remarks_form">
34 34 <div class="uk-grid">
35 35 <div class="uk-width-1-1">
36 36 <div class="uk-form-row ct-stacked">
... ... @@ -41,7 +41,7 @@
41 41 </div>
42 42 </div>
43 43 </div>
44   - </form>
  44 + </form>-->
45 45 <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
46 46 <button type="button" class="uk-button uk-modal-close">取消</button>
47 47 <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
... ... @@ -55,9 +55,9 @@
55 55 $(wrap).on('init', function (e, data) {
56 56 e.stopPropagation();
57 57 sch = data.sch;
58   - nextSch = gb_schedule_table.getNextNormalSch(sch);
59   - if(!nextSch || nextSch.bcType!='normal'){
60   - $(wrap).html('<div class="err_panel">无法做区间调头，原因是没有找到返程班次！</div>');
  58 + nextSch = gb_schedule_table.getNextSch(sch);
  59 + if(!nextSch || nextSch.bcType=='in' || nextSch.bcType=='out'){
  60 + $(wrap).html('<div class="err_panel">当前班次类型不支持直接应用区间调头模板！</div>');
61 61 return;
62 62 }
63 63  
... ... @@ -67,7 +67,7 @@
67 67 }), 'directions');
68 68 //第一段营运
69 69 f1 = addTaskForm();
70   - $f('startStation', f1).trigger('change');
  70 + $f('startStation', f1).val(sch.qdzCode).trigger('change');
71 71  
72 72 disabled_form(f1);
73 73 $('.domains', f1).empty();
... ... @@ -247,7 +247,7 @@
247 247 e.preventDefault();
248 248  
249 249 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
250   - , {remarks: $('#form-s-t',wrap).val()}));
  250 + /*, {remarks: $('#form-s-t',wrap).val()}*/));
251 251 $(this).data('valid', true);
252 252  
253 253 if (allValidSuccess()) {
... ... @@ -267,8 +267,8 @@
267 267 }
268 268 var data = dataArray[i];
269 269 //营运子任务不写备注
270   - if(data.mileageType == 'service' && !data.destroy)
271   - data.remarks = '';
  270 + /*if(data.mileageType == 'service' && !data.destroy)
  271 + data.remarks = '';*/
272 272 gb_common.$post('/childTask', data, function (rs) {
273 273 notify_succ('子任务添加成功');
274 274 gb_schedule_table.updateSchedule(rs.t);
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
  View file @99c5652
... ... @@ -10,7 +10,7 @@
10 10 <li name="normal"><a>1、子任务</a></li>
11 11 <li name="in_out"><a>2、进出场</a></li>
12 12 <li name="range_turn"><a>3、区间调头</a></li>
13   - <!--<li name="range_to_normal"><a>4、区间变全程</a></li>-->
  13 + <li name="range_to_normal"><a>4、区间变全程</a></li>
14 14 </ul>
15 15 </div>
16 16 <div class="uk-width-8-10">
... ... @@ -18,7 +18,7 @@
18 18 <li class="tab_cont normalCont"></li>
19 19 <li class="tab_cont inOutCont"></li>
20 20 <li class="tab_cont rangeTurnCont"></li>
21   - <!--<li class="tab_cont rangeToNormal"></li>-->
  21 + <li class="tab_cont rangeToNormal"></li>
22 22 </ul>
23 23 </div>
24 24 </div>
... ... @@ -95,10 +95,12 @@
95 95 </div>
96 96 <div class="uk-width-1-3">
97 97 <div class="uk-form-row">
98   - <label class="uk-form-label">公里数</label>
  98 + <label class="uk-form-label">公里</label>
99 99 <div class="uk-form-controls">
100 100 <input class="form-control" name="mileage" max=222 data-fv-lessthan-inclusive="false"
101   - required>
  101 + required style="width: 42%;">
  102 + <select class="form-control nt-dictionary" required name="mileageType"
  103 + data-group="MileageType" style="width: 52%;"></select>
102 104 </div>
103 105 </div>
104 106 </div>
... ... @@ -108,10 +110,10 @@
108 110 <div class="uk-width-2-3 domains"></div>
109 111 <div class="uk-width-1-3">
110 112 <div class="uk-form-row">
111   - <label class="uk-form-label">里程类型</label>
  113 + <label class="uk-form-label">备注</label>
112 114 <div class="uk-form-controls">
113   - <select class="form-control nt-dictionary" required name="mileageType"
114   - data-group="MileageType"></select>
  115 + <!--<select class="form-control nt-dictionary" required name="remarks"></select>-->
  116 + <input class="form-control" name="remarks" data-fv-stringlength-max="50" data-fv-stringlength="true">
115 117 </div>
116 118 </div>
117 119 </div>
... ... @@ -245,6 +247,8 @@
245 247 $('.rangeTurnCont', modal).html(st_doms.range_dom);
246 248 $('.add_range_wrap', modal).trigger('init', data);
247 249 //区间变全程
  250 + $('.rangeToNormal', modal).html(st_doms.range_2_normal_dom);
  251 + //$('.add_range_2_normal', modal).trigger('init', data);
248 252 }
249 253 });
250 254  
... ... @@ -505,7 +509,7 @@
505 509 }
506 510 else {
507 511 var cont = f.parents('li.tab_cont'),
508   - remInput = $('.remarks_form [name=remarks]', cont);
  512 + remInput = $('[name=remarks]', cont);
509 513  
510 514 if(remInput.val()==reason + ',')
511 515 return;
... ...
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
  View file @99c5652
... ... @@ -19,6 +19,9 @@ var gb_schedule_context_menu = (function () {
19 19 $.get(folder + '/sub_task_v2/add_range_turn.html', function (dom) {
20 20 st_doms.range_dom=dom;
21 21 });
  22 + $.get(folder + '/sub_task_v2/add_range_normal.html', function (dom) {
  23 + st_doms.range_2_normal_dom=dom;
  24 + });
22 25 //提前缓存临加的片段页面
23 26 var add_sch_doms={};
24 27 $.get(folder + '/temp_sch/add_normal.html', function (dom) {
... ...