Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents a0048b99 9a8a3ad8
Showing 10 changed files with 84 additions and 10 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/entity/directive/D80.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/alone_page/map/alone_wrap.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sys_mailbox.html
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
@@ -78,6 +78,12 @@ public class PilotReport {
             //d80MultiMap.put(d80.getData().getLineId().toString(), d80);
             String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+            //上报时，在执行的班次
+            if(StringUtils.isNotEmpty(nbbm)){
+                ScheduleRealInfo sch = dayOfSchedule.executeCurr(nbbm);
+                if(null != sch)
+                    d80.setSchId(sch.getId());
+            }
             //处理
             switch (d80.getData().getRequestCode()) {
                 //出场请求
@@ -62,7 +62,17 @@ public class D80 {
 	private Date handleTime;
 	private String remarks;
-	
+
+	private Long schId;
+
+	public Long getSchId() {
+		return schId;
+	}
+
+	public void setSchId(Long schId) {
+		this.schId = schId;
+	}
+
 	@Embeddable
 	public static class D80Data {
@@ -111,7 +111,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 return -1;
             }
             String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
-                    + sch.getQdzName() + "发往" + sch.getZdzName() ;
+                    + sch.getQdzName() + "发往" + sch.getZdzName() + ";应到 " + sch.getZdsj();
             if(sch.getBcType().equals("venting")){
                 text += " (直放)";
@@ -3270,7 +3270,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleRealInfo sch = dayOfSchedule.get(id);
             if (sch != null) {
                 sch.setBcType(bcType);
-                sch.addRemarks(remarks);
+                sch.setRemarks(remarks);
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
@@ -42,13 +42,23 @@
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/themes/airbnb.css" merge="plugins"/>
     <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
+
+    <style>
+        .main-container .map-panel{
+            position: absolute;
+            top:0;
+            left: 0;
+            width: 20px;
+            z-index: 999;
+            height: 20px;
+        }
+    </style>
 </head>
 <body>
 <div class="main-container" style="height: 100%;">
     <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">加载中...</span>
 </div>
-
 <!-- 地图相关 -->
 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
@@ -108,6 +118,8 @@
         //嵌入地图页面
         $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
             $('.map-system-msg.flex-left').remove();
+
+            $(this).append('<span class="map-panel"></span>');//判断里有JS判定这个容器是否显示
         });
     });
@@ -164,7 +164,7 @@
                 $('[name=bcType]', modal).on('change', function(){
                     var type = $(this).val();
-                    if(sch.bcType != 'normal')
+                    if(sch.bcType == 'in' || sch.bcType == 'out')
                         return;
                     //重置类型，等待调整界面触发刷新事件
@@ -188,6 +188,18 @@
                         $(detailModal).trigger('init', {sch: sch, parentModal: modal, _dfsj: $('[name=dfsj]', modal).val()});
                     })
                 });
+
+                /**
+                 * 相同选项 也触发 onchange
+                 */
+                $('[name=bcType]', modal).mousedown(function () {
+                    this.sindex = $(this)[0].selectedIndex;
+                    $(this)[0].selectedIndex = 0;
+                }).mouseout(function () {
+                    if ($(this)[0].selectedIndex === 0) {
+                        $(this)[0].selectedIndex = this.sindex;
+                    }
+                });
             });
         })();
     </script>
@@ -267,7 +267,7 @@
                 $('select[name=bcType]', modal).on('change', function(){
                     var type = $(this).val();
-                    if(sch.bcType != 'normal')
+                    if(sch.bcType == 'in' || sch.bcType == 'out')
                         return;
                     //重置类型，等待调整界面触发刷新事件
@@ -289,6 +289,18 @@
                         $(detailModal).trigger('init', {sch: sch, parentModal: modal});
                     })
                 });
+
+                /**
+                 * 相同选项 也触发 onchange
+                 */
+                $('select[name=bcType]', modal).mousedown(function () {
+                    this.sindex = $(this)[0].selectedIndex;
+                    $(this)[0].selectedIndex = 0;
+                }).mouseout(function () {
+                    if ($(this)[0].selectedIndex === 0) {
+                        $(this)[0].selectedIndex = this.sindex;
+                    }
+                });
             });
             function validation_s_e_Time(data) {
@@ -5,8 +5,9 @@
                 <h4 class="uk-panel-title">{{data.nbbm}} {{text}}</h4>
                 <code>{{dateStr}}</code>
                 <div class="uk-button-group">
-                    <a class="uk-button uk-button-mini uk-button-primary">同意</a>
-                    <a class="uk-button uk-button-mini reject">不同意</a>
+                    <button class="uk-button uk-button-mini uk-button-primary">同意</button>
+                    <button class="uk-button uk-button-mini reject">不同意</button>
+                    <a class="edit_link" data-id="{{schId}}" data-line="{{data.lineId}}" >编辑</a>
                 </div>
             </div>
         </div>
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-11-01',
-        text: '<h5>1、修正了XP系统下主页滚动条的显示问题（Windows XP sp3 + chrome 49.0.2623.112）。</h5>'
+        date: '2017-11-02',
+        text: '<h5>1、修正二次放站时，需要先将班次切回正常班次的问题。</h5><h5>2、驾驶员请求信使上，添加“编辑”链接，可弹出对应班次的发车信息微调框。</h5>'
     };
     var storage = window.localStorage
@@ -235,8 +235,10 @@ var gb_sch_websocket = (function () {
         dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
     });
+
     //80同意
     $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button-primary', function () {
+        $(this).attr('disabled', 'disabled');
         var panel = $(this).parents('.sys-note-80')
             , id = panel.data('id');
@@ -245,6 +247,7 @@ var gb_sch_websocket = (function () {
     //80不同意
     $(document).on('click', '.sys-mailbox .sys-note-80 .uk-button.reject', function () {
+        $(this).attr('disabled', 'disabled');
         var panel = $(this).parents('.sys-note-80')
             , id = panel.data('id');
@@ -329,6 +332,24 @@ var gb_sch_websocket = (function () {
         gb_schedule_context_menu.dftz(nextSch);
     });
+    /**
+     * 信使 sys-note-80 编辑
+     */
+    $(document).on('click', '.sys-note-80 .edit_link', function () {
+        var id = $(this).data('id'),
+            lineCode = $(this).data('line');
+
+        var sch = gb_schedule_table.findScheduleByLine(lineCode)[id];
+        if(!sch)
+            return;
+
+        gb_schedule_context_menu.fcxxwt(sch);
+        var dl = gb_schedule_table.scroToDl(sch);
+        //高亮
+        gb_schedule_table.reset_drag_active_all(dl);
+        dl.addClass('relevance-active intimity').find('dd:eq(5)').trigger('click');
+    });
+
     return {
         sock: function () {
             return schSock;