ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务日志展示优化

This commit is contained in:
xuxueli 2017-07-14 20:20:15 +08:00
parent 9330dcb020
commit be3fc368cb
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
View File

@ -84,7 +84,6 @@
<#--<th name="executorAddress" >执行器地址</th>
<th name="glueType" >运行模式</th>
<th name="executorParam" >任务参数</th>-->
<th name="JobInfo" >任务信息</th>
<th name="triggerTime" >调度时间</th>
<th name="triggerCode" >调度结果</th>
<th name="triggerMsg" >调度备注</th>

43
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
View File

@ -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 += '<br>运行模式：' + glueTypeTitle;
temp += '<br>任务参数：' + row.executorParam;
return '<a class="logTips" href="javascript:;" >'+ jobKey +'<span style="display:none;">'+ temp +'</span></a>';
}
},
// { "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 += '<br>运行模式：' + glueTypeTitle;
temp += '<br>任务参数：' + row.executorParam;
return temp;
}
},
{
"data": 'triggerTime',
"render": function ( data, type, row ) {