Commit 5568b1ad8c0a398df53f0442c12528c9453ea7ec
1 parent
96ea8d38
update...
Showing
10 changed files
with
499 additions
and
25 deletions
src/main/resources/static/real_control_v2/css/line_schedule_table.css
0 → 100644
| 1 | + | |
| 2 | +.electron-waybill-table{ | |
| 3 | + height: 100%; | |
| 4 | +} | |
| 5 | + | |
| 6 | +.electron-waybill-table dl{ | |
| 7 | + font-size: 0; | |
| 8 | + white-space: nowrap; | |
| 9 | + overflow: hidden; | |
| 10 | + text-overflow: ellipsis; | |
| 11 | +} | |
| 12 | + | |
| 13 | +.electron-waybill-table dt, | |
| 14 | +.electron-waybill-table dd{ | |
| 15 | + display: inline-block; | |
| 16 | + font-size: 14px; | |
| 17 | + white-space: nowrap; | |
| 18 | + overflow: hidden; | |
| 19 | + text-overflow: ellipsis; | |
| 20 | + border-right: 1px solid; | |
| 21 | + text-indent: 5px; | |
| 22 | + height: 37px; | |
| 23 | +} | |
| 24 | +.electron-waybill-table dt:nth-of-type(1), | |
| 25 | +.electron-waybill-table dd:nth-of-type(1){ | |
| 26 | + width: 50px; | |
| 27 | + text-align: center; | |
| 28 | +} | |
| 29 | +.electron-waybill-table dt:nth-of-type(2), | |
| 30 | +.electron-waybill-table dd:nth-of-type(2){ | |
| 31 | + width: 55px; | |
| 32 | + text-align: center; | |
| 33 | +} | |
| 34 | +.electron-waybill-table dt:nth-of-type(3), | |
| 35 | +.electron-waybill-table dd:nth-of-type(3){ | |
| 36 | + width: calc(2% + 66px); | |
| 37 | +} | |
| 38 | +.electron-waybill-table dt:nth-of-type(4), | |
| 39 | +.electron-waybill-table dd:nth-of-type(4){ | |
| 40 | + width: 10%; | |
| 41 | +} | |
| 42 | +.electron-waybill-table dt:nth-of-type(5), | |
| 43 | +.electron-waybill-table dd:nth-of-type(5){ | |
| 44 | + width: 10%; | |
| 45 | +} | |
| 46 | +.electron-waybill-table dt:nth-of-type(6), | |
| 47 | +.electron-waybill-table dd:nth-of-type(6){ | |
| 48 | + width: calc(13% + 18px); | |
| 49 | +} | |
| 50 | +.electron-waybill-table dt:nth-of-type(7), | |
| 51 | +.electron-waybill-table dd:nth-of-type(7){ | |
| 52 | + width: calc(10% + 10px); | |
| 53 | +} | |
| 54 | +.electron-waybill-table dt:nth-of-type(8), | |
| 55 | +.electron-waybill-table dd:nth-of-type(8){ | |
| 56 | + width: calc(51% - 233px); | |
| 57 | +} | |
| 58 | +.electron-waybill-table dt:nth-of-type(9), | |
| 59 | +.electron-waybill-table dd:nth-of-type(9){ | |
| 60 | + width: 65px; | |
| 61 | +} | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | +.electron-waybill-table .electron-waybill-header{ | |
| 66 | + color: #cfd2da; | |
| 67 | +} | |
| 68 | + | |
| 69 | +.electron-waybill-table .electron-waybill-header dl{ | |
| 70 | + border-bottom: 1px solid #979494; | |
| 71 | + height: 38px; | |
| 72 | + line-height: 38px; | |
| 73 | + margin-bottom: 0; | |
| 74 | + margin-top: 0; | |
| 75 | +} | |
| 76 | +.electron-waybill-table .electron-waybill-header dl dt{ | |
| 77 | + | |
| 78 | +} | |
| 79 | + | |
| 80 | + | |
| 81 | +.electron-waybill-table .electron-waybill-body{ | |
| 82 | + color: #cfd2da; | |
| 83 | + height: calc(100% - 39px); | |
| 84 | + overflow: hidden; | |
| 85 | + position: relative; | |
| 86 | +} | |
| 87 | + | |
| 88 | +.electron-waybill-table .electron-waybill-body dl{ | |
| 89 | + height: 38px; | |
| 90 | + line-height: 38px; | |
| 91 | + margin-bottom: 0; | |
| 92 | + margin-top: 0; | |
| 93 | +} | |
| 94 | + | |
| 95 | +.electron-waybill-table .electron-waybill-body dl:nth-child(1n+2){ | |
| 96 | + border-top: 1px solid; | |
| 97 | +} | |
| 98 | + | |
| 99 | +.electron-waybill-table .electron-waybill-body dl:last-child{ | |
| 100 | + border-bottom: 1px solid; | |
| 101 | +} | |
| 102 | + | |
| 103 | +.electron-waybill-table dt, | |
| 104 | +.electron-waybill-table dd, | |
| 105 | +.electron-waybill-table .electron-waybill-body dl:nth-child(1n+2), | |
| 106 | +.electron-waybill-table .electron-waybill-body dl:last-child{ | |
| 107 | + border-color: #363a44; | |
| 108 | +} | |
| 109 | + | |
| 110 | +.electron-waybill-table .electron-waybill-body dl:nth-child(odd){ | |
| 111 | + | |
| 112 | +} | |
| 113 | + | |
| 114 | +.electron-waybill-table .electron-waybill-body dl:nth-child(even){ | |
| 115 | + /*background: #434753;*/ | |
| 116 | +} | |
| 117 | + | |
| 118 | +.electron-waybill-table .uk-badge{ | |
| 119 | + padding: 0 1px 0 1px; | |
| 120 | + text-indent: 0; | |
| 121 | + font-family: 华文细黑; | |
| 122 | +} | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | +.electron-waybill-table .ps-container:hover > .ps-scrollbar-y-rail:hover, | |
| 127 | +.electron-waybill-table .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail{ | |
| 128 | + background-color: #484848; | |
| 129 | +} | |
| 130 | + | |
| 131 | +.electron-waybill-table .ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y { | |
| 132 | + background-color: #fff; | |
| 133 | + } | |
| 0 | 134 | \ No newline at end of file | ... | ... |
src/main/resources/static/real_control_v2/css/main.css
| ... | ... | @@ -1058,4 +1058,79 @@ span.late-badge { |
| 1058 | 1058 | |
| 1059 | 1059 | dl.intimity span.late-badge{ |
| 1060 | 1060 | color: #fbfbfb; |
| 1061 | -} | |
| 1062 | 1061 | \ No newline at end of file |
| 1062 | +} | |
| 1063 | + | |
| 1064 | +/** badge tooltip */ | |
| 1065 | +.uk-badge.c_task:hover, | |
| 1066 | +.uk-badge.sch_region:hover{ | |
| 1067 | + background-image: none; | |
| 1068 | + background: #38b3e1; | |
| 1069 | + border: 1px solid #7ebad1; | |
| 1070 | +} | |
| 1071 | + | |
| 1072 | +.uk-badge.out:hover{ | |
| 1073 | + background-image: none; | |
| 1074 | + background: #8fc650; | |
| 1075 | + border: 1px solid #949f86; | |
| 1076 | +} | |
| 1077 | + | |
| 1078 | +.uk-badge.in:hover{ | |
| 1079 | + background-image: none; | |
| 1080 | + background: #fabc64; | |
| 1081 | + border: 1px solid #a68c67; | |
| 1082 | +} | |
| 1083 | + | |
| 1084 | +.qtip.sch-badge-tip{ | |
| 1085 | + max-width: 500px; | |
| 1086 | +} | |
| 1087 | + | |
| 1088 | +.tip_task_list { | |
| 1089 | + width: 460px; | |
| 1090 | + margin-bottom: -10px; | |
| 1091 | +} | |
| 1092 | +.tip_task_list dl{ | |
| 1093 | + font-size: 0; | |
| 1094 | + border-bottom: 1px solid #e6e6e6; | |
| 1095 | + margin: 0; | |
| 1096 | +} | |
| 1097 | +.tip_task_list dl:last-child{ | |
| 1098 | + border-bottom: none; | |
| 1099 | +} | |
| 1100 | +.tip_task_list dl dt, | |
| 1101 | +.tip_task_list dl dd{ | |
| 1102 | + display: inline-block; | |
| 1103 | + font-size: 13px; | |
| 1104 | + white-space: nowrap; | |
| 1105 | + overflow: hidden; | |
| 1106 | + text-overflow: ellipsis; | |
| 1107 | + height: 24px; | |
| 1108 | + line-height: 24px; | |
| 1109 | +} | |
| 1110 | + | |
| 1111 | +.tip_task_list dl dt:nth-of-type(1), .tip_task_list dl dd:nth-of-type(1){ | |
| 1112 | + width: 19%; | |
| 1113 | +} | |
| 1114 | +.tip_task_list dl dt:nth-of-type(2), .tip_task_list dl dd:nth-of-type(2){ | |
| 1115 | + width: 12%; | |
| 1116 | +} | |
| 1117 | +.tip_task_list dl dt:nth-of-type(3), .tip_task_list dl dd:nth-of-type(3){ | |
| 1118 | + width: 28%; | |
| 1119 | +} | |
| 1120 | +.tip_task_list dl dt:nth-of-type(4), .tip_task_list dl dd:nth-of-type(4){ | |
| 1121 | + width: 28%; | |
| 1122 | +} | |
| 1123 | +.tip_task_list dl dt:nth-of-type(5), .tip_task_list dl dd:nth-of-type(5){ | |
| 1124 | + width: 13%; | |
| 1125 | +} | |
| 1126 | + | |
| 1127 | +.tip_task_list dl.service{ | |
| 1128 | + color: blue; | |
| 1129 | +} | |
| 1130 | +.tip_task_list dl.service.destroy{ | |
| 1131 | + color: red; | |
| 1132 | +} | |
| 1133 | + | |
| 1134 | +.tip_task_list dl span{ | |
| 1135 | + margin: 0; | |
| 1136 | + width: auto; | |
| 1137 | +} | ... | ... |
src/main/resources/static/real_control_v2/fragments/line_schedule/badge_tooltip.html
0 → 100644
| 1 | +<div> | |
| 2 | + <script id="sch-table-task-tootip-temp" type="text/html"> | |
| 3 | + <div class="tl-tip-panel"> | |
| 4 | + <div class="tip_task_list"> | |
| 5 | + <dl> | |
| 6 | + <dt>类型</dt> | |
| 7 | + <dt>里程</dt> | |
| 8 | + <dt>起点</dt> | |
| 9 | + <dt>终点</dt> | |
| 10 | + <dt>备注</dt> | |
| 11 | + </dl> | |
| 12 | + {{each tasks as t i}} | |
| 13 | + <dl class="{{t.mileageType}} {{if t.destroy}}destroy{{/if}}"> | |
| 14 | + <dd> | |
| 15 | + {{if t.mileageType=="service"}} | |
| 16 | + 营运 | |
| 17 | + {{else if t.mileageType=="empty"}} | |
| 18 | + 空驶 | |
| 19 | + {{/if}} | |
| 20 | + {{if t.destroy}} | |
| 21 | + <span>(烂班)</span> | |
| 22 | + {{else if t.type2==2}} | |
| 23 | + <span>(进场)</span> | |
| 24 | + {{else if t.type2==3}} | |
| 25 | + <span>(出场)</span> | |
| 26 | + {{/if}} | |
| 27 | + </dd> | |
| 28 | + <dd> | |
| 29 | + {{t.mileage}} | |
| 30 | + </dd> | |
| 31 | + <dd title="{{t.startStationName}}">{{t.startStationName}}</dd> | |
| 32 | + <dd title="{{t.endStationName}}">{{t.endStationName}}</dd> | |
| 33 | + <dd title="{{t.remarks}}">{{t.remarks}}</dd> | |
| 34 | + </dl> | |
| 35 | + {{/each}} | |
| 36 | + </div> | |
| 37 | + </div> | |
| 38 | + </script> | |
| 39 | + | |
| 40 | + | |
| 41 | + <script id="sch-table-region-tootip-temp" type="text/html"> | |
| 42 | + <div class="tl-tip-panel"> | |
| 43 | + <div style="font-size: 13px;"> | |
| 44 | + 由 {{qdzName}} 发往 {{zdzName}} | |
| 45 | + </div> | |
| 46 | + </div> | |
| 47 | + </script> | |
| 48 | + | |
| 49 | + <script id="sch-table-out-tootip-temp" type="text/html"> | |
| 50 | + <div class="tl-tip-panel"> | |
| 51 | + <div style="font-size: 13px;"> | |
| 52 | + {{qdzName}} 出场至 {{zdzName}} | |
| 53 | + </div> | |
| 54 | + </div> | |
| 55 | + </script> | |
| 56 | + | |
| 57 | + <script id="sch-table-in-tootip-temp" type="text/html"> | |
| 58 | + <div class="tl-tip-panel"> | |
| 59 | + <div style="font-size: 13px;"> | |
| 60 | + 进 {{zdzName}} | |
| 61 | + </div> | |
| 62 | + </div> | |
| 63 | + </script> | |
| 64 | +</div> | ... | ... |
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_inpark.html
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | |
| 7 | 7 | <div style="width: 100%;padding-left: 1%;"> |
| 8 | 8 | <div class="sub-task-card"> |
| 9 | - <div class="uk-panel uk-panel-box uk-panel-box-primary"> | |
| 9 | + <div class="uk-panel uk-panel-box uk-panel-box-primary twins_task_panel"> | |
| 10 | 10 | <div class="uk-panel-badge uk-badge">营运</div> |
| 11 | 11 | <h3 class="uk-panel-title">线路上站点间</h3> |
| 12 | 12 | <form class="uk-form uk-form-horizontal inpark_form" service_form> |
| ... | ... | @@ -105,7 +105,7 @@ |
| 105 | 105 | </div> |
| 106 | 106 | </div> |
| 107 | 107 | <div class="uk-width-7-10 pl5"> |
| 108 | - <select name="startStation" disabled></select> | |
| 108 | + <select name="startStation" ></select> | |
| 109 | 109 | </div> |
| 110 | 110 | </div> |
| 111 | 111 | <div class="uk-grid"> |
| ... | ... | @@ -352,6 +352,9 @@ |
| 352 | 352 | var e =$('#globalRemarks', modal); |
| 353 | 353 | e.val(e.val() + $(this).val() + ','); |
| 354 | 354 | }); |
| 355 | + | |
| 356 | + //根据主任务状态,复子任务 | |
| 357 | + updateTwinsTaskBySch(sch); | |
| 355 | 358 | }); |
| 356 | 359 | |
| 357 | 360 | function allValidSuccess() { |
| ... | ... | @@ -579,6 +582,22 @@ |
| 579 | 582 | btmDrawer.data('name', id).data('url', url).trigger('drawer_show'); |
| 580 | 583 | } |
| 581 | 584 | } |
| 585 | + | |
| 586 | + | |
| 587 | + function updateTwinsTaskBySch(sch) { | |
| 588 | + //主任务是烂班 | |
| 589 | + if(sch.destroy){ | |
| 590 | + serviceForm.prepend('<input type="hidden" name="destroy" value="true">'); | |
| 591 | + $('[name=mileage]', serviceForm).val(sch.jhlcOrig).attr('disabled', 'disabled'); | |
| 592 | + $('.twins_task_panel .uk-badge', modal).addClass('uk-badge-danger').text('烂班'); | |
| 593 | + //终点禁选 | |
| 594 | + $('select[name=endStation]', serviceForm).attr('disabled', 'disabled'); | |
| 595 | + //开始结束时间禁选 | |
| 596 | + | |
| 597 | + //空驶起点 | |
| 598 | + $('select[name=startStation]', emptyForm).val(sch.qdzCode); | |
| 599 | + } | |
| 600 | + } | |
| 582 | 601 | })(); |
| 583 | 602 | </script> |
| 584 | 603 | </div> |
| 585 | 604 | \ No newline at end of file | ... | ... |
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_oil.html
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | |
| 7 | 7 | <div class="uk-grid"> |
| 8 | 8 | <div class="uk-width-1-3"> |
| 9 | - <form class="uk-form uk-form-horizontal c_task_form"> | |
| 9 | + <form class="uk-form uk-form-horizontal c_task_form twins_task_form"> | |
| 10 | 10 | <input type="hidden" name="type1" value="正常"> |
| 11 | 11 | <input type="hidden" name="type2" value="1"> |
| 12 | 12 | <input type="hidden" name="mileageType" value="service"> |
| ... | ... | @@ -189,6 +189,7 @@ |
| 189 | 189 | $(modal).on('init', function (e, data) { |
| 190 | 190 | e.stopPropagation(); |
| 191 | 191 | sch = data.sch; |
| 192 | + | |
| 192 | 193 | oilId = sch.xlBm + '_oil_station'; |
| 193 | 194 | lineInfo = gb_data_basic.codeToLine[sch.xlBm]; |
| 194 | 195 | |
| ... | ... | @@ -242,6 +243,9 @@ |
| 242 | 243 | }, {center: false, bgclose: false, modal: false}); |
| 243 | 244 | }); |
| 244 | 245 | }); |
| 246 | + | |
| 247 | + //根据主任务状态,复子任务 | |
| 248 | + updateTwinsTaskBySch(sch); | |
| 245 | 249 | }); |
| 246 | 250 | |
| 247 | 251 | var dataArray = []; |
| ... | ... | @@ -274,7 +278,7 @@ |
| 274 | 278 | } |
| 275 | 279 | else{ |
| 276 | 280 | //营运子任务不写备注 |
| 277 | - if(data.mileageType == 'service' && !data.destroy) | |
| 281 | + if(data.mileageType == 'service') | |
| 278 | 282 | data.remarks = ''; |
| 279 | 283 | gb_common.$post('/childTask', data, function (rs) { |
| 280 | 284 | notify_succ('子任务添加成功'); |
| ... | ... | @@ -450,6 +454,18 @@ |
| 450 | 454 | $('.inout_reason_tags>span.active', modal).removeClass('active'); |
| 451 | 455 | $(this).addClass('active'); |
| 452 | 456 | }); |
| 457 | + | |
| 458 | + | |
| 459 | + function updateTwinsTaskBySch(sch) { | |
| 460 | + //主任务是烂班 | |
| 461 | + if(sch.destroy){ | |
| 462 | + var f = $('.twins_task_form', modal); | |
| 463 | + $('.uk-badge', f).addClass('uk-badge-danger').text('烂班'); | |
| 464 | + $('.uk-panel-box', f).removeClass('uk-panel-box-primary'); | |
| 465 | + f.prepend('<input type="hidden" name="destroy" value="true">'); | |
| 466 | + $('[name=mileage]', f).val(sch.jhlcOrig); | |
| 467 | + } | |
| 468 | + } | |
| 453 | 469 | })(); |
| 454 | 470 | </script> |
| 455 | 471 | </div> | ... | ... |
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_outpark.html
| ... | ... | @@ -42,7 +42,7 @@ |
| 42 | 42 | </div> |
| 43 | 43 | </div> |
| 44 | 44 | <div class="uk-width-7-10 pl5"> |
| 45 | - <select name="endStation" class="ct_focus" disabled></select> | |
| 45 | + <select name="endStation" class="ct_focus"></select> | |
| 46 | 46 | </div> |
| 47 | 47 | </div> |
| 48 | 48 | <div class="uk-grid"> |
| ... | ... | @@ -82,7 +82,7 @@ |
| 82 | 82 | </div> |
| 83 | 83 | |
| 84 | 84 | <div class="sub-task-card"> |
| 85 | - <div class="uk-panel uk-panel-box uk-panel-box-primary"> | |
| 85 | + <div class="uk-panel uk-panel-box uk-panel-box-primary twins_task_panel"> | |
| 86 | 86 | <div class="uk-panel-badge uk-badge">营运</div> |
| 87 | 87 | <h3 class="uk-panel-title">线路上站点间</h3> |
| 88 | 88 | <form class="uk-form uk-form-horizontal inpark_form" service_form> |
| ... | ... | @@ -199,6 +199,9 @@ |
| 199 | 199 | |
| 200 | 200 | //设置默认值 |
| 201 | 201 | setDefaultVal(); |
| 202 | + | |
| 203 | + //根据主任务状态,复子任务 | |
| 204 | + updateTwinsTaskBySch(sch); | |
| 202 | 205 | }); |
| 203 | 206 | //线路标准 |
| 204 | 207 | information = gb_data_basic.getLineInformation(sch.xlBm); |
| ... | ... | @@ -271,13 +274,6 @@ |
| 271 | 274 | }); |
| 272 | 275 | }); |
| 273 | 276 | |
| 274 | - /* function outUpOrDown() { | |
| 275 | - if (information.carPark != $('select[name=startStation]', emptyForm).val()) | |
| 276 | - return -1; | |
| 277 | - | |
| 278 | - return sch.xlDir; | |
| 279 | - }*/ | |
| 280 | - | |
| 281 | 277 | function getOutTime() { |
| 282 | 278 | if (information.carPark != $('select[name=startStation]', emptyForm).val()) |
| 283 | 279 | return null; |
| ... | ... | @@ -337,6 +333,16 @@ |
| 337 | 333 | //空驶里程 |
| 338 | 334 | $('input[name=mileage]', emptyForm).val(sch.xlDir == 0 ? information.upOutMileage : information.downOutMileage); |
| 339 | 335 | } |
| 336 | + | |
| 337 | + | |
| 338 | + function updateTwinsTaskBySch(sch) { | |
| 339 | + //主任务是烂班 | |
| 340 | + if(sch.destroy){ | |
| 341 | + serviceForm.prepend('<input type="hidden" name="destroy" value="true">'); | |
| 342 | + $('.twins_task_panel .uk-badge', modal).addClass('uk-badge-danger').text('烂班'); | |
| 343 | + $('[name=mileage]', serviceForm).val(sch.jhlcOrig).attr('disabled', 'disabled'); | |
| 344 | + } | |
| 345 | + } | |
| 340 | 346 | })(); |
| 341 | 347 | </script> |
| 342 | 348 | </div> |
| 343 | 349 | \ No newline at end of file | ... | ... |
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
| ... | ... | @@ -3,9 +3,9 @@ |
| 3 | 3 | <div class="schedule-wrap {{if dir==0}}up{{else}}down{{/if}}"> |
| 4 | 4 | <h3 class="header-title"> |
| 5 | 5 | {{if dir==0}} |
| 6 | - 上行/{{line.startStationName}} | |
| 6 | + {{line.startStationName}} | |
| 7 | 7 | {{else}} |
| 8 | - 下行/{{line.endStationName}} | |
| 8 | + {{line.endStationName}} | |
| 9 | 9 | {{/if}} |
| 10 | 10 | <i class="uk-icon-question-circle uk-icon-hover"></i> |
| 11 | 11 | <div class="fixed_legend"> |
| ... | ... | @@ -65,21 +65,21 @@ |
| 65 | 65 | <dd data-sort-val={{sch.fcsjT}}> |
| 66 | 66 | {{sch.fcsj}} |
| 67 | 67 | {{if sch.bcType == "out"}} |
| 68 | - <span class="uk-badge uk-badge-success">出场</span> | |
| 68 | + <span class="uk-badge uk-badge-success out">出场</span> | |
| 69 | 69 | {{else if sch.bcType == "in"}} |
| 70 | - <span class="uk-badge uk-badge-warning">进场</span> | |
| 70 | + <span class="uk-badge uk-badge-warning in">进场</span> | |
| 71 | 71 | {{else if sch.bcType == "venting"}} |
| 72 | 72 | <span class="uk-badge uk-badge-danger">直放</span> |
| 73 | 73 | {{else if sch.bcType == "major"}} |
| 74 | 74 | <span class="uk-badge uk-badge-danger">放站</span> |
| 75 | 75 | {{else if sch.bcType == "region"}} |
| 76 | - <span class="uk-badge">区间</span> | |
| 76 | + <span class="uk-badge sch_region">区间</span> | |
| 77 | 77 | {{/if}} |
| 78 | 78 | {{if sch.sflj}} |
| 79 | 79 | <span class="uk-badge uk-badge-danger">临加</span> |
| 80 | 80 | {{/if}} |
| 81 | 81 | {{if sch.cTasks.length > 0}} |
| 82 | - <span class="uk-badge uk-badge-notification">{{sch.cTasks.length}}</span> | |
| 82 | + <span class="uk-badge uk-badge-notification c_task">{{sch.cTasks.length}}</span> | |
| 83 | 83 | {{/if}} |
| 84 | 84 | </dd> |
| 85 | 85 | <dd data-sort-val={{sch.dfsjT}} dbclick dbclick-type="dfsj" dbclick-val="{{sch.dfsj}}"> |
| ... | ... | @@ -117,21 +117,21 @@ |
| 117 | 117 | <dd data-sort-val={{fcsjT}}> |
| 118 | 118 | {{fcsj}} |
| 119 | 119 | {{if bcType == "out"}} |
| 120 | - <span class="uk-badge uk-badge-success">出场</span> | |
| 120 | + <span class="uk-badge uk-badge-success out">出场</span> | |
| 121 | 121 | {{else if bcType == "in"}} |
| 122 | - <span class="uk-badge uk-badge-warning">进场</span> | |
| 122 | + <span class="uk-badge uk-badge-warning in">进场</span> | |
| 123 | 123 | {{else if bcType == "venting"}} |
| 124 | 124 | <span class="uk-badge uk-badge-danger">直放</span> |
| 125 | 125 | {{else if bcType == "major"}} |
| 126 | 126 | <span class="uk-badge uk-badge-danger">放站</span> |
| 127 | 127 | {{else if bcType == "region"}} |
| 128 | - <span class="uk-badge">区间</span> | |
| 128 | + <span class="uk-badge sch_region">区间</span> | |
| 129 | 129 | {{/if}} |
| 130 | 130 | {{if sflj}} |
| 131 | 131 | <span class="uk-badge uk-badge-danger">临加</span> |
| 132 | 132 | {{/if}} |
| 133 | 133 | {{if cTasks.length > 0}} |
| 134 | - <span class="uk-badge uk-badge-notification">{{cTasks.length}}</span> | |
| 134 | + <span class="uk-badge uk-badge-notification c_task">{{cTasks.length}}</span> | |
| 135 | 135 | {{/if}} |
| 136 | 136 | </dd> |
| 137 | 137 | </script> | ... | ... |
src/main/resources/static/real_control_v2/js/line_schedule/badge_tooltip.js
0 → 100644
| 1 | + | |
| 2 | +/** badge 悬停 tip 相关 */ | |
| 3 | +var gb_schedule_badge_tootip = (function () { | |
| 4 | + | |
| 5 | + var temps; | |
| 6 | + //html 模板 | |
| 7 | + $.get('/real_control_v2/fragments/line_schedule/badge_tooltip.html', function(dom) { | |
| 8 | + temps = gb_common.compileTempByDom(dom); | |
| 9 | + }); | |
| 10 | + | |
| 11 | + //子任务 tootip | |
| 12 | + $(document).on('mouseenter', '.schedule-wrap .ct_table_body .uk-badge.c_task', function() { | |
| 13 | + $(this).qtip({ | |
| 14 | + show: { | |
| 15 | + ready: true, | |
| 16 | + delay: 300 | |
| 17 | + }, | |
| 18 | + content: { | |
| 19 | + text: function() { | |
| 20 | + var id = $(this).parents('dl').data('id'), | |
| 21 | + lineCode = $(this).parents('li.line_schedule').data('id'), | |
| 22 | + sch = gb_schedule_table.findScheduleByLine(lineCode)[id]; | |
| 23 | + return temps['sch-table-task-tootip-temp']({tasks: sch.cTasks}); | |
| 24 | + } | |
| 25 | + }, | |
| 26 | + position: { | |
| 27 | + viewport: $(window), | |
| 28 | + my: 'center left', | |
| 29 | + at: 'center right' | |
| 30 | + }, | |
| 31 | + style: { | |
| 32 | + classes: 'qtip-light qtip-rounded qtip-shadow sch-badge-tip' | |
| 33 | + }, | |
| 34 | + hide: { | |
| 35 | + fixed: true, | |
| 36 | + delay: 300 | |
| 37 | + }, | |
| 38 | + events: { | |
| 39 | + hidden: function(event, api) { | |
| 40 | + //destroy dom | |
| 41 | + $(this).qtip('destroy', true); | |
| 42 | + } | |
| 43 | + } | |
| 44 | + }); | |
| 45 | + }); | |
| 46 | + | |
| 47 | + //区间 tootip | |
| 48 | + $(document).on('mouseenter', '.schedule-wrap .ct_table_body .uk-badge.sch_region', function() { | |
| 49 | + $(this).qtip({ | |
| 50 | + show: { | |
| 51 | + ready: true, | |
| 52 | + delay: 300 | |
| 53 | + }, | |
| 54 | + content: { | |
| 55 | + text: function() { | |
| 56 | + var id = $(this).parents('dl').data('id'), | |
| 57 | + lineCode = $(this).parents('li.line_schedule').data('id'), | |
| 58 | + sch = gb_schedule_table.findScheduleByLine(lineCode)[id]; | |
| 59 | + return temps['sch-table-region-tootip-temp'](sch); | |
| 60 | + } | |
| 61 | + }, | |
| 62 | + position: { | |
| 63 | + viewport: $(window), | |
| 64 | + my: 'center left', | |
| 65 | + at: 'center right' | |
| 66 | + }, | |
| 67 | + style: { | |
| 68 | + classes: 'qtip-youtube sch-badge-tip' | |
| 69 | + }, | |
| 70 | + hide: { | |
| 71 | + fixed: true, | |
| 72 | + delay: 300 | |
| 73 | + }, | |
| 74 | + events: { | |
| 75 | + hidden: function(event, api) { | |
| 76 | + //destroy dom | |
| 77 | + $(this).qtip('destroy', true); | |
| 78 | + } | |
| 79 | + } | |
| 80 | + }); | |
| 81 | + }); | |
| 82 | + | |
| 83 | + | |
| 84 | + //出场 tootip | |
| 85 | + $(document).on('mouseenter', '.schedule-wrap .ct_table_body .uk-badge.out', function() { | |
| 86 | + $(this).qtip({ | |
| 87 | + show: { | |
| 88 | + ready: true, | |
| 89 | + delay: 300 | |
| 90 | + }, | |
| 91 | + content: { | |
| 92 | + text: function() { | |
| 93 | + var id = $(this).parents('dl').data('id'), | |
| 94 | + lineCode = $(this).parents('li.line_schedule').data('id'), | |
| 95 | + sch = gb_schedule_table.findScheduleByLine(lineCode)[id]; | |
| 96 | + return temps['sch-table-out-tootip-temp'](sch); | |
| 97 | + } | |
| 98 | + }, | |
| 99 | + position: { | |
| 100 | + viewport: $(window), | |
| 101 | + my: 'center left', | |
| 102 | + at: 'center right' | |
| 103 | + }, | |
| 104 | + style: { | |
| 105 | + classes: 'qtip-youtube sch-badge-tip' | |
| 106 | + }, | |
| 107 | + hide: { | |
| 108 | + fixed: true, | |
| 109 | + delay: 300 | |
| 110 | + }, | |
| 111 | + events: { | |
| 112 | + hidden: function(event, api) { | |
| 113 | + //destroy dom | |
| 114 | + $(this).qtip('destroy', true); | |
| 115 | + } | |
| 116 | + } | |
| 117 | + }); | |
| 118 | + }); | |
| 119 | + | |
| 120 | + | |
| 121 | + //进场 tootip | |
| 122 | + $(document).on('mouseenter', '.schedule-wrap .ct_table_body .uk-badge.in', function() { | |
| 123 | + $(this).qtip({ | |
| 124 | + show: { | |
| 125 | + ready: true, | |
| 126 | + delay: 300 | |
| 127 | + }, | |
| 128 | + content: { | |
| 129 | + text: function() { | |
| 130 | + var id = $(this).parents('dl').data('id'), | |
| 131 | + lineCode = $(this).parents('li.line_schedule').data('id'), | |
| 132 | + sch = gb_schedule_table.findScheduleByLine(lineCode)[id]; | |
| 133 | + return temps['sch-table-in-tootip-temp'](sch); | |
| 134 | + } | |
| 135 | + }, | |
| 136 | + position: { | |
| 137 | + viewport: $(window), | |
| 138 | + my: 'center left', | |
| 139 | + at: 'center right' | |
| 140 | + }, | |
| 141 | + style: { | |
| 142 | + classes: 'qtip-youtube sch-badge-tip' | |
| 143 | + }, | |
| 144 | + hide: { | |
| 145 | + fixed: true, | |
| 146 | + delay: 300 | |
| 147 | + }, | |
| 148 | + events: { | |
| 149 | + hidden: function(event, api) { | |
| 150 | + //destroy dom | |
| 151 | + $(this).qtip('destroy', true); | |
| 152 | + } | |
| 153 | + } | |
| 154 | + }); | |
| 155 | + }); | |
| 156 | +})(); | |
| 0 | 157 | \ No newline at end of file | ... | ... |
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
| ... | ... | @@ -174,13 +174,15 @@ var gb_schedule_context_menu = (function () { |
| 174 | 174 | add_sub_task_range_turn: function (sch) { |
| 175 | 175 | if(sch.bcType == 'out' || sch.bcType == 'in') |
| 176 | 176 | return notify_err('进出场班次不能做区间掉头!'); |
| 177 | + if(sch.destroy) | |
| 178 | + return notify_err('没有理由在烂班上做区间调头!!'); | |
| 177 | 179 | open_modal(folder + '/sub_task/add_sub_task_range_turn.html', { |
| 178 | 180 | sch: sch |
| 179 | 181 | }, modal_opts); |
| 180 | 182 | }, |
| 181 | 183 | add_oil: function (sch) { |
| 182 | 184 | if(sch.bcType == 'out' || sch.bcType == 'in'){ |
| 183 | - notify_err('暂不能在进出场班次上做加油子任务!'); | |
| 185 | + notify_err('暂不能在进出场班次上做这个操作!'); | |
| 184 | 186 | return; |
| 185 | 187 | } |
| 186 | 188 | open_modal(folder + '/sub_task/add_sub_task_oil.html', { | ... | ... |
src/main/resources/static/real_control_v2/main.html
| ... | ... | @@ -22,6 +22,8 @@ |
| 22 | 22 | <link rel="stylesheet" href="/real_control_v2/css/home.css" merge="custom_style"/> |
| 23 | 23 | <!-- line style --> |
| 24 | 24 | <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css" merge="custom_style"/> |
| 25 | + <link rel="stylesheet" href="/real_control_v2/css/line_schedule_table.css" merge="custom_style"/> | |
| 26 | + | |
| 25 | 27 | <link rel="stylesheet" href="/real_control_v2/css/sch_autocomp_result.css" merge="custom_style"/> |
| 26 | 28 | <!-- custom table --> |
| 27 | 29 | <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/> |
| ... | ... | @@ -172,6 +174,7 @@ |
| 172 | 174 | <script src="/real_control_v2/js/line_schedule/context_menu.js" merge="custom_js"></script> |
| 173 | 175 | <script src="/real_control_v2/js/line_schedule/dbclick.js" merge="custom_js"></script> |
| 174 | 176 | <script src="/real_control_v2/js/line_schedule/search.js" merge="custom_js"></script> |
| 177 | +<script src="/real_control_v2/js/line_schedule/badge_tooltip.js" merge="custom_js"></script> | |
| 175 | 178 | |
| 176 | 179 | <!-- 字典相关 --> |
| 177 | 180 | <script src="/assets/js/dictionary.js" merge="custom_js"></script> | ... | ... |