sbd-npm 1.4.10 → 1.4.11

package/package.json

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

package/status.js

@@ -530,16 +530,18 @@ $(function () {
                 hw_html.push('<option value="">Loading...</option>');
                 hw_html.push('</select>');
                 hw_html.push('</div>');
+                hw_html.push('&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".client_action_modal" class="btn btn-warning" id="add_client_action">添加任务</a>');
                 hw_html.push('</form>');
                 hw_html.push('<div id="worker_process_div"></div>');
                 $("#worker_div").html(hw_html.join(""));
+                Status.init_worker_modal();
             }
             Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_init: is_init, key: $("#workers").val()}, function (j) {
                 if (j["workers"]) {
                     let select_html = [];
                     select_html.push("<option value=''>共 ", j["workers"].length, " 个Worker</option>");
                     j["workers"].forEach(function (w) {
-                        select_html.push("<option value='", w["key"], "'>", w["ip"], "</option>");
+                        select_html.push("<option value='", w["key"], "'>", w["ip"], "(", w["num"], ")</option>");
                     });
                     $("#workers").html(select_html.join(""));
                     if (j["workers"].length > 0) {
@@ -583,11 +585,89 @@ $(function () {
                     });
                     Util.render_table_html("worker_process_div_body", html);
                     $("#worker_process_tip").html('共 <span class="label label-info">' + process_num + '</span> 进程，最后更新时间：' + Util.seconds_to_format(j["date"]));
+                    $("#workers option[value='" + $("#workers").val() + "']").text(j["ip"] + "(" + process_num + ")");
                 }
                 Util.hide_tips();
             });
         },
 
+        init_worker_modal: function () {
+            Util.init_modal_skeleton("client_action_modal");
+            $("#client_action_modal_title").html("添加任务");
+            let html = [];
+            html.push('<form data-parsley-validate class="form-horizontal form-label-left">');
+            html.push('<div class="form-group">');
+            html.push('<label class="control-label col-md-3 col-sm-3 col-xs-12" for="search_ip">Worker </label>');
+            html.push('<div class="col-md-6 col-sm-6 col-xs-12">');
+            html.push('<select id="client_action_worker" class="form-control col-md-7 col-xs-12">');
+            html.push('<option value="">Loading...</option>');
+            html.push('</select>');
+            html.push('</div>');
+            html.push('</div>');
+            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('</div>');
+            html.push('</div>');
+            html.push('<div class="form-group">');
+            html.push('<div class="col-md-6 col-sm-6 col-xs-12 col-md-offset-3">');
+            html.push('<button id="client_action_add" type="button" class="btn btn-success">添 加</button>');
+            html.push('<span id="client_action_tips"></span>');
+            html.push('</div>');
+            html.push('</div>');
+            html.push('</form>');
+            let camb_obj = $("#client_action_modal_body");
+            camb_obj.html(html.join(""));
+            camb_obj.parent().parent().removeClass("modal-xlg");
+            let cam_obj = $('#client_action_modal');
+            cam_obj.on('show.bs.modal', function (e) {
+                Util.show_loading();
+                Util.post(location.pathname, {active_div: "client_action"}, function (j) {
+                    if (j["workers"]) {
+                        let html = [];
+                        j["workers"].forEach(function (w) {
+                            html.push("<option value='", w["key"], "'>", w["ip"], "(", w["num"], ")</option>");
+                        });
+                        $("#client_action_worker").html(html.join(""));
+                    }
+                    Util.hide_tips();
+                });
+            });
+            cam_obj.on('hidden.bs.modal', function () {
+                $("#client_action_content").val("");
+                $("#client_action_tips").html("");
+                Util.hide_tips();
+            });
+            $("#client_action_add").click(function() {
+                let worker_key = $("#client_action_worker").val();
+                if (worker_key) {
+                    let action_content = $("#client_action_content").val();
+                    if (action_content) {
+                        Util.show_loading();
+                        $("#client_action_tips").html("");
+                        Util.post(location.pathname, {active_div: "client_action_add", "key": worker_key, "content": action_content}, function (j) {
+                            if (j["code"] && j["code"] === 1) {
+                                $("#client_action_tips").html("<b class='text-success'>添加成功！</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) {
+                                $("#client_action_tips").html("<b class='text-danger'>任务内容异常！</b>");
+                            } else {
+                                $("#client_action_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
+                            }
+                            Util.hide_tips();
+                        });
+                    } else {
+                        $("#client_action_tips").html("<b class='text-danger'>任务内容不能为空！</b>");
+                    }
+                } else {
+                    $("#client_action_tips").html("<b class='text-danger'>Worker 异常！</b>");
+                }
+                return False;
+            });
+        },
+
         handle_tool: function () {
             let t_obj = $("#timestamp");
             let t_val = t_obj.val();
@@ -748,18 +828,18 @@ $(function () {
         },
 
         handle_site_map: function () {
-            let _html = [];
+            let html = [];
             $('.side-menu li a').each(function () {
                 let url = $(this).attr("href");
                 if (url) {
                     let title = $(this).text();
                     if (title && title.length > 0) {
-                        _html.push('<a href="', url, '" class="btn btn-default">', title, '</a>');
+                        html.push('<a href="', url, '" class="btn btn-default">', title, '</a>');
                     }
                 }
             });
-            _html.push('<a href="/xmr" target="_blank" class="btn btn-default">门罗币XMR</a>');
-            $("#site_map_zone").html(_html.join(""));
+            html.push('<a href="/xmr" target="_blank" class="btn btn-default">门罗币XMR</a>');
+            $("#site_map_zone").html(html.join(""));
             Util.hide_tips();
         },