From 9330dcb0204d5109daf6cd53dd0350fc585a9c54 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Fri, 14 Jul 2017 20:05:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/jobinfo/jobinfo.index.ftl | 2 +- .../WEB-INF/template/joblog/joblog.index.ftl | 8 ++- .../main/webapp/static/js/joblog.index.1.js | 69 ++++++++++++++----- 3 files changed, 56 insertions(+), 23 deletions(-) diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl index c0281fba..e512b174 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl @@ -59,7 +59,7 @@
-
+

调度列表

diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl index fa63a13a..208c8616 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl @@ -80,12 +80,14 @@ id 执行器ID 任务ID + JobKey + <#--执行器地址 + 运行模式 + 任务参数--> + 任务信息 调度时间 调度结果 调度备注 - 执行器地址 - 运行模式 - 任务参数 执行时间 执行结果 执行备注 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 46725dff..34e64dc3 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 @@ -91,6 +91,56 @@ $(function() { { "data": 'id', "bSortable": false, "visible" : false}, { "data": 'jobGroup', "visible" : false}, { "data": 'jobId', "visible" : false}, + { + "data": 'JobKey', + "visible" : true, + "render": function ( data, type, row ) { + var jobKey = row.jobGroup + "_" + row.jobId; + return jobKey; + } + }, + // { "data": 'executorAddress', "visible" : true}, + // { + // "data": 'glueType', + // "visible" : true, + // "render": function ( data, type, row ) { + // if ('GLUE_GROOVY'==row.glueType) { + // return "GLUE模式(Java)"; + // } else if ('GLUE_SHELL'==row.glueType) { + // return "GLUE模式(Shell)"; + // } else if ('GLUE_PYTHON'==row.glueType) { + // return "GLUE模式(Python)"; + // } else if ('BEAN'==row.glueType) { + // return "BEAN模式:" + row.executorHandler; + // } + // return row.executorHandler; + // } + // }, + // { "data": 'executorParam', "visible" : true}, + { + "data": 'JobInfo', + "visible" : true, + "render": function ( data, type, row ) { + + var glueTypeTitle = row.glueType; + if ('GLUE_GROOVY'==row.glueType) { + glueTypeTitle = "GLUE模式(Java)"; + } else if ('GLUE_SHELL'==row.glueType) { + glueTypeTitle = "GLUE模式(Shell)"; + } else if ('GLUE_PYTHON'==row.glueType) { + glueTypeTitle = "GLUE模式(Python)"; + } else if ('BEAN'==row.glueType) { + glueTypeTitle = "BEAN模式:" + row.executorHandler; + } + + var temp = ''; + temp += '执行器地址:' + row.executorAddress; + temp += '
运行模式:' + glueTypeTitle; + temp += '
任务参数:' + row.executorParam; + + return temp; + } + }, { "data": 'triggerTime', "render": function ( data, type, row ) { @@ -110,25 +160,6 @@ $(function() { return data?'查看'+ data +'':"无"; } }, - { "data": 'executorAddress', "visible" : true}, - { - "data": 'glueType', - "visible" : true, - "render": function ( data, type, row ) { - if ('GLUE_GROOVY'==row.glueType) { - return "GLUE模式(Java)"; - } else if ('GLUE_SHELL'==row.glueType) { - return "GLUE模式(Shell)"; - } else if ('GLUE_PYTHON'==row.glueType) { - return "GLUE模式(Python)"; - } else if ('BEAN'==row.glueType) { - return "BEAN模式:" + row.executorHandler; - } - return row.executorHandler; - } - }, - { "data": 'executorParam', "visible" : true}, - { "data": 'handleTime', "render": function ( data, type, row ) {