xueli.xue 8 年之前
父節點
當前提交
6169ac546f

+ 1 - 1
xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/jobcode.index.ftl

@@ -63,7 +63,7 @@
 	                    	<div class="input-group-btn">
 	                      		<button type="button" class="btn btn-info">备注</button>
 	                    	</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 class="col-xs-2">

+ 3 - 3
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl

@@ -68,17 +68,17 @@
 			            <div class="box-header">
 			            	<h3 class="box-title">调度列表</h3>
 			            </div>
-			            <div class="box-body">
+			            <div class="box-body" >
 			              	<table id="job_list" class="table table-bordered table-striped">
 				                <thead>
 					            	<tr>
 					            		<th name="id" >id</th>
 					                	<th name="jobGroup" >jobGroup</th>
-                                        <th name="childJobKey" >任务Key</th>
+                                        <th name="childJobKey" >JobKey</th>
 					                  	<th name="jobDesc" >描述</th>
-					                  	<th name="jobCron" >Cron</th>
                                         <th name="executorHandler" >JobJandler</th>
 					                  	<th name="executorParam" >任务参数</th>
+                                        <th name="jobCron" >Cron</th>
 					                  	<th name="addTime" >新增时间</th>
 					                  	<th name="updateTime" >更新时间</th>
 					                  	<th name="author" >负责人</th>

+ 10 - 5
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js

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