退出线调时更改判断条件

ljq
1 parent d357d5cb
Showing 5 changed files with 30 additions and 13 deletions
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/js/stationcf/klyj.js
src/main/resources/static/real_control_v2/js/zndd/recorder/recorder.js
@@ -217,7 +217,7 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
         for(String line : lineArray){
             List<ScheduleRealInfo>  schList = dayOfSchedule.findByLineCode(line);
             for(ScheduleRealInfo sc : schList){
-                if (sc.getStatus() == 0){
+                if (sc.getStatus() == 0 || sc.getStatus() == 1){
                     xlNames += sc.getXlName()+",";
                     break;
                 }
@@ -30,7 +30,7 @@ var gb_main_ep = new EventProxy(),
             //判断如果用户按下了回车键（keycody=13）
             if (keyNum == 13) {
                 fired = true;
-                debugger
+
                 let lineCode = gb_schedule_table.TablelineCode;
                 document.getElementById("recidress").style.display = 'none';
                 recorder.upload("zndd/do/"+lineCode, function (state, e) {
@@ -37,18 +37,23 @@ var gb_northToolbar = (function () {
             $('.north .north-toolbar .exit-system').on('click', function () {
                 //调度员退出时提示未全部完成班次的线路
                 //默认只取一个角色
-                debugger
-                if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY"){
+                if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY" || user.roles[0].codeName == "BSTH_A"){
                     //提示未完成线路 搜索该用户下所有的线路 判断是否完成
                     $.get('/logZndd/LineUserAll', {userId: user.id}, function (rs) {
-                        notify_err(rs+"班次还有未完成");
-                        layer.confirm('班次还有未完成，是否要退出线调?', {
-                            btn: ['确定','取消'] //按钮
-                        }, function(){
+                        if(rs.length > 0){
+                            notify_err(rs+"班次还有未完成");
+                            layer.confirm('班次还有未完成，是否要退出线调?', {
+                                btn: ['确定','取消'] //按钮
+                            }, function(){
+                                gb_sch_websocket.sock().close(1000, '退出线调');
+                                window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
+                            }, function(){
+                            });
+                        }else {
+                            //关闭websocket 连接
                             gb_sch_websocket.sock().close(1000, '退出线调');
                             window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
-                        }, function(){
-                        });
+                        }
                     })
                 }else {
                     //关闭websocket 连接
@@ -3,7 +3,7 @@
  */
 var gb_klyj = (function () {
     var $wrap = $('.multi_plat_msg_pop_zndd');
-    var max = 3;
+    var max = 0;
     var dataMap = new Map();
     var popcf = function (data) {
         dataMap.set(data.uuid,data);
@@ -212,7 +212,13 @@
                     }
                     else if(responseText[1]=="2"){//新增出场班次
                         if(schId==''){
-                            notify_err("请选择班次");
+                            var sch ={
+                                xlBm : lineCode
+                            }
+                            var fun =gb_schedule_context_menu.add_temp_sch_v2;
+                            fun(sch, function () {
+                                confirmBtn.trigger('click');
+                            });
                             return;
                         }
                         var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
@@ -229,7 +235,13 @@
                     }
                     else if(responseText[1]=="3"){//新增班次
                         if(schId==''){
-                            notify_err("请选择班次");
+                            var sch ={
+                                xlBm : lineCode
+                            }
+                            var fun =gb_schedule_context_menu.add_temp_sch_v2;
+                            fun(sch, function () {
+                                confirmBtn.trigger('click');
+                            });
                             return;
                         }
                         var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];