xueli.xue 9 years ago
parent
commit
d4b3045fef

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

6
 	<@netCommon.commonStyle />
6
 	<@netCommon.commonStyle />
7
 	<!-- DataTables -->
7
 	<!-- DataTables -->
8
   	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/datatables/dataTables.bootstrap.css">
8
   	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/datatables/dataTables.bootstrap.css">
9
-  
9
+
10
+	<#-- select2
11
+    <link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/select2/select2.min.css">
12
+    <script src="${request.contextPath}/static/adminlte/plugins/select2/select2.min.js"></script>
13
+    //$(".select2").select2();
14
+    -->
15
+
10
 </head>
16
 </head>
11
 <body class="hold-transition skin-blue sidebar-mini <#if cookieMap?exists && "off" == cookieMap["adminlte_settings"].value >sidebar-collapse</#if>">
17
 <body class="hold-transition skin-blue sidebar-mini <#if cookieMap?exists && "off" == cookieMap["adminlte_settings"].value >sidebar-collapse</#if>">
12
 <div class="wrapper">
18
 <div class="wrapper">
146
                             </select>
152
                             </select>
147
                         </div>
153
                         </div>
148
                     </div>
154
                     </div>
155
+                    <hr>
149
 					<div class="form-group">
156
 					<div class="form-group">
150
 						<div class="col-sm-offset-3 col-sm-6">
157
 						<div class="col-sm-offset-3 col-sm-6">
151
 							<button type="submit" class="btn btn-primary"  >保存</button>
158
 							<button type="submit" class="btn btn-primary"  >保存</button>
193
 					<div class="form-group">
200
 					<div class="form-group">
194
                         <label for="firstname" class="col-sm-2 control-label">分组<font color="red">*</font></label>
201
                         <label for="firstname" class="col-sm-2 control-label">分组<font color="red">*</font></label>
195
                         <div class="col-sm-4">
202
                         <div class="col-sm-4">
196
-							<input type="text" class="form-control" name="jobGroupTitle" maxlength="50" readonly >
197
-                            <input type="hidden" name="jobGroup" >
198
-                            <input type="hidden" name="jobName" >
203
+							<input type="text" class="form-control jobGroupTitle" maxlength="50" readonly >
199
 						</div>
204
 						</div>
200
                         <label for="lastname" class="col-sm-2 control-label">名称<font color="red">*</font></label>
205
                         <label for="lastname" class="col-sm-2 control-label">名称<font color="red">*</font></label>
201
                         <div class="col-sm-4"><input type="text" class="form-control" name="jobDesc" placeholder="请输入“描述”" maxlength="50" ></div>
206
                         <div class="col-sm-4"><input type="text" class="form-control" name="jobDesc" placeholder="请输入“描述”" maxlength="50" ></div>
222
                     <div class="form-group">
227
                     <div class="form-group">
223
                         <label for="firstname" class="col-sm-2 control-label">任务模式<font color="red">*</font></label>
228
                         <label for="firstname" class="col-sm-2 control-label">任务模式<font color="red">*</font></label>
224
                         <div class="col-sm-4">
229
                         <div class="col-sm-4">
225
-							<input type="text" class="form-control" name="glueSwitchTitle"  readonly >
226
-						</div>
227
-                        <label for="lastname" class="col-sm-2 control-label">JobKey</label>
228
-                        <div class="col-sm-4">
229
-							<input type="text" class="form-control" name="jobKey" placeholder="请输入“jobHandler”" readonly >
230
+							<input type="text" class="form-control glueSwitchTitle" readonly >
230
 						</div>
231
 						</div>
231
                     </div>
232
                     </div>
233
+					<hr>
232
 					<div class="form-group">
234
 					<div class="form-group">
233
-						<div class="col-sm-offset-3 col-sm-6">
235
+						<div class="col-sm-offset-3 col-sm-3">
234
 							<button type="submit" class="btn btn-primary"  >保存</button>
236
 							<button type="submit" class="btn btn-primary"  >保存</button>
235
 							<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
237
 							<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
238
+                            <input type="hidden" name="jobGroup" >
239
+                            <input type="hidden" name="jobName" >
236
 						</div>
240
 						</div>
241
+                        <label for="firstname" class="col-sm-2 control-label">JobKey</label>
242
+                        <div class="col-sm-4">
243
+                            <input type="text" class="form-control jobKey" readonly >
244
+                        </div>
237
 					</div>
245
 					</div>
238
 				</form>
246
 				</form>
239
          	</div>
247
          	</div>

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

302
 		$("#updateModal .form input[name='alarmEmail']").val($(this).parent('p').attr("alarmEmail"));
302
 		$("#updateModal .form input[name='alarmEmail']").val($(this).parent('p').attr("alarmEmail"));
303
 		$("#updateModal .form input[name='alarmThreshold']").val($(this).parent('p').attr("alarmThreshold"));
303
 		$("#updateModal .form input[name='alarmThreshold']").val($(this).parent('p').attr("alarmThreshold"));
304
 
304
 
305
-		// job group selected
305
+		// jobGroupTitle
306
 		var jobGroupTitle = $("#addModal .form select[name='jobGroup']").find("option[value='" + $(this).parent('p').attr("jobGroup") + "']").text();
306
 		var jobGroupTitle = $("#addModal .form select[name='jobGroup']").find("option[value='" + $(this).parent('p').attr("jobGroup") + "']").text();
307
-		$("#updateModal .form input[name='jobGroupTitle']").val(jobGroupTitle);
307
+		$("#updateModal .form .jobGroupTitle").val(jobGroupTitle);
308
+
309
+        // jobKey
310
+        var jobKey = $(this).parent('p').attr("jobGroup") + "_" + $(this).parent('p').attr("jobName");
311
+        $("#updateModal .form .jobKey").val(jobKey);
312
+
313
+        // glueSwitchTitle
314
+		$("#updateModal .form .glueSwitchTitle").val( ($(this).parent('p').attr("glueSwitch") == 0)?"BEAN模式":"GLUE模式" );
308
 
315
 
309
-		// glueSwitch and jobKey
310
-		var glueSwitchTitle;
311
-		var jobKey;
312
-		if ($(this).parent('p').attr("glueSwitch") == 0) {
313
-			glueSwitchTitle = "BEAN模式";
314
-			jobKey = $(this).parent('p').attr("jobGroup") + "_" + $(this).parent('p').attr("jobName");
315
-		} else {
316
-			glueSwitchTitle = "GLUE模式";
317
-			jobKey = "无";
318
-		}
319
-		$("#updateModal .form input[name='glueSwitchTitle']").val(glueSwitchTitle);
320
-		$("#updateModal .form input[name='jobKey']").val(jobKey);
321
 
316
 
322
 		// show
317
 		// show
323
 		$('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');
318
 		$('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');