Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
75c7fe48
authored
Dec 29, 2017
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
更新RM
parent
e994c8f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
4 deletions
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
View file @
75c7fe48
...
@@ -21,10 +21,16 @@ $(function() {
...
@@ -21,10 +21,16 @@ $(function() {
"ordering"
:
false
,
"ordering"
:
false
,
//"scrollX": true, // X轴滚动条,取消自适应
//"scrollX": true, // X轴滚动条,取消自适应
"columns"
:
[
"columns"
:
[
{
"data"
:
'id'
,
"bSortable"
:
false
,
"visible"
:
true
},
{
"data"
:
'id'
,
"bSortable"
:
false
,
"visible"
:
true
,
"width"
:
'10%'
},
{
{
"data"
:
'jobGroup'
,
"data"
:
'jobGroup'
,
"visible"
:
false
,
"visible"
:
false
,
"width"
:
'20%'
,
"render"
:
function
(
data
,
type
,
row
)
{
"render"
:
function
(
data
,
type
,
row
)
{
var
groupMenu
=
$
(
"#jobGroup"
).
find
(
"option"
);
var
groupMenu
=
$
(
"#jobGroup"
).
find
(
"option"
);
for
(
var
index
in
$
(
"#jobGroup"
).
find
(
"option"
))
{
for
(
var
index
in
$
(
"#jobGroup"
).
find
(
"option"
))
{
...
@@ -35,7 +41,11 @@ $(function() {
...
@@ -35,7 +41,11 @@ $(function() {
return
data
;
return
data
;
}
}
},
},
{
"data"
:
'jobDesc'
,
"visible"
:
true
,
"width"
:
'20%'
},
{
"data"
:
'jobDesc'
,
"visible"
:
true
,
"width"
:
'20%'
},
{
{
"data"
:
'glueType'
,
"data"
:
'glueType'
,
"width"
:
'20%'
,
"width"
:
'20%'
,
...
@@ -56,7 +66,11 @@ $(function() {
...
@@ -56,7 +66,11 @@ $(function() {
}
}
},
},
{
"data"
:
'executorParam'
,
"visible"
:
false
},
{
"data"
:
'executorParam'
,
"visible"
:
false
},
{
"data"
:
'jobCron'
,
"visible"
:
true
,
"width"
:
'10%'
},
{
"data"
:
'jobCron'
,
"visible"
:
true
,
"width"
:
'10%'
},
{
{
"data"
:
'addTime'
,
"data"
:
'addTime'
,
"visible"
:
false
,
"visible"
:
false
,
...
...
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
View file @
75c7fe48
...
@@ -92,6 +92,7 @@ $(function() {
...
@@ -92,6 +92,7 @@ $(function() {
{
{
"data"
:
'jobId'
,
"data"
:
'jobId'
,
"visible"
:
true
,
"visible"
:
true
,
"width"
:
'10%'
,
"render"
:
function
(
data
,
type
,
row
)
{
"render"
:
function
(
data
,
type
,
row
)
{
var
glueTypeTitle
=
row
.
glueType
;
var
glueTypeTitle
=
row
.
glueType
;
if
(
'GLUE_GROOVY'
==
row
.
glueType
)
{
if
(
'GLUE_GROOVY'
==
row
.
glueType
)
{
...
@@ -117,12 +118,14 @@ $(function() {
...
@@ -117,12 +118,14 @@ $(function() {
{
"data"
:
'jobGroup'
,
"visible"
:
false
},
{
"data"
:
'jobGroup'
,
"visible"
:
false
},
{
{
"data"
:
'triggerTime'
,
"data"
:
'triggerTime'
,
"width"
:
'16%'
,
"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"
):
""
;
}
}
},
},
{
{
"data"
:
'triggerCode'
,
"data"
:
'triggerCode'
,
"width"
:
'12%'
,
"render"
:
function
(
data
,
type
,
row
)
{
"render"
:
function
(
data
,
type
,
row
)
{
var
html
=
data
;
var
html
=
data
;
if
(
data
==
200
)
{
if
(
data
==
200
)
{
...
@@ -137,18 +140,21 @@ $(function() {
...
@@ -137,18 +140,21 @@ $(function() {
},
},
{
{
"data"
:
'triggerMsg'
,
"data"
:
'triggerMsg'
,
"width"
:
'12%'
,
"render"
:
function
(
data
,
type
,
row
)
{
"render"
:
function
(
data
,
type
,
row
)
{
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"
:
'handleTime'
,
"data"
:
'handleTime'
,
"width"
:
'16%'
,
"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"
):
""
;
}
}
},
},
{
{
"data"
:
'handleCode'
,
"data"
:
'handleCode'
,
"width"
:
'12%'
,
"render"
:
function
(
data
,
type
,
row
)
{
"render"
:
function
(
data
,
type
,
row
)
{
var
html
=
data
;
var
html
=
data
;
if
(
data
==
200
)
{
if
(
data
==
200
)
{
...
@@ -165,6 +171,7 @@ $(function() {
...
@@ -165,6 +171,7 @@ $(function() {
},
},
{
{
"data"
:
'handleMsg'
,
"data"
:
'handleMsg'
,
"width"
:
'12%'
,
"render"
:
function
(
data
,
type
,
row
)
{
"render"
:
function
(
data
,
type
,
row
)
{
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>'
:
"无"
;
}
}
...
@@ -172,7 +179,7 @@ $(function() {
...
@@ -172,7 +179,7 @@ $(function() {
{
{
"data"
:
'handleMsg'
,
"data"
:
'handleMsg'
,
"bSortable"
:
false
,
"bSortable"
:
false
,
"width"
:
"8%"
,
"width"
:
'10%'
,
"render"
:
function
(
data
,
type
,
row
)
{
"render"
:
function
(
data
,
type
,
row
)
{
// better support expression or string, not function
// better support expression or string, not function
return
function
()
{
return
function
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment