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 208c8616..a7500da2 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 @@ -84,7 +84,6 @@ <#--执行器地址 运行模式 任务参数--> - 任务信息 调度时间 调度结果 调度备注 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 34e64dc3..237dfb8a 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 @@ -96,7 +96,24 @@ $(function() { "visible" : true, "render": function ( data, type, row ) { var jobKey = row.jobGroup + "_" + row.jobId; - return jobKey; + + 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 ''+ jobKey +''+ temp +''; } }, // { "data": 'executorAddress', "visible" : true}, @@ -117,30 +134,6 @@ $(function() { // } // }, // { "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 ) {