From 75c7fe482bf27b99e70c42eb2d46c2bd388d54c9 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Fri, 29 Dec 2017 20:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0RM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/webapp/static/js/jobinfo.index.1.js | 20 ++++++++++++++++---
.../main/webapp/static/js/joblog.index.1.js | 9 ++++++++-
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
index 49fca799..109d22ad 100644
--- a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
@@ -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,
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 fb7aa64e..11195235 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
@@ -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?'查看'+ data +'':"无";
}
},
{
"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?'查看'+ data +'':"无";
}
@@ -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 () {