From d4b3045fef6cf1911bdc7bdc75a82ca5ed8d1933 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Wed, 20 Jul 2016 22:02:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0RM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/jobinfo/jobinfo.index.ftl | 28 ++++++++++++------- .../main/webapp/static/js/jobinfo.index.1.js | 23 ++++++--------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl index 87fce72a..d98ff52c 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl @@ -6,7 +6,13 @@ <@netCommon.commonStyle /> - + + <#-- select2 + + + //$(".select2").select2(); + --> + sidebar-collapse">
@@ -146,6 +152,7 @@
+
@@ -193,9 +200,7 @@ public class DemoJobHandler extends IJobHandler {
- - - +
@@ -222,18 +227,21 @@ public class DemoJobHandler extends IJobHandler {
- -
- -
- +
+
-
+
+ +
+ +
+ +
diff --git a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js index 487108cd..b685c4f5 100644 --- a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js @@ -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');