xuxueli 8 years ago
parent
commit
75c7fe482b

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

21
 	    "ordering": false,
21
 	    "ordering": false,
22
 	    //"scrollX": true,	// X轴滚动条,取消自适应
22
 	    //"scrollX": true,	// X轴滚动条,取消自适应
23
 	    "columns": [
23
 	    "columns": [
24
-	                { "data": 'id', "bSortable": false, "visible" : true},
24
+	                {
25
+	                	"data": 'id',
26
+						"bSortable": false,
27
+						"visible" : true,
28
+						"width":'10%'
29
+					},
25
 	                { 
30
 	                { 
26
 	                	"data": 'jobGroup', 
31
 	                	"data": 'jobGroup', 
27
 	                	"visible" : false,
32
 	                	"visible" : false,
33
+						"width":'20%',
28
 	                	"render": function ( data, type, row ) {
34
 	                	"render": function ( data, type, row ) {
29
 	            			var groupMenu = $("#jobGroup").find("option");
35
 	            			var groupMenu = $("#jobGroup").find("option");
30
 	            			for ( var index in $("#jobGroup").find("option")) {
36
 	            			for ( var index in $("#jobGroup").find("option")) {
35
 	            			return data;
41
 	            			return data;
36
 	            		}
42
 	            		}
37
             		},
43
             		},
38
-	                { "data": 'jobDesc', "visible" : true,"width":'20%'},
44
+	                {
45
+	                	"data": 'jobDesc',
46
+						"visible" : true,
47
+						"width":'20%'
48
+					},
39
 					{
49
 					{
40
 						"data": 'glueType',
50
 						"data": 'glueType',
41
 						"width":'20%',
51
 						"width":'20%',
56
 						}
66
 						}
57
 					},
67
 					},
58
 	                { "data": 'executorParam', "visible" : false},
68
 	                { "data": 'executorParam', "visible" : false},
59
-					{ "data": 'jobCron', "visible" : true,"width":'10%'},
69
+					{
70
+						"data": 'jobCron',
71
+						"visible" : true,
72
+						"width":'10%'
73
+					},
60
 	                { 
74
 	                { 
61
 	                	"data": 'addTime', 
75
 	                	"data": 'addTime', 
62
 	                	"visible" : false, 
76
 	                	"visible" : false, 

+ 8 - 1
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js View File

92
 					{
92
 					{
93
 						"data": 'jobId',
93
 						"data": 'jobId',
94
 						"visible" : true,
94
 						"visible" : true,
95
+                        "width":'10%',
95
 						"render": function ( data, type, row ) {
96
 						"render": function ( data, type, row ) {
96
 							var glueTypeTitle = row.glueType;
97
 							var glueTypeTitle = row.glueType;
97
 							if ('GLUE_GROOVY'==row.glueType) {
98
 							if ('GLUE_GROOVY'==row.glueType) {
117
 					{ "data": 'jobGroup', "visible" : false},
118
 					{ "data": 'jobGroup', "visible" : false},
118
 					{
119
 					{
119
 						"data": 'triggerTime',
120
 						"data": 'triggerTime',
121
+                        "width":'16%',
120
 						"render": function ( data, type, row ) {
122
 						"render": function ( data, type, row ) {
121
 							return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
123
 							return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
122
 						}
124
 						}
123
 					},
125
 					},
124
 					{
126
 					{
125
 						"data": 'triggerCode',
127
 						"data": 'triggerCode',
128
+                        "width":'12%',
126
 						"render": function ( data, type, row ) {
129
 						"render": function ( data, type, row ) {
127
 							var html = data;
130
 							var html = data;
128
 							if (data == 200) {
131
 							if (data == 200) {
137
 					},
140
 					},
138
 					{
141
 					{
139
 						"data": 'triggerMsg',
142
 						"data": 'triggerMsg',
143
+                        "width":'12%',
140
 						"render": function ( data, type, row ) {
144
 						"render": function ( data, type, row ) {
141
 							return data?'<a class="logTips" href="javascript:;" >查看<span style="display:none;">'+ data +'</span></a>':"无";
145
 							return data?'<a class="logTips" href="javascript:;" >查看<span style="display:none;">'+ data +'</span></a>':"无";
142
 						}
146
 						}
143
 					},
147
 					},
144
 	                { 
148
 	                { 
145
 	                	"data": 'handleTime',
149
 	                	"data": 'handleTime',
150
+                        "width":'16%',
146
 	                	"render": function ( data, type, row ) {
151
 	                	"render": function ( data, type, row ) {
147
 	                		return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
152
 	                		return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
148
 	                	}
153
 	                	}
149
 	                },
154
 	                },
150
 	                {
155
 	                {
151
 						"data": 'handleCode',
156
 						"data": 'handleCode',
157
+                        "width":'12%',
152
 						"render": function ( data, type, row ) {
158
 						"render": function ( data, type, row ) {
153
                             var html = data;
159
                             var html = data;
154
                             if (data == 200) {
160
                             if (data == 200) {
165
 	                },
171
 	                },
166
 	                { 
172
 	                { 
167
 	                	"data": 'handleMsg',
173
 	                	"data": 'handleMsg',
174
+                        "width":'12%',
168
 	                	"render": function ( data, type, row ) {
175
 	                	"render": function ( data, type, row ) {
169
 	                		return data?'<a class="logTips" href="javascript:;" >查看<span style="display:none;">'+ data +'</span></a>':"无";
176
 	                		return data?'<a class="logTips" href="javascript:;" >查看<span style="display:none;">'+ data +'</span></a>':"无";
170
 	                	}
177
 	                	}
172
 	                {
179
 	                {
173
 						"data": 'handleMsg' ,
180
 						"data": 'handleMsg' ,
174
 						"bSortable": false,
181
 						"bSortable": false,
175
-						"width": "8%" ,
182
+                        "width":'10%',
176
 	                	"render": function ( data, type, row ) {
183
 	                	"render": function ( data, type, row ) {
177
 	                		// better support expression or string, not function
184
 	                		// better support expression or string, not function
178
 	                		return function () {
185
 	                		return function () {