潘钊 / bsth_control · Commits

Commit 67553852e88f9955561be351a8f628e0acea57a5

Authored by 潘钊
1 parent 74811c7f

update...

Inline Side-by-side
Showing 21 changed files with 138 additions and 189 deletions
src/main/resources/static/real_control_v2/css/line_schedule.css
  View file @6755385
... ... @@ -114,15 +114,15 @@
114 114 }
115 115  
116 116 .line-schedule-table dl dt:nth-of-type(7), .line-schedule-table dl dd:nth-of-type(7) {
117   - width: 10%;
  117 + width: calc(10% + 10px);
118 118 }
119 119  
120 120 .line-schedule-table dl dt:nth-of-type(8), .line-schedule-table dl dd:nth-of-type(8) {
121   - width: calc(51% - 238px);
  121 + width: calc(51% - 233px);
122 122 }
123 123  
124 124 .line-schedule-table dl dt:nth-of-type(9), .line-schedule-table dl dd:nth-of-type(9) {
125   - width: 70px;
  125 + width: 65px;
126 126 border-right: 0;
127 127 }
128 128  
... ...
src/main/resources/static/real_control_v2/css/modal_extend.css
  View file @6755385
1   -.uk-modal{
  1 +.uk-modal.ct_move_modal{
2 2 background: rgba(0,0,0,.4) !important;
3 3 }
4 4  
5   -.uk-modal-dialog{
  5 +.uk-modal.ct_move_modal .uk-modal-dialog{
6 6 border: 1px solid #dd6952;
7 7  
8 8 position: absolute !important;
9 9 margin: 0 !important;
10 10 }
11 11  
12   -.uk-modal-dialog.uk-modal-dialog-blank{
  12 +.uk-modal.ct_move_modal .uk-modal-dialog.uk-modal-dialog-blank{
13 13 border: none !important;
14 14 }
15 15  
16   -.uk-modal-header{
  16 +.uk-modal.ct_move_modal .uk-modal-header{
17 17 cursor: move;
18 18 user-select: none;
19 19 }
20 20 \ No newline at end of file
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="schedule-addsch-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch-modal">
2 2 <div class="uk-modal-dialog">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="schedule-dftz-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-dftz-modal">
2 2 <div class="uk-modal-dialog">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="schedule-fcxxwt-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-fcxxwt-modal">
2 2 <div class="uk-modal-dialog">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/jhlb.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="schedule-jhlb-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-jhlb-modal">
2 2 <div class="uk-modal-dialog" style="width: 370px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="schedule-lj_zrw-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-lj_zrw-modal">
2 2 <div class="uk-modal-dialog" style="width: 930px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ... @@ -270,7 +270,7 @@
270 270 if (sum != sch.jhlcOrig) {
271 271 if (i > 1)
272 272 calcs += ('=' + sum);
273   - calcs += (' ≠ ' + sch.jhlc);
  273 + calcs += (' ≠ ' + sch.jhlcOrig);
274 274 calcs = calcs.substr(3);
275 275 var htmlStr = template('sub_task-fail-status-temp', {calcs: calcs});
276 276 $('#childTaskTitle', modal).append(htmlStr);
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lp_change.html
  View file @6755385
1   -<div class="uk-modal" id="schedule-lp_change-modal">
  1 +<div class="uk-modal ct_move_modal" id="schedule-lp_change-modal">
2 2 <div class="uk-modal-dialog" style="width: 1240px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/multi_dftz.html
  View file @6755385
1   -<div class="uk-modal" id="schedule-multi-dftz-modal">
  1 +<div class="uk-modal ct_move_modal" id="schedule-multi-dftz-modal">
2 2 <div class="uk-modal-dialog" style="width: 710px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/multi_tzrc.html
  View file @6755385
1   -<div class="uk-modal" id="schedule-multi-tzrc-modal">
  1 +<div class="uk-modal ct_move_modal" id="schedule-multi-tzrc-modal">
2 2 <div class="drag-container"></div>
3 3 <div class="uk-modal-dialog" style="width: 860px;">
4 4 <a href="" class="uk-modal-close uk-close"></a>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="schedule-sftz-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-sftz-modal">
2 2 <div class="uk-modal-dialog" style="width: 350px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_inpark.html
  View file @6755385
1   -<div class="uk-modal" id="add-sub-task-inpark-modal">
  1 +<div class="uk-modal ct_move_modal" id="add-sub-task-inpark-modal">
2 2 <div class="uk-modal-dialog">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ... @@ -476,7 +476,7 @@
476 476 $('input[name=mileage]', serviceForm).val(sMileage);
477 477  
478 478 //营运结束时间
479   - var et = sch.dfsjT + (parseInt(sMileage / sch.jhlc * sch.bcsj) * 60 * 1000)
  479 + var et = sch.dfsjT + (parseInt(sMileage / sch.jhlcOrig * sch.bcsj) * 60 * 1000)
480 480 ,ets = et > sch.zdsjT?sch.zdsj:moment(et).format('HH:mm');
481 481 $('input[name=endDate]', serviceForm).val(ets);
482 482  
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_oil.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="schedule-addsch_oil-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-addsch_oil-modal">
2 2 <div class="uk-modal-dialog" style="width: 1201px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_other.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="add-sub-task-other-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="add-sub-task-other-modal">
2 2 <div class="uk-modal-dialog" style="width: 635px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_outpark.html
  View file @6755385
1   -<div class="uk-modal" id="add-sub-task-inpark-modal">
  1 +<div class="uk-modal ct_move_modal" id="add-sub-task-inpark-modal">
2 2 <div class="uk-modal-dialog">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_range_turn.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="add-sub-task-range_turn-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="add-sub-task-range_turn-modal">
2 2 <div class="uk-modal-dialog" style="width: 1200px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/oil_station.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="oil_station-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="oil_station-modal">
2 2 <div class="uk-modal-dialog" style="width: 450px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/tzrc.html
  View file @6755385
1   -<div class="uk-modal ct-form-modal" id="schedule-tzrc-modal">
  1 +<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-tzrc-modal">
2 2 <div class="uk-modal-dialog" style="width: 680px;">
3 3 <a href="" class="uk-modal-close uk-close"></a>
4 4 <div class="uk-modal-header">
... ...
src/main/resources/static/real_control_v2/js/modal_extend.js
  View file @6755385
... ... @@ -3,13 +3,14 @@ $(document).on(&#39;hide.uk.modal&#39;, &#39;.uk-modal&#39;, function () {
3 3 $(this).remove();
4 4 });
5 5  
6   -$(document).on('show.uk.modal', '.uk-modal', function () {
  6 +$(document).on('show.uk.modal', '.uk-modal.ct_move_modal', function () {
7 7 if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-blank'))
8 8 return;
9 9  
10   - //临时放过g'ji轨迹回放
  10 +/* //临时放过轨迹回放
11 11 if($(this).attr('id')=='map-playback-modal')
12   - return;
  12 + return;*/
  13 +
13 14 //计算居中位置
14 15 var win = $('body');
15 16 var Y = (win.width() - $('.uk-modal-dialog', this).width()) / 2 - 10;
... ... @@ -19,7 +20,7 @@ $(document).on(&#39;show.uk.modal&#39;, &#39;.uk-modal&#39;, function () {
19 20 var show_modal = function (id, dom) {
20 21 $(document.body).append(dom);
21 22 return UIkit.modal(id, {
22   - bgclose: false
  23 + bgclose: false, modal: false
23 24 }).show();
24 25 };
25 26  
... ... @@ -39,7 +40,8 @@ var open_modal_dom = function (dom, data, opt) {
39 40 $(document.body).append(dom);
40 41 UIkit.modal(id, opt).show();
41 42 //move
42   - modal_move($('.uk-modal-header',id));
  43 + if($(id).hasClass('ct_move_modal'))
  44 + modal_move($('.uk-modal-header',id));
43 45  
44 46 if (data)
45 47 $(id).trigger('init', data);
... ... @@ -64,7 +66,6 @@ var modal_move = function (m_header) {
64 66 });
65 67  
66 68 $(m_header).parents('.uk-modal').mousemove(function (e) {
67   - e.preventDefault();
68 69 if(!_moveFlag || !_moveObj)
69 70 return;
70 71  
... ...
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
  View file @6755385
... ... @@ -245,154 +245,6 @@
245 245 </dl>
246 246 </div>
247 247 <div class="ct_table_body">
248   - <dl>
249   - <dd>金桥路朴珊德拉</dd>
250   - <dd>05:02.4</dd>
251   - <dd>05:04.6</dd>
252   - <dd>5</dd>
253   - <dd>12</dd>
254   - </dl>
255   - <dl>
256   - <dd>金桥路朴珊德拉</dd>
257   - <dd>05:02.4</dd>
258   - <dd>05:04.6</dd>
259   - <dd>5</dd>
260   - <dd>12</dd>
261   - </dl>
262   - <dl>
263   - <dd>金桥路朴珊德拉</dd>
264   - <dd>05:02.4</dd>
265   - <dd>05:04.6</dd>
266   - <dd>5</dd>
267   - <dd>12</dd>
268   - </dl>
269   - <dl>
270   - <dd>金桥路朴珊德拉</dd>
271   - <dd>05:02.4</dd>
272   - <dd>05:04.6</dd>
273   - <dd>5</dd>
274   - <dd>12</dd>
275   - </dl>
276   - <dl>
277   - <dd>金桥路朴珊德拉</dd>
278   - <dd>05:02.4</dd>
279   - <dd>05:04.6</dd>
280   - <dd>5</dd>
281   - <dd>12</dd>
282   - </dl>
283   - <dl>
284   - <dd>金桥路朴珊德拉</dd>
285   - <dd>05:02.4</dd>
286   - <dd>05:04.6</dd>
287   - <dd>5</dd>
288   - <dd>12</dd>
289   - </dl>
290   - <dl>
291   - <dd>金桥路朴珊德拉</dd>
292   - <dd>05:02.4</dd>
293   - <dd>05:04.6</dd>
294   - <dd>5</dd>
295   - <dd>12</dd>
296   - </dl>
297   - <dl>
298   - <dd>金桥路朴珊德拉</dd>
299   - <dd>05:02.4</dd>
300   - <dd>05:04.6</dd>
301   - <dd>5</dd>
302   - <dd>12</dd>
303   - </dl>
304   - <dl>
305   - <dd>金桥路朴珊德拉</dd>
306   - <dd>05:02.4</dd>
307   - <dd>05:04.6</dd>
308   - <dd>5</dd>
309   - <dd>12</dd>
310   - </dl>
311   - <dl>
312   - <dd>金桥路朴珊德拉</dd>
313   - <dd>05:02.4</dd>
314   - <dd>05:04.6</dd>
315   - <dd>5</dd>
316   - <dd>12</dd>
317   - </dl>
318   - <dl>
319   - <dd>金桥路朴珊德拉</dd>
320   - <dd>05:02.4</dd>
321   - <dd>05:04.6</dd>
322   - <dd>5</dd>
323   - <dd>12</dd>
324   - </dl>
325   - <dl>
326   - <dd>金桥路朴珊德拉</dd>
327   - <dd>05:02.4</dd>
328   - <dd>05:04.6</dd>
329   - <dd>5</dd>
330   - <dd>12</dd>
331   - </dl>
332   - <dl>
333   - <dd>金桥路朴珊德拉</dd>
334   - <dd>05:02.4</dd>
335   - <dd>05:04.6</dd>
336   - <dd>5</dd>
337   - <dd>12</dd>
338   - </dl>
339   - <dl>
340   - <dd>金桥路朴珊德拉</dd>
341   - <dd>05:02.4</dd>
342   - <dd>05:04.6</dd>
343   - <dd>5</dd>
344   - <dd>12</dd>
345   - </dl>
346   - <dl>
347   - <dd>金桥路朴珊德拉</dd>
348   - <dd>05:02.4</dd>
349   - <dd>05:04.6</dd>
350   - <dd>5</dd>
351   - <dd>12</dd>
352   - </dl>
353   - <dl>
354   - <dd>金桥路朴珊德拉</dd>
355   - <dd>05:02.4</dd>
356   - <dd>05:04.6</dd>
357   - <dd>5</dd>
358   - <dd>12</dd>
359   - </dl>
360   - <dl>
361   - <dd>金桥路朴珊德拉</dd>
362   - <dd>05:02.4</dd>
363   - <dd>05:04.6</dd>
364   - <dd>5</dd>
365   - <dd>12</dd>
366   - </dl>
367   - <dl>
368   - <dd>金桥路朴珊德拉</dd>
369   - <dd>05:02.4</dd>
370   - <dd>05:04.6</dd>
371   - <dd>5</dd>
372   - <dd>12</dd>
373   - </dl>
374   - <dl>
375   - <dd>金桥路朴珊德拉</dd>
376   - <dd>05:02.4</dd>
377   - <dd>05:04.6</dd>
378   - <dd>5</dd>
379   - <dd>12</dd>
380   - </dl>
381   - <dl>
382   - <dd>金桥路朴珊德拉</dd>
383   - <dd>05:02.4</dd>
384   - <dd>05:04.6</dd>
385   - <dd>5</dd>
386   - <dd>12</dd>
387   - </dl>
388   - <dl>
389   - <dd>金桥路朴珊德拉</dd>
390   - <dd>05:02.4</dd>
391   - <dd>05:04.6</dd>
392   - <dd>5</dd>
393   - <dd>12</dd>
394   - </dl>
395   -
396 248 </div>
397 249 </div>
398 250 </div>
... ... @@ -429,16 +281,31 @@
429 281 </dl>
430 282 {{/each}}
431 283 </script>
  284 +
  285 + <script id="multi_inout_info_cont_temp" type="text/html">
  286 + {{each list as item i}}
  287 + <dl>
  288 + <dd>{{item.stopName}}</dd>
  289 + <dd>{{item.in_time_str}}</dd>
  290 + <dd>{{item.out_time_str}}</dd>
  291 + <dd></dd>
  292 + <dd></dd>
  293 + </dl>
  294 + {{/each}}
  295 + </script>
432 296 <script>
433 297 (function () {
434 298 var modal = '#map-playback2-modal', gpsArray;
435 299  
436 300 $(modal).on('init', function (e, data) {
437   - //初始化地图
438   - map = new BMap.Map($('.map-wrap', modal)[0]);
439   - //中心点和缩放级别
440   - map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
441   - map.enableScrollWheelZoom();
  301 + try{
  302 + //初始化地图
  303 + map = new BMap.Map($('.map-wrap', modal)[0]);
  304 + //中心点和缩放级别
  305 + map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
  306 + map.enableScrollWheelZoom();
  307 + }catch (e){
  308 + console.log(e);}
442 309  
443 310 //固定表头
444 311 gb_ct_table.fixedHead($('.road_table_wrap', modal));
... ... @@ -548,8 +415,15 @@
548 415 return;
549 416 }
550 417  
  418 + //排序
  419 + gpsArray.sort(function (a, b) {
  420 + return a.ts - b.ts;
  421 + });
  422 + console.log('gpsArray', gpsArray);
551 423 //行车轨迹
552 424 trailTableObj.showInitData(gpsArray);
  425 + //到离站信息
  426 + inOutStationTableObj.showInitData(gpsArray);
553 427 }
554 428 });
555 429 }
... ... @@ -589,6 +463,79 @@
589 463 showInitData: showInitData
590 464 };
591 465 })();
  466 +
  467 + /**
  468 + * 到离站信息表格
  469 + * @type {{}}
  470 + */
  471 + var inOutStationTableObj = (function () {
  472 +
  473 + var data = [];
  474 + var showInitData = function (list) {
  475 + clear();
  476 + data = [];
  477 +
  478 + $.each(list, function (i, gps) {
  479 + if(gps['inout_stop'] == -1)
  480 + return true;
  481 +
  482 + if(gps['inout_stop'] == 1){
  483 + data.push(createIn(gps));
  484 + }
  485 + else if(gps['inout_stop'] == 0){
  486 + matchOut(data[data.length - 1], gps);
  487 + }
  488 + });
  489 +
  490 + //格式化时间
  491 + $.each(data, function () {
  492 + if(this.in_ts)
  493 + this.in_time_str = moment(this.in_ts).format('HH:mm.ss');
  494 + if(this.out_ts)
  495 + this.out_time_str = moment(this.out_ts).format('HH:mm.ss');
  496 + });
  497 +
  498 + console.log('data', data);
  499 + var htmlStr = template('multi_inout_info_cont_temp', {list: data});
  500 + $('.inout_table_wrap .ct_table_body', modal).html(htmlStr);
  501 + };
  502 +
  503 + var add = function (gps) {
  504 +
  505 + /*if (gps.inout_stop == -1)
  506 + return;
  507 +
  508 + var htmlStr = template('', {obj: gps['inout_stop_info']});
  509 + $('.inout_table_wrap .ct_table .ct_table_body', modal).html(htmlStr);*/
  510 + };
  511 +
  512 + var clear = function () {
  513 +
  514 + };
  515 +
  516 + var createIn = function (gps) {
  517 + var info = gps['inout_stop_info'];
  518 + return {
  519 + in_ts: info.ts,
  520 + stopNo: info.stopNo,
  521 + stopName: info.stopName
  522 + }
  523 + };
  524 +
  525 +
  526 + var matchOut = function (info, gps) {
  527 + if(!info)
  528 + return;
  529 + var outInfo = gps['inout_stop_info'];
  530 + if(info.stopName == outInfo.stopName){
  531 + info['out_ts'] = outInfo.ts;
  532 + }
  533 + };
  534 +
  535 + return {
  536 + showInitData: showInitData
  537 + };
  538 + })();
592 539 })();
593 540 </script>
594 541 </div>
595 542 \ No newline at end of file
... ...
src/main/resources/static/real_control_v2/mapmonitor/js/playback.js
  View file @6755385
... ... @@ -3,7 +3,7 @@
3 3 var gb_map_play_back = (function () {
4 4  
5 5 var dom;
6   - $.get('/real_control_v2/mapmonitor/fragments/playback/main.html', function (rs) {
  6 + $.get('/real_control_v2/mapmonitor/fragments/playback_v2/main.html', function (rs) {
7 7 dom = rs;
8 8 });
9 9  
... ... @@ -13,10 +13,11 @@ var gb_map_play_back = (function () {
13 13 gb_map_imap.call('closeWin', deviceId);
14 14  
15 15 //show modal
16   - var modal = '#map-playback-modal';
17   - $(document.body).append(dom);
18   - UIkit.modal(modal, {bgclose: false}).show();
19   - $(modal).trigger('show_form', {deviceId: deviceId, nbbm: nbbm});
  16 + open_modal_dom(dom, {deviceId: deviceId, nbbm: nbbm});
  17 + //var modal = '#map-playback2-modal';
  18 + //$(document.body).append(dom);
  19 + //UIkit.modal(modal, {bgclose: false}).show();
  20 + //$(modal).trigger('show_form', {deviceId: deviceId, nbbm: nbbm});
20 21 };
21 22  
22 23 //导出excel
... ...