Inicio Explorar Axuda
Rexistro Iniciar sesión
wangq
/
xxl_job
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

更新RM

xueli.xue %!s(int64=8) %!d(string=hai) anos
pai
c949a30ce5
achega
d4b3045fef
Modificáronse 2 ficheiros con 27 adicións e 24 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 18 10
      xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
  2. 9 14
      xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js

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

@@ -6,7 +6,13 @@
 
 	<@netCommon.commonStyle />

 	<!-- DataTables -->

   	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/datatables/dataTables.bootstrap.css">

-  

+

+	<#-- select2

+    <link rel="stylesheet" href="${request.contextPath}/static/adminlte/plugins/select2/select2.min.css">

+    <script src="${request.contextPath}/static/adminlte/plugins/select2/select2.min.js"></script>

+    //$(".select2").select2();

+    -->

+

 </head>

 <body class="hold-transition skin-blue sidebar-mini <#if cookieMap?exists && "off" == cookieMap["adminlte_settings"].value >sidebar-collapse</#if>">

 <div class="wrapper">

@@ -146,6 +152,7 @@
 
                             </select>

                         </div>

                     </div>

+                    <hr>

 					<div class="form-group">

 						<div class="col-sm-offset-3 col-sm-6">

 							<button type="submit" class="btn btn-primary"  >保存</button>

@@ -193,9 +200,7 @@ public class DemoJobHandler extends IJobHandler {
 
 					<div class="form-group">

                         <label for="firstname" class="col-sm-2 control-label">分组<font color="red">*</font></label>

                         <div class="col-sm-4">

-							<input type="text" class="form-control" name="jobGroupTitle" maxlength="50" readonly >

-                            <input type="hidden" name="jobGroup" >

-                            <input type="hidden" name="jobName" >

+							<input type="text" class="form-control jobGroupTitle" maxlength="50" readonly >

 						</div>

                         <label for="lastname" class="col-sm-2 control-label">名称<font color="red">*</font></label>

                         <div class="col-sm-4"><input type="text" class="form-control" name="jobDesc" placeholder="请输入“描述”" maxlength="50" ></div>

@@ -222,18 +227,21 @@ public class DemoJobHandler extends IJobHandler {
 
                     <div class="form-group">

                         <label for="firstname" class="col-sm-2 control-label">任务模式<font color="red">*</font></label>

                         <div class="col-sm-4">

-							<input type="text" class="form-control" name="glueSwitchTitle"  readonly >

-						</div>

-                        <label for="lastname" class="col-sm-2 control-label">JobKey</label>

-                        <div class="col-sm-4">

-							<input type="text" class="form-control" name="jobKey" placeholder="请输入“jobHandler”" readonly >

+							<input type="text" class="form-control glueSwitchTitle" readonly >

 						</div>

                     </div>

+					<hr>

 					<div class="form-group">

-						<div class="col-sm-offset-3 col-sm-6">

+						<div class="col-sm-offset-3 col-sm-3">

 							<button type="submit" class="btn btn-primary"  >保存</button>

 							<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>

+                            <input type="hidden" name="jobGroup" >

+                            <input type="hidden" name="jobName" >

 						</div>

+                        <label for="firstname" class="col-sm-2 control-label">JobKey</label>

+                        <div class="col-sm-4">

+                            <input type="text" class="form-control jobKey" readonly >

+                        </div>

 					</div>

 				</form>

          	</div>

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

@@ -302,22 +302,17 @@ $(function() {
 
 		$("#updateModal .form input[name='alarmEmail']").val($(this).parent('p').attr("alarmEmail"));

 		$("#updateModal .form input[name='alarmThreshold']").val($(this).parent('p').attr("alarmThreshold"));

 

-		// job group selected

+		// jobGroupTitle

 		var jobGroupTitle = $("#addModal .form select[name='jobGroup']").find("option[value='" + $(this).parent('p').attr("jobGroup") + "']").text();

-		$("#updateModal .form input[name='jobGroupTitle']").val(jobGroupTitle);

+		$("#updateModal .form .jobGroupTitle").val(jobGroupTitle);

+

+        // jobKey

+        var jobKey = $(this).parent('p').attr("jobGroup") + "_" + $(this).parent('p').attr("jobName");

+        $("#updateModal .form .jobKey").val(jobKey);

+

+        // glueSwitchTitle

+		$("#updateModal .form .glueSwitchTitle").val( ($(this).parent('p').attr("glueSwitch") == 0)?"BEAN模式":"GLUE模式" );

 

-		// glueSwitch and jobKey

-		var glueSwitchTitle;

-		var jobKey;

-		if ($(this).parent('p').attr("glueSwitch") == 0) {

-			glueSwitchTitle = "BEAN模式";

-			jobKey = $(this).parent('p').attr("jobGroup") + "_" + $(this).parent('p').attr("jobName");

-		} else {

-			glueSwitchTitle = "GLUE模式";

-			jobKey = "无";

-		}

-		$("#updateModal .form input[name='glueSwitchTitle']").val(glueSwitchTitle);

-		$("#updateModal .form input[name='jobKey']").val(jobKey);

 

 		// show

 		$('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');