Commit 33a5ac15d50c7e3b58c8c077759531c01392ddb5
1 parent
b56bec56
update...
Showing
3 changed files
with
17 additions
and
1 deletions
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
| @@ -110,8 +110,11 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen | @@ -110,8 +110,11 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen | ||
| 110 | logger.warn("烂班不允许发送调度指令...."); | 110 | logger.warn("烂班不允许发送调度指令...."); |
| 111 | return -1; | 111 | return -1; |
| 112 | } | 112 | } |
| 113 | + | ||
| 114 | + //待发应到时间 | ||
| 115 | + String dfsj = fmtHHmm.print(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000)); | ||
| 113 | String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由" | 116 | String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由" |
| 114 | - + sch.getQdzName() + "发往" + sch.getZdzName() + ";应到 " + sch.getZdsj(); | 117 | + + sch.getQdzName() + "发往" + sch.getZdzName() + ";应到 " + dfsj; |
| 115 | 118 | ||
| 116 | if(sch.getBcType().equals("venting")){ | 119 | if(sch.getBcType().equals("venting")){ |
| 117 | text += " (直放)"; | 120 | text += " (直放)"; |
src/main/resources/static/real_control_v2/alone_page/home/home_wrap.html
| @@ -44,6 +44,7 @@ | @@ -44,6 +44,7 @@ | ||
| 44 | 44 | ||
| 45 | #main-tab-content{ | 45 | #main-tab-content{ |
| 46 | padding: 0 !important; | 46 | padding: 0 !important; |
| 47 | + list-style: none; | ||
| 47 | } | 48 | } |
| 48 | 49 | ||
| 49 | .home-panel{ | 50 | .home-panel{ |
| @@ -99,6 +100,8 @@ | @@ -99,6 +100,8 @@ | ||
| 99 | <script src="/assets/js/d3.min.js"></script> | 100 | <script src="/assets/js/d3.min.js"></script> |
| 100 | <!-- EventProxy --> | 101 | <!-- EventProxy --> |
| 101 | <script src="/assets/js/eventproxy.js"></script> | 102 | <script src="/assets/js/eventproxy.js"></script> |
| 103 | +<!-- Geolib --> | ||
| 104 | +<script src="/real_control_v2/geolib/geolib.js" merge="plugins"></script> | ||
| 102 | 105 | ||
| 103 | <script> | 106 | <script> |
| 104 | 107 |
src/main/resources/static/real_control_v2/css/home.css
| @@ -125,6 +125,7 @@ | @@ -125,6 +125,7 @@ | ||
| 125 | line-height: 25px; | 125 | line-height: 25px; |
| 126 | font-size: 13px; | 126 | font-size: 13px; |
| 127 | padding: 0 0 3px; | 127 | padding: 0 0 3px; |
| 128 | + position: relative; | ||
| 128 | } | 129 | } |
| 129 | 130 | ||
| 130 | .data-wrap .data-title span.data-title-text { | 131 | .data-wrap .data-title span.data-title-text { |
| @@ -326,4 +327,13 @@ span.signal-state-speed-limit{ | @@ -326,4 +327,13 @@ span.signal-state-speed-limit{ | ||
| 326 | #send-phrase-multi-modal .tools>span{ | 327 | #send-phrase-multi-modal .tools>span{ |
| 327 | cursor: pointer; | 328 | cursor: pointer; |
| 328 | margin-left: 12px; | 329 | margin-left: 12px; |
| 330 | +} | ||
| 331 | + | ||
| 332 | +.device_list_filter_icon{ | ||
| 333 | + position: absolute; | ||
| 334 | + right: 15px; | ||
| 335 | +} | ||
| 336 | + | ||
| 337 | +.device_list_filter_icon.online{ | ||
| 338 | + | ||
| 329 | } | 339 | } |
| 330 | \ No newline at end of file | 340 | \ No newline at end of file |