潘钊 / bsth_control · Commits

Commit b8feebe399387ddb17527199f9831d8e1d6058dd

Authored by ljq
1 parent d357d5cb
build: skipped

退出线调时更改判断条件

Inline Side-by-side
Showing 5 changed files with 30 additions and 13 deletions
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
  View file @b8feebe
... ... @@ -217,7 +217,7 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl<LoggerZndd, Integer>
217 217 for(String line : lineArray){
218 218 List<ScheduleRealInfo> schList = dayOfSchedule.findByLineCode(line);
219 219 for(ScheduleRealInfo sc : schList){
220   - if (sc.getStatus() == 0){
  220 + if (sc.getStatus() == 0 || sc.getStatus() == 1){
221 221 xlNames += sc.getXlName()+",";
222 222 break;
223 223 }
... ...
src/main/resources/static/real_control_v2/js/main.js
  View file @b8feebe
... ... @@ -30,7 +30,7 @@ var gb_main_ep = new EventProxy(),
30 30 //判断如果用户按下了回车键（keycody=13）
31 31 if (keyNum == 13) {
32 32 fired = true;
33   - debugger
  33 +
34 34 let lineCode = gb_schedule_table.TablelineCode;
35 35 document.getElementById("recidress").style.display = 'none';
36 36 recorder.upload("zndd/do/"+lineCode, function (state, e) {
... ...
src/main/resources/static/real_control_v2/js/north/toolbar.js
  View file @b8feebe
... ... @@ -37,18 +37,23 @@ var gb_northToolbar = (function () {
37 37 $('.north .north-toolbar .exit-system').on('click', function () {
38 38 //调度员退出时提示未全部完成班次的线路
39 39 //默认只取一个角色
40   - debugger
41   - if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY"){
  40 + if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY" || user.roles[0].codeName == "BSTH_A"){
42 41 //提示未完成线路 搜索该用户下所有的线路 判断是否完成
43 42 $.get('/logZndd/LineUserAll', {userId: user.id}, function (rs) {
44   - notify_err(rs+"班次还有未完成");
45   - layer.confirm('班次还有未完成，是否要退出线调?', {
46   - btn: ['确定','取消'] //按钮
47   - }, function(){
  43 + if(rs.length > 0){
  44 + notify_err(rs+"班次还有未完成");
  45 + layer.confirm('班次还有未完成，是否要退出线调?', {
  46 + btn: ['确定','取消'] //按钮
  47 + }, function(){
  48 + gb_sch_websocket.sock().close(1000, '退出线调');
  49 + window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
  50 + }, function(){
  51 + });
  52 + }else {
  53 + //关闭websocket 连接
48 54 gb_sch_websocket.sock().close(1000, '退出线调');
49 55 window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
50   - }, function(){
51   - });
  56 + }
52 57 })
53 58 }else {
54 59 //关闭websocket 连接
... ...
src/main/resources/static/real_control_v2/js/stationcf/klyj.js
  View file @b8feebe
... ... @@ -3,7 +3,7 @@
3 3 */
4 4 var gb_klyj = (function () {
5 5 var $wrap = $('.multi_plat_msg_pop_zndd');
6   - var max = 3;
  6 + var max = 0;
7 7 var dataMap = new Map();
8 8 var popcf = function (data) {
9 9 dataMap.set(data.uuid,data);
... ...
src/main/resources/static/real_control_v2/js/zndd/recorder/recorder.js
  View file @b8feebe
... ... @@ -212,7 +212,13 @@
212 212 }
213 213 else if(responseText[1]=="2"){//新增出场班次
214 214 if(schId==''){
215   - notify_err("请选择班次");
  215 + var sch ={
  216 + xlBm : lineCode
  217 + }
  218 + var fun =gb_schedule_context_menu.add_temp_sch_v2;
  219 + fun(sch, function () {
  220 + confirmBtn.trigger('click');
  221 + });
216 222 return;
217 223 }
218 224 var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
... ... @@ -229,7 +235,13 @@
229 235 }
230 236 else if(responseText[1]=="3"){//新增班次
231 237 if(schId==''){
232   - notify_err("请选择班次");
  238 + var sch ={
  239 + xlBm : lineCode
  240 + }
  241 + var fun =gb_schedule_context_menu.add_temp_sch_v2;
  242 + fun(sch, function () {
  243 + confirmBtn.trigger('click');
  244 + });
233 245 return;
234 246 }
235 247 var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
... ...