From aeb1df7ea38cd24cebb9b8bb88799b55886d528e Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Mon, 8 May 2017 16:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E7=BB=84=E4=BB=B6=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=9B=BF=E6=8D=A2=E4=B8=BAlayer=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + .../main/webapp/static/js/joblog.index.1.js | 112 ++++++++++++------ .../src/main/webapp/static/js/xxl.alert.1.js | 36 ------ 3 files changed, 74 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 334a5a98..9cc0186c 100644 --- a/README.md +++ b/README.md @@ -814,6 +814,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 4、JettyServer关闭逻辑优化,修复执行器无法正常关闭导致端口占用和频繁打印c3p0日志的问题; - 5、JobHandler中开启子线程时,支持子线程输出执行日志并通过Rolling查看。 - 6、任务日志清理功能; +- 7、弹框组件统一替换为layer; #### TODO LIST - 1、任务并行触发处理规则:单机串行队列(默认)、单机并行、串行忽略、单机覆盖; diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js index d3bdabfa..46725dff 100644 --- a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js @@ -19,7 +19,11 @@ $(function() { $("#jobId").find("option[value='" + $("#jobId").attr("paramVal") + "']").attr("selected",true); } } else { - ComAlertTec.show(data.msg); + layer.open({ + title: '系统提示', + content: (data.msg || "接口异常"), + icon: '2' + }); } }, }); @@ -188,12 +192,6 @@ $(function() { } }); - // 任务数据 - $('#joblog_list').on('click', '.logMsg', function(){ - var msg = $(this).find('span').html(); - ComAlert.show(2, msg); - }); - // 日志弹框提示 $('#joblog_list').on('click', '.logTips', function(){ var msg = $(this).find('span').html(); @@ -211,22 +209,6 @@ $(function() { window.open(base_url + '/joblog/logDetailPage?id=' + _id); return; - - /* - $.ajax({ - type : 'POST', - url : base_url + '/joblog/logDetail', - data : {"id":_id}, - dataType : "json", - success : function(data){ - if (data.code == 200) { - ComAlertTec.show('
'+ data.content +'
'); - } else { - ComAlertTec.show(data.msg); - } - }, - }); - */ }); /** @@ -234,22 +216,36 @@ $(function() { */ $('#joblog_list').on('click', '.logKill', function(){ var _id = $(this).attr('_id'); - ComConfirm.show("确认主动终止任务?", function(){ - $.ajax({ - type : 'POST', - url : base_url + '/joblog/logKill', - data : {"id":_id}, - dataType : "json", - success : function(data){ - if (data.code == 200) { - ComAlert.show(1, '操作成功'); - logTable.fnDraw(); - } else { - ComAlert.show(2, data.msg); - } - }, - }); - }); + + layer.confirm('确认主动终止任务?', {icon: 3, title:'系统提示'}, function(index){ + layer.close(index); + + $.ajax({ + type : 'POST', + url : base_url + '/joblog/logKill', + data : {"id":_id}, + dataType : "json", + success : function(data){ + if (data.code == 200) { + layer.open({ + title: '系统提示', + content: '操作成功', + icon: '1', + end: function(layero, index){ + logTable.fnDraw(); + } + }); + } else { + layer.open({ + title: '系统提示', + content: (data.msg || "操作失败"), + icon: '2' + }); + } + }, + }); + }); + }); /** @@ -298,3 +294,41 @@ $(function() { }); }); + + +// 提示-科技主题 +var ComAlertTec = { + html:function(){ + var html = + ''; + return html; + }, + show:function(msg, callback){ + // dom init + if ($('#ComAlertTec').length == 0){ + $('body').append(ComAlertTec.html()); + } + + // 弹框初始 + $('#ComAlertTec .alert').html(msg); + $('#ComAlertTec').modal('show'); + + $('#ComAlertTec .ok').click(function(){ + $('#ComAlertTec').modal('hide'); + if(typeof callback == 'function') { + callback(); + } + }); + } +}; diff --git a/xxl-job-admin/src/main/webapp/static/js/xxl.alert.1.js b/xxl-job-admin/src/main/webapp/static/js/xxl.alert.1.js index 0c1e95e8..021c4b76 100644 --- a/xxl-job-admin/src/main/webapp/static/js/xxl.alert.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/xxl.alert.1.js @@ -96,39 +96,3 @@ var ComConfirm = { }); } }; -// 提示-科技主题 -var ComAlertTec = { - html:function(){ - var html = - ''; - return html; - }, - show:function(msg, callback){ - // dom init - if ($('#ComAlertTec').length == 0){ - $('body').append(ComAlertTec.html()); - } - - // 弹框初始 - $('#ComAlertTec .alert').html(msg); - $('#ComAlertTec').modal('show'); - - $('#ComAlertTec .ok').click(function(){ - $('#ComAlertTec').modal('hide'); - if(typeof callback == 'function') { - callback(); - } - }); - } -}; \ No newline at end of file