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

更新RM

This commit is contained in:
xuxueli 2017-12-29 20:51:11 +08:00
parent e994c8f5b5
commit 75c7fe482b
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
View File

@ -21,10 +21,16 @@ $(function() {
"ordering": false,
//"scrollX": true, // X轴滚动条，取消自适应
"columns": [
{ "data": 'id', "bSortable": false, "visible" : true},
{
"data": 'id',
"bSortable": false,
"visible" : true,
"width":'10%'
},
{
"data": 'jobGroup',
"visible" : false,
"width":'20%',
"render": function ( data, type, row ) {
var groupMenu = $("#jobGroup").find("option");
for ( var index in $("#jobGroup").find("option")) {
@ -35,7 +41,11 @@ $(function() {
return data;
}
},
{ "data": 'jobDesc', "visible" : true,"width":'20%'},
{
"data": 'jobDesc',
"visible" : true,
"width":'20%'
},
{
"data": 'glueType',
"width":'20%',
@ -56,7 +66,11 @@ $(function() {
}
},
{ "data": 'executorParam', "visible" : false},
{ "data": 'jobCron', "visible" : true,"width":'10%'},
{
"data": 'jobCron',
"visible" : true,
"width":'10%'
},
{
"data": 'addTime',
"visible" : false,

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

@ -92,6 +92,7 @@ $(function() {
{
"data": 'jobId',
"visible" : true,
"width":'10%',
"render": function ( data, type, row ) {
var glueTypeTitle = row.glueType;
if ('GLUE_GROOVY'==row.glueType) {
@ -117,12 +118,14 @@ $(function() {
{ "data": 'jobGroup', "visible" : false},
{
"data": 'triggerTime',
"width":'16%',
"render": function ( data, type, row ) {
return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
}
},
{
"data": 'triggerCode',
"width":'12%',
"render": function ( data, type, row ) {
var html = data;
if (data == 200) {
@ -137,18 +140,21 @@ $(function() {
},
{
"data": 'triggerMsg',
"width":'12%',
"render": function ( data, type, row ) {
return data?'<a class="logTips" href="javascript:;" >查看<span style="display:none;">'+ data +'</span></a>':"无";
}
},
{
"data": 'handleTime',
"width":'16%',
"render": function ( data, type, row ) {
return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
}
},
{
"data": 'handleCode',
"width":'12%',
"render": function ( data, type, row ) {
var html = data;
if (data == 200) {
@ -165,6 +171,7 @@ $(function() {
},
{
"data": 'handleMsg',
"width":'12%',
"render": function ( data, type, row ) {
return data?'<a class="logTips" href="javascript:;" >查看<span style="display:none;">'+ data +'</span></a>':"无";
}
@ -172,7 +179,7 @@ $(function() {
{
"data": 'handleMsg' ,
"bSortable": false,
"width": "8%" ,
"width":'10%',
"render": function ( data, type, row ) {
// better support expression or string, not function
return function () {