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

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
xueli.xue 2020-10-27 20:36:07 +08:00
parent 0c5cbcc66a 5a1fa6dcca
commit a68dfbec25
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
View File

@ -116,7 +116,7 @@ $(function() {
"data": 'triggerTime', "data": 'triggerTime',
"width":'20%', "width":'20%',
"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(data).format("YYYY-MM-DD HH:mm:ss"):"";
} }
}, },
{ {
@ -145,7 +145,7 @@ $(function() {
"data": 'handleTime', "data": 'handleTime',
"width":'20%', "width":'20%',
"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(data).format("YYYY-MM-DD HH:mm:ss"):"";
} }
}, },
{ {