From db6ebea7dd53f6617ad19e4eb757ba095321ed8b Mon Sep 17 00:00:00 2001 From: haocao Date: Fri, 24 Mar 2017 14:24:03 +0800 Subject: [PATCH] For #240. --- .../html/status/job/job_status_detail.html | 23 +++++---- .../src/main/resources/console/index.html | 4 +- .../js/status/job/job_status_detail.js | 48 ++++++++++--------- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/html/status/job/job_status_detail.html b/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/html/status/job/job_status_detail.html index 2a9af7c258..ba1762e279 100644 --- a/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/html/status/job/job_status_detail.html +++ b/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/html/status/job/job_status_detail.html @@ -1,20 +1,23 @@

作业名称：

-
-
- -
+ + + + +
+
+ - + diff --git a/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/index.html b/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/index.html index b1258474f3..5182bea2da 100644 --- a/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/index.html +++ b/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/index.html @@ -57,7 +57,7 @@
  • - +   作业配置 @@ -81,7 +81,7 @@
  • - +   帮助
    • diff --git a/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js b/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js index b78def94c4..7715354e67 100644 --- a/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js +++ b/elastic-job-lite/elastic-job-lite-console/src/main/resources/console/js/status/job/job_status_detail.js @@ -1,12 +1,6 @@ $(function() { $("#job-name").text(getCurrentUrl("job-name")); renderServers(); - $('[href="#servers"]').click(function() { - renderServers(); - }); - $('[href="#execution-info"]').click(function() { - renderExecution(); - }); bindButtons(); }); @@ -61,14 +55,15 @@ function statusFormatter(value, row) { } function generateOperationButtons(val, row) { - var triggerButton = ""; - var resumeButton = ""; - var pauseButton = ""; - var shutdownButton = ""; - var removeButton = ""; - var disableButton = ""; - var enableButton = ""; - var operationTd = triggerButton + " "; + var triggerButton = ""; + var executionButton = ""; + var resumeButton = ""; + var pauseButton = ""; + var shutdownButton = ""; + var removeButton = ""; + var disableButton = ""; + var enableButton = ""; + var operationTd = triggerButton + " " + executionButton + " "; if ("PAUSED" === row.status) { operationTd = operationTd + resumeButton + " "; } else if ("DISABLED" !== row.status && "CRASHED" !== row.status && "SHUTDOWN" !== row.status) { @@ -89,6 +84,7 @@ function generateOperationButtons(val, row) { } function bindButtons() { + bindExecutionButton(); bindTriggerButton(); bindPauseButton(); bindResumeButton(); @@ -98,13 +94,21 @@ function bindButtons() { bindEnableButton(); } +function bindExecutionButton() { + $(document).on("click", "button[operation='execution'][data-toggle!='modal']", function(event) { + $('#execution-info').modal({backdrop : 'static', keyboard : true}); + renderExecution(); + }); +} + + function bindTriggerButton() { $(document).on("click", "button[operation='trigger'][data-toggle!='modal']", function(event) { var jobName = $("#job-name").text(); $.ajax({ url: "/api/jobs/trigger", type: "POST", - data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instanceId")}), + data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instance-id")}), contentType: "application/json", dataType: "json", success: function() { @@ -121,7 +125,7 @@ function bindPauseButton() { $.ajax({ url: "/api/jobs/pause", type: "POST", - data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instanceId")}), + data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instance-id")}), contentType: "application/json", dataType: "json", success: function() { @@ -138,7 +142,7 @@ function bindResumeButton() { $.ajax({ url: "/api/jobs/resume", type: "POST", - data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instanceId")}), + data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instance-id")}), contentType: "application/json", dataType: "json", success: function() { @@ -155,7 +159,7 @@ function bindShutdownButton() { $.ajax({ url: "/api/jobs/shutdown", type: "POST", - data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instanceId")}), + data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instance-id")}), contentType: "application/json", dataType: "json", success: function() { @@ -172,7 +176,7 @@ function bindRemoveButton() { $.ajax({ url: "/api/jobs/remove", type: "POST", - data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instanceId")}), + data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instance-id")}), contentType: "application/json", dataType: "json", success: function(data) { @@ -193,7 +197,7 @@ function bindDisableButton() { $.ajax({ url: "/api/jobs/disable", type: "POST", - data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instanceId")}), + data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instance-id")}), contentType: "application/json", dataType: "json", success: function() { @@ -210,7 +214,7 @@ function bindEnableButton() { $.ajax({ url: "/api/jobs/enable", type: "POST", - data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instanceId")}), + data: JSON.stringify({jobName : jobName, ip : $(event.currentTarget).attr("ip"), instanceId : $(event.currentTarget).attr("instance-id")}), contentType: "application/json", dataType: "json", success: function() { @@ -253,4 +257,4 @@ function executionStatusFormatter(value, row) { return "待运行"; break; } -} +} \ No newline at end of file