潘钊 / bsth_control · Commits

Commit 21dfa3a723bb6c69e82b80f34e2254fc55c1b0f1

Authored by 廖磊
2 parents a0048b99 9a8a3ad8
build: skipped

Merge branch 'minhang' of 

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
Inline Side-by-side
Showing 10 changed files with 84 additions and 10 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
  View file @21dfa3a
... ... @@ -78,6 +78,12 @@ public class PilotReport {
78 78 //d80MultiMap.put(d80.getData().getLineId().toString(), d80);
79 79  
80 80 String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
  81 + //上报时，在执行的班次
  82 + if(StringUtils.isNotEmpty(nbbm)){
  83 + ScheduleRealInfo sch = dayOfSchedule.executeCurr(nbbm);
  84 + if(null != sch)
  85 + d80.setSchId(sch.getId());
  86 + }
81 87 //处理
82 88 switch (d80.getData().getRequestCode()) {
83 89 //出场请求
... ...
src/main/java/com/bsth/entity/directive/D80.java
  View file @21dfa3a
... ... @@ -62,7 +62,17 @@ public class D80 {
62 62 private Date handleTime;
63 63  
64 64 private String remarks;
65   -
  65 +
  66 + private Long schId;
  67 +
  68 + public Long getSchId() {
  69 + return schId;
  70 + }
  71 +
  72 + public void setSchId(Long schId) {
  73 + this.schId = schId;
  74 + }
  75 +
66 76 @Embeddable
67 77 public static class D80Data {
68 78  
... ...
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
  View file @21dfa3a
... ... @@ -111,7 +111,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen
111 111 return -1;
112 112 }
113 113 String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
114   - + sch.getQdzName() + "发往" + sch.getZdzName() ;
  114 + + sch.getQdzName() + "发往" + sch.getZdzName() + ";应到 " + sch.getZdsj();
115 115  
116 116 if(sch.getBcType().equals("venting")){
117 117 text += " (直放)";
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @21dfa3a
... ... @@ -3270,7 +3270,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
3270 3270 ScheduleRealInfo sch = dayOfSchedule.get(id);
3271 3271 if (sch != null) {
3272 3272 sch.setBcType(bcType);
3273   - sch.addRemarks(remarks);
  3273 + sch.setRemarks(remarks);
3274 3274 rs.put("status", ResponseCode.SUCCESS);
3275 3275 rs.put("t", sch);
3276 3276  
... ...
src/main/resources/static/real_control_v2/alone_page/map/alone_wrap.html
  View file @21dfa3a
... ... @@ -42,13 +42,23 @@
42 42 <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/themes/airbnb.css" merge="plugins"/>
43 43  
44 44 <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
  45 +
  46 + <style>
  47 + .main-container .map-panel{
  48 + position: absolute;
  49 + top:0;
  50 + left: 0;
  51 + width: 20px;
  52 + z-index: 999;
  53 + height: 20px;
  54 + }
  55 + </style>
45 56 </head>
46 57  
47 58 <body>
48 59 <div class="main-container" style="height: 100%;">
49 60 <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">加载中...</span>
50 61 </div>
51   -
52 62 <!-- 地图相关 -->
53 63 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
54 64 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
... ... @@ -108,6 +118,8 @@
108 118 //嵌入地图页面
109 119 $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
110 120 $('.map-system-msg.flex-left').remove();
  121 +
  122 + $(this).append('<span class="map-panel"></span>');//判断里有JS判定这个容器是否显示
111 123 });
112 124 });
113 125  
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
  View file @21dfa3a
... ... @@ -164,7 +164,7 @@
164 164  
165 165 $('[name=bcType]', modal).on('change', function(){
166 166 var type = $(this).val();
167   - if(sch.bcType != 'normal')
  167 + if(sch.bcType == 'in' || sch.bcType == 'out')
168 168 return;
169 169  
170 170 //重置类型，等待调整界面触发刷新事件
... ... @@ -188,6 +188,18 @@
188 188 $(detailModal).trigger('init', {sch: sch, parentModal: modal, _dfsj: $('[name=dfsj]', modal).val()});
189 189 })
190 190 });
  191 +
  192 + /**
  193 + * 相同选项 也触发 onchange
  194 + */
  195 + $('[name=bcType]', modal).mousedown(function () {
  196 + this.sindex = $(this)[0].selectedIndex;
  197 + $(this)[0].selectedIndex = 0;
  198 + }).mouseout(function () {
  199 + if ($(this)[0].selectedIndex === 0) {
  200 + $(this)[0].selectedIndex = this.sindex;
  201 + }
  202 + });
