sbd-npm 1.4.7 → 1.4.8

package/package.json

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

package/status.js

@@ -163,7 +163,7 @@ $(function () {
             if (!document.getElementById("process_div_body")) {
                 Util.init_table_skeleton({
                     "element_id": "process_div",
-                    "caption": '<caption class="text-right" id="process_num"></caption>',
+                    "caption": '<caption class="text-right">共 <span class="label label-info" id="process_num"></span> 进程，<input checked type="checkbox" id="is_py_process"> 只显示Python进程</caption>',
                     "head_cols": [
                         {"name": "进程ID", "table_sort": 1},
                         {"name": "进程名", "table_sort": 1},
@@ -175,24 +175,30 @@ $(function () {
                         {"name": "创建时间", "table_sort": 1},
                     ]
                 });
+                $("#is_py_process").click(function () {
+                    Util.show_loading();
+                    Util.set_table_loading("process_div_body");
+                    Status.handle_process();
+                });
             }
-            Util.post(location.pathname, {active_div: localStorage[Status.tab_token]}, function (j) {
-                let _html = [], process_num = 0;
+            let is_py_process = $("#is_py_process").prop("checked") ? "1" : "0";
+            Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_py_process: is_py_process}, function (j) {
+                let html = [], process_num = 0;
                 j["data"].forEach(function (item) {
                     process_num++;
-                    _html.push("<tr>");
-                    _html.push("<td>", item["pid"], "</td>");
-                    _html.push("<td>", item["name"], "</td>");
-                    _html.push("<td>", item["username"], "</td>");
-                    _html.push("<td>", item["status"], "</td>");
-                    _html.push("<td data-val='", item["rss"], "'>", Util.trans_byte_size(item["rss"]), "</td>");
-                    _html.push("<td data-val='", item["vms"], "'>", Util.trans_byte_size(item["vms"]), "</td>");
-                    _html.push("<td title='", item["cmdline"], "'>", Util.sub_str(item["cmdline"], 50), "</td>");
-                    _html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
-                    _html.push("</tr>");
+                    html.push("<tr>");
+                    html.push("<td>", item["pid"], "</td>");
+                    html.push("<td>", item["name"], "</td>");
+                    html.push("<td>", item["username"], "</td>");
+                    html.push("<td>", item["status"], "</td>");
+                    html.push("<td data-val='", item["rss"], "'>", Util.trans_byte_size(item["rss"]), "</td>");
+                    html.push("<td data-val='", item["vms"], "'>", Util.trans_byte_size(item["vms"]), "</td>");
+                    html.push("<td title='", item["cmdline"], "'>", Util.sub_str(item["cmdline"], 60), "</td>");
+                    html.push("<td>", Util.seconds_to_format(item["create_time"]), "</td>");
+                    html.push("</tr>");
                 });
-                $("#process_div_body").html(_html.join(""));
-                $("#process_num").html("共 <span class='label label-info'>" + process_num + "</span> 进程");
+                $("#process_div_body").html(html.join(""));
+                $("#process_num").html(process_num);
                 Util.hide_tips();
             });
         },
@@ -425,7 +431,7 @@ $(function () {
                                 if ($("#is_refresh_task").prop("checked")) {
                                     Status.task_timer_id = setTimeout(function () {
                                         Status.fetch_task_data();
-                                    }, 3456);
+                                    }, 5678);
                                 }
                             } else {
                                 Status.task_status = 0;
@@ -471,7 +477,7 @@ $(function () {
                         Status.task_status = 0;
                         ta_obj.html('添加任务').prop('disabled', false).removeClass("btn-warning").addClass("btn-default");
                         tc_obj.prop('disabled', false);
-                        $("#task_tips").html("<b class='text-success'>任务 `" + j["content"] + "` 已经完成！</b>");
+                        $("#task_tips").html("<b class='text-success'>任务 `" + j["content"] + "` DONE</b>");
                     } else {
                         Status.task_status = 1;
                         ta_obj.html('任务处理中...').prop('disabled', true).removeClass("btn-default").addClass("btn-warning");

package/util.js

@@ -3271,7 +3271,7 @@ const Util = {
     pack_fund_rating: function (item) {
         if (item["rating"]) {
             let rating = item["rating"];
-            if (rating.includes("买入") || rating.includes("增持")) {
+            if (rating.includes("买入") || rating.includes("增持") || rating.includes("推荐")) {
                 return "<b class='text-danger'>" + rating + "</b>";
             } else if (rating.includes("卖出") || rating.includes("减持")) {
                 return "<b class='text-success'>" + rating + "</b>";