sbd-npm 1.4.11 → 1.4.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.4.11",
+    "version": "1.4.12",
     "description": "Stock Big Data",
     "main": "index.js",
     "scripts": {

package/status.js

@@ -607,7 +607,9 @@ $(function () {
             html.push('<div class="form-group">');
             html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12" for="search_ip">任务命令 </label>');
             html.push('<div class="col-md-6 col-sm-6 col-xs-12">');
-            html.push('<input type="text" id="client_action_content" name="client_action_content" placeholder="任务命令" class="form-control col-md-7 col-xs-12">');
+            html.push('<select id="client_action_content" class="form-control col-md-7 col-xs-12">');
+            html.push('<option value="">任务命令</option>');
+            html.push('</select>');
             html.push('</div>');
             html.push('</div>');
             html.push('<div class="form-group">');
@@ -625,11 +627,23 @@ $(function () {
                 Util.show_loading();
                 Util.post(location.pathname, {active_div: "client_action"}, function (j) {
                     if (j["workers"]) {
-                        let html = [];
+                        let worker_html = [];
                         j["workers"].forEach(function (w) {
-                            html.push("<option value='", w["key"], "'>", w["ip"], "(", w["num"], ")</option>");
+                            worker_html.push("<option value='", w["key"], "'>", w["ip"], "(", w["num"], ")</option>");
+                        });
+                        let caw_obj = $("#client_action_worker");
+                        caw_obj.html(worker_html.join(""));
+                        let worker = $("#workers").val();
+                        if (worker) {
+                            caw_obj.find("option[value='" + worker + "']").attr("selected", true);
+                        }
+                    }
+                    if (j["actions"]) {
+                        let action_html = [];
+                        j["actions"].forEach(function (action) {
+                            action_html.push("<option value='", action, "'>", action, "</option>");
                         });
-                        $("#client_action_worker").html(html.join(""));
+                        $("#client_action_content").html(action_html.join(""));
                     }
                     Util.hide_tips();
                 });
@@ -646,9 +660,11 @@ $(function () {
                     if (action_content) {
                         Util.show_loading();
                         $("#client_action_tips").html("");
+                        $("#client_action_add").attr("disabled", true);
                         Util.post(location.pathname, {active_div: "client_action_add", "key": worker_key, "content": action_content}, function (j) {
+                            $("#client_action_add").attr("disabled", false);
                             if (j["code"] && j["code"] === 1) {
-                                $("#client_action_tips").html("<b class='text-success'>添加成功！</b>");
+                                $("#client_action_tips").html("<b class='text-success'>任务`" + action_content + "`添加成功！</b>");
                             } else if (j["code"] && j["code"] === 2) {
                                 $("#client_action_tips").html("<b class='text-danger'>Worker 不存在！</b>");
                             } else if (j["code"] && j["code"] === 3) {