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

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

63
 	                    	<div class="input-group-btn">
63
 	                    	<div class="input-group-btn">
64
 	                      		<button type="button" class="btn btn-info">备注</button>
64
 	                      		<button type="button" class="btn btn-info">备注</button>
65
 	                    	</div>
65
 	                    	</div>
66
-	                    	<input type="text" class="form-control" id="glueRemark" value="${jobName}" autocomplete="on" >
66
+	                    	<input type="text" class="form-control" id="glueRemark" value="" autocomplete="on" >
67
 	                  	</div>
67
 	                  	</div>
68
 		            </div>
68
 		            </div>
69
 		            <div class="col-xs-2">
69
 		            <div class="col-xs-2">

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

68
 			            <div class="box-header">
68
 			            <div class="box-header">
69
 			            	<h3 class="box-title">调度列表</h3>
69
 			            	<h3 class="box-title">调度列表</h3>
70
 			            </div>
70
 			            </div>
71
-			            <div class="box-body">
71
+			            <div class="box-body" >
72
 			              	<table id="job_list" class="table table-bordered table-striped">
72
 			              	<table id="job_list" class="table table-bordered table-striped">
73
 				                <thead>
73
 				                <thead>
74
 					            	<tr>
74
 					            	<tr>
75
 					            		<th name="id" >id</th>
75
 					            		<th name="id" >id</th>
76
 					                	<th name="jobGroup" >jobGroup</th>
76
 					                	<th name="jobGroup" >jobGroup</th>
77
-                                        <th name="childJobKey" >任务Key</th>
77
+                                        <th name="childJobKey" >JobKey</th>
78
 					                  	<th name="jobDesc" >描述</th>
78
 					                  	<th name="jobDesc" >描述</th>
79
-					                  	<th name="jobCron" >Cron</th>
80
                                         <th name="executorHandler" >JobJandler</th>
79
                                         <th name="executorHandler" >JobJandler</th>
81
 					                  	<th name="executorParam" >任务参数</th>
80
 					                  	<th name="executorParam" >任务参数</th>
81
+                                        <th name="jobCron" >Cron</th>
82
 					                  	<th name="addTime" >新增时间</th>
82
 					                  	<th name="addTime" >新增时间</th>
83
 					                  	<th name="updateTime" >更新时间</th>
83
 					                  	<th name="updateTime" >更新时间</th>
84
 					                  	<th name="author" >负责人</th>
84
 					                  	<th name="author" >负责人</th>

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

36
             		},
36
             		},
37
 					{
37
 					{
38
 						"data": 'childJobKey',
38
 						"data": 'childJobKey',
39
+						"width":'10%',
39
 						"visible" : true,
40
 						"visible" : true,
40
 						"render": function ( data, type, row ) {
41
 						"render": function ( data, type, row ) {
41
 							var jobKey = row.jobGroup + "_" + row.id;
42
 							var jobKey = row.jobGroup + "_" + row.id;
42
 							return jobKey;
43
 							return jobKey;
43
 						}
44
 						}
44
 					},
45
 					},
45
-	                { "data": 'jobDesc', "visible" : true},
46
-	                { "data": 'jobCron', "visible" : true},
46
+	                { "data": 'jobDesc', "visible" : true,"width":'20%'},
47
 					{
47
 					{
48
 						"data": 'executorHandler',
48
 						"data": 'executorHandler',
49
+						"width":'20%',
49
 						"visible" : true,
50
 						"visible" : true,
50
 						"render": function ( data, type, row ) {
51
 						"render": function ( data, type, row ) {
51
 							return (row.glueSwitch > 0)? "GLUE模式" : data;
52
 							return (row.glueSwitch > 0)? "GLUE模式" : data;
52
 						}
53
 						}
53
 					},
54
 					},
54
 	                { "data": 'executorParam', "visible" : false},
55
 	                { "data": 'executorParam', "visible" : false},
56
+					{ "data": 'jobCron', "visible" : true,"width":'10%'},
55
 	                { 
57
 	                { 
56
 	                	"data": 'addTime', 
58
 	                	"data": 'addTime', 
57
 	                	"visible" : false, 
59
 	                	"visible" : false, 
66
 	                		return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
68
 	                		return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
67
 	                	}
69
 	                	}
68
 	                },
70
 	                },
69
-	                { "data": 'author', "visible" : true},
71
+	                { "data": 'author', "visible" : true, "width":'10%'},
70
 	                { "data": 'alarmEmail', "visible" : false},
72
 	                { "data": 'alarmEmail', "visible" : false},
71
 	                { "data": 'glueSwitch', "visible" : false},
73
 	                { "data": 'glueSwitch', "visible" : false},
72
 	                { 
74
 	                { 
73
-	                	"data": 'jobStatus', 
75
+	                	"data": 'jobStatus',
76
+						"width":'10%',
74
 	                	"visible" : true,
77
 	                	"visible" : true,
75
 	                	"render": function ( data, type, row ) {
78
 	                	"render": function ( data, type, row ) {
76
 	                		if ('NORMAL' == data) {
79
 	                		if ('NORMAL' == data) {
83
 	                		return data;
86
 	                		return data;
84
 	                	}
87
 	                	}
85
 	                },
88
 	                },
86
-	                { "data": '操作' ,
89
+	                {
90
+						"data": '操作' ,
91
+						"width":'15%',
87
 	                	"render": function ( data, type, row ) {
92
 	                	"render": function ( data, type, row ) {
88
 	                		return function(){
93
 	                		return function(){
89
 	                			// status
94
 	                			// status