Skip to content

熊鹏飞 / xxljob220

Go to a project
Commit 9330dcb0 by xuxueli
Options

任务日志展示优化

parent 34299011
Inline Side-by-side
Showing with 56 additions and 23 deletions
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header hide">
<h3 class="box-title">调度列表</h3> <h3 class="box-title">调度列表</h3>
</div> </div>
<div class="box-body" > <div class="box-body" >
......
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
...@@ -80,12 +80,14 @@ ...@@ -80,12 +80,14 @@
<th name="id" >id</th> <th name="id" >id</th>
<th name="jobGroup" >执行器ID</th> <th name="jobGroup" >执行器ID</th>
<th name="jobId" >任务ID</th> <th name="jobId" >任务ID</th>
<th name="JobKey" >JobKey</th>
<#--<th name="executorAddress" >执行器地址</th>
<th name="glueType" >运行模式</th>
<th name="executorParam" >任务参数</th>-->
<th name="JobInfo" >任务信息</th>
<th name="triggerTime" >调度时间</th> <th name="triggerTime" >调度时间</th>
<th name="triggerCode" >调度结果</th> <th name="triggerCode" >调度结果</th>
<th name="triggerMsg" >调度备注</th> <th name="triggerMsg" >调度备注</th>
<th name="executorAddress" >执行器地址</th>
<th name="glueType" >运行模式</th>
<th name="executorParam" >任务参数</th>
<th name="handleTime" >执行时间</th> <th name="handleTime" >执行时间</th>
<th name="handleCode" >执行结果</th> <th name="handleCode" >执行结果</th>
<th name="handleMsg" >执行备注</th> <th name="handleMsg" >执行备注</th>
......
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
...@@ -92,6 +92,56 @@ $(function() { ...@@ -92,6 +92,56 @@ $(function() {
{ "data": 'jobGroup', "visible" : false}, { "data": 'jobGroup', "visible" : false},
{ "data": 'jobId', "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 += '<br>运行模式：' + glueTypeTitle;
temp += '<br>任务参数：' + row.executorParam;
return temp;
}
},
{
"data": 'triggerTime', "data": 'triggerTime',
"render": function ( data, type, row ) { "render": function ( data, type, row ) {
return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):""; return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
...@@ -110,25 +160,6 @@ $(function() { ...@@ -110,25 +160,6 @@ $(function() {
return data?'<a class="logTips" href="javascript:;" >查看<span style="display:none;">'+ data +'</span></a>':"无"; return data?'<a class="logTips" href="javascript:;" >查看<span style="display:none;">'+ data +'</span></a>':"无";
} }
}, },
{ "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', "data": 'handleTime',
"render": function ( data, type, row ) { "render": function ( data, type, row ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment