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

Coding

This commit is contained in:
xueli.xue 2017-03-12 19:04:26 +08:00
parent 7d31e9838a
commit 6169ac546f
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/jobcode.index.ftl
View File

@ -63,7 +63,7 @@
<div class="input-group-btn"> <div class="input-group-btn">
<button type="button" class="btn btn-info">备注</button> <button type="button" class="btn btn-info">备注</button>
</div> </div>
<input type="text" class="form-control" id="glueRemark" value="${jobName}" autocomplete="on" > <input type="text" class="form-control" id="glueRemark" value="" autocomplete="on" >
</div> </div>
</div> </div>
<div class="col-xs-2"> <div class="col-xs-2">

4
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
View File

@ -74,11 +74,11 @@
<tr> <tr>
<th name="id" >id</th> <th name="id" >id</th>
<th name="jobGroup" >jobGroup</th> <th name="jobGroup" >jobGroup</th>
<th name="childJobKey" >任务Key</th> <th name="childJobKey" >JobKey</th>
<th name="jobDesc" >描述</th> <th name="jobDesc" >描述</th>
<th name="jobCron" >Cron</th>
<th name="executorHandler" >JobJandler</th> <th name="executorHandler" >JobJandler</th>
<th name="executorParam" >任务参数</th> <th name="executorParam" >任务参数</th>
<th name="jobCron" >Cron</th>
<th name="addTime" >新增时间</th> <th name="addTime" >新增时间</th>
<th name="updateTime" >更新时间</th> <th name="updateTime" >更新时间</th>
<th name="author" >负责人</th> <th name="author" >负责人</th>

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

@ -36,22 +36,24 @@ $(function() {
}, },
{ {
"data": 'childJobKey', "data": 'childJobKey',
"width":'10%',
"visible" : true, "visible" : true,
"render": function ( data, type, row ) { "render": function ( data, type, row ) {
var jobKey = row.jobGroup + "_" + row.id; var jobKey = row.jobGroup + "_" + row.id;
return jobKey; return jobKey;
} }
}, },
{ "data": 'jobDesc', "visible" : true}, { "data": 'jobDesc', "visible" : true,"width":'20%'},
{ "data": 'jobCron', "visible" : true},
{ {
"data": 'executorHandler', "data": 'executorHandler',
"width":'20%',
"visible" : true, "visible" : true,
"render": function ( data, type, row ) { "render": function ( data, type, row ) {
return (row.glueSwitch > 0)? "GLUE模式" : data; return (row.glueSwitch > 0)? "GLUE模式" : data;
} }
}, },
{ "data": 'executorParam', "visible" : false}, { "data": 'executorParam', "visible" : false},
{ "data": 'jobCron', "visible" : true,"width":'10%'},
{ {
"data": 'addTime', "data": 'addTime',
"visible" : false, "visible" : false,
@ -66,11 +68,12 @@ $(function() {
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": 'author', "visible" : true}, { "data": 'author', "visible" : true, "width":'10%'},
{ "data": 'alarmEmail', "visible" : false}, { "data": 'alarmEmail', "visible" : false},
{ "data": 'glueSwitch', "visible" : false}, { "data": 'glueSwitch', "visible" : false},
{ {
"data": 'jobStatus', "data": 'jobStatus',
"width":'10%',
"visible" : true, "visible" : true,
"render": function ( data, type, row ) { "render": function ( data, type, row ) {
if ('NORMAL' == data) { if ('NORMAL' == data) {
@ -83,7 +86,9 @@ $(function() {
return data; return data;
} }
}, },
{ "data": '操作' , {
"data": '操作' ,
"width":'15%',
"render": function ( data, type, row ) { "render": function ( data, type, row ) {
return function(){ return function(){
// status // status