191 203 });
192 204 })();
193 205 </script>
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
  View file @21dfa3a
... ... @@ -267,7 +267,7 @@
267 267  
268 268 $('select[name=bcType]', modal).on('change', function(){
269 269 var type = $(this).val();
270   - if(sch.bcType != 'normal')
  270 + if(sch.bcType == 'in' || sch.bcType == 'out')
271 271 return;
272 272  
273 273 //重置类型，等待调整界面触发刷新事件
... ... @@ -289,6 +289,18 @@
289 289 $(detailModal).trigger('init', {sch: sch, parentModal: modal});
290 290 })
291 291 });
  292 +
  293 + /**
  294 + * 相同选项 也触发 onchange
  295 + */
  296 + $('select[name=bcType]', modal).mousedown(function () {
  297 + this.sindex = $(this)[0].selectedIndex;
  298 + $(this)[0].selectedIndex = 0;
  299 + }).mouseout(function () {
  300 + if ($(this)[0].selectedIndex === 0) {
  301 + $(this)[0].selectedIndex = this.sindex;
  302 + }
  303 + });
292 304 });
293 305  
294 306 function validation_s_e_Time(data) {
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/sys_mailbox.html
  View file @21dfa3a
... ... @@ -5,8 +5,9 @@
5 5 <h4 class="uk-panel-title">{{data.nbbm}} {{text}}</h4>
6 6 <code>{{dateStr}}</code>
7 7 <div class="uk-button-group">
8   - <a class="uk-button uk-button-mini uk-button-primary">同意</a>
9   - <a class="uk-button uk-button-mini reject">不同意</a>
  8 + <button class="uk-button uk-button-mini uk-button-primary">同意</button>
  9 + <button class="uk-button uk-button-mini reject">不同意</button>
  10 + <a class="edit_link" data-id="{{schId}}" data-line="{{data.lineId}}" >编辑</a>
10 11 </div>
11 12 </div>
12 13 </div>
... ...
src/main/resources/static/real_control_v2/js/main.js
  View file @21dfa3a
... ... @@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
168 168 function showUpdateDescription() {
169 169 //更新说明
170 170 var updateDescription = {
171   - date: '2017-11-01',
172   - text: '<h5>1、修正了XP系统下主页滚动条的显示问题（Windows XP sp3 + chrome 49.0.2623.112）。</h5>'
  171 + date: '2017-11-02',
  172 + text: '<h5>1、修正二次放站时，需要先将班次切回正常班次的问题。</h5><h5>2、驾驶员请求信使上，添加“编辑”链接，可弹出对应班次的发车信息微调框。</h5>'
173 173 };
174 174  
175 175 var storage = window.localStorage
... ...
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
  View file @21dfa3a
... ... @@ -235,8 +235,10 @@ var gb_sch_websocket = (function () {
235 235 dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
236 236 });
237 237  
  238 +
238 239 //80同意
239 240 $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button-primary', function () {
  241 + $(this).attr('disabled', 'disabled');
240 242 var panel = $(this).parents('.sys-note-80')
241 243 , id = panel.data('id');
242 244  
... ... @@ -245,6 +247,7 @@ var gb_sch_websocket = (function () {
245 247  
246 248 //80不同意
247 249 $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button.reject', function () {
  250 + $(this).attr('disabled', 'disabled');
248 251 var panel = $(this).parents('.sys-note-80')
249 252 , id = panel.data('id');
250 253  
... ... @@ -329,6 +332,24 @@ var gb_sch_websocket = (function () {
329 332 gb_schedule_context_menu.dftz(nextSch);
330 333 });
331 334  
  335 + /**
  336 + * 信使 sys-note-80 编辑
  337 + */
  338 + $(document).on('click', '.sys-note-80 .edit_link', function () {
  339 + var id = $(this).data('id'),
  340 + lineCode = $(this).data('line');
  341 +
  342 + var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
  343 + if(!sch)
  344 + return;
  345 +
  346 + gb_schedule_context_menu.fcxxwt(sch);
  347 + var dl = gb_schedule_table.scroToDl(sch);
  348 + //高亮
  349 + gb_schedule_table.reset_drag_active_all(dl);
  350 + dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
  351 + });
  352 +
332 353 return {
333 354 sock: function () {
334 355 return schSock;
... ...