npm - sbd-npm - Versions diffs - 1.4.25 → 1.4.26 - Mend

sbd-npm 1.4.25 → 1.4.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/status.js +13 -3

package/package.json CHANGED Viewed

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

package/status.js CHANGED Viewed

@@ -439,7 +439,11 @@ $(function () {
                                 if (!document.getElementById("task_result")) {
                                     $("#task_result_zone").html('<textarea rows="20" id="task_result" class="form-control"></textarea>');
                                 }
-                                $("#task_result").val("任务 `" + task_content + "` 处理中...");
+                                let task_result = "任务 `" + j["content"] + "` 处理中...";
+                                if (j["chinese"]) {
+                                    task_result += " [" + j["chinese"] + "]";
+                                }
+                                $("#task_result").val(task_result);
                                 if ($("#is_refresh_task").prop("checked")) {
                                     Status.task_timer_id = setTimeout(function () {
                                         Status.fetch_task_data();
@@ -550,8 +554,12 @@ $(function () {
                         Util.show_loading();
                         $("#machine_refresh").attr("disabled", true).html("正在处理中...");
                         Util.post(location.pathname, {active_div: "machine_refresh"}, function (j) {
-                            $("#machine_refresh").html("刷新Machine").attr("disabled", false);
-                            Util.hide_tips();
+                            setTimeout(function () {
+                                $('#workers').html('<option value="">暂无Machine</option>');
+                                $("#machine_refresh").html("刷新Machine").attr("disabled", false);
+                                Util.hide_tips();
+                                Util.show_tips("刷新成功", 3456, "alert-success");
+                            }, 3456);
                         });
                         return false;
                     });
@@ -616,6 +624,8 @@ $(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"]) + '，Revision：' + j["revision"] + '，MachineId：' + j["machine_id"]);
                     $("#workers option[value='" + $("#workers").val() + "']").text(j["ip"] + "(" + process_num + ")");
+                } else if (is_init === 1) {
+                    $('#workers').html('<option value="">暂无Machine</option>');
                 }
                 Util.hide_tips();
             });