sbd-npm 1.5.39 → 1.5.41

package/constant.js

@@ -215,8 +215,8 @@ const MenuList = [
 			{'key': 'us_buffett', 'name': '巴菲特持仓', 'url': '/0xe51dc830e90a6ca5bbae5d867ebd69d57aa85208'},
 			{'key': 'us_biotechnology', 'name': '生物科技', 'url': '/0x88bee1b829887f7c2fbfeea7a3c60c330d477f62'},
 			{'key': 'us_dollar_index', 'name': '美元指数', 'url': '/0x99533982f67f489dce7c0738c2e2a94239e35cde'},
-			{'key': 'us_bond_yield', 'name': '美十年国债收益率', 'url': '/0xdf01c6a366340dce84867ca34e7dd6fc6ed5e631'},
-			{'key': 'us_usd_cnh', 'name': '美元离岸人民币汇率', 'url': '/0x6010e54df39e6e00b255d6271d9972fb8c9faf11'},
+			{'key': 'us_bond_yield', 'name': '美十年国债收益', 'url': '/0xdf01c6a366340dce84867ca34e7dd6fc6ed5e631'},
+			{'key': 'us_usd_cnh', 'name': '美元人民币汇率', 'url': '/0x6010e54df39e6e00b255d6271d9972fb8c9faf11'},
 			{'key': 'us_vix', 'name': 'VIX恐慌指数', 'url': '/0xc767b343d8a06290ca1593da8e20c14584ccd45b'},
 			{'key': 'us_pe', 'name': '标普500历史PE', 'url': '/0x65702c301edb87adb7a5e99a02d4bd5500bd7c8e'},
 			{'key': 'us_short_rank', 'name': '做空排行', 'url': '/0x2421be33e4e06950b6ff117fdf2e3b6822806f7a'}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.5.39",
+    "version": "1.5.41",
     "description": "Stock Big Data",
     "author": "DHQ <dhq314@gmail.com>",
     "license": "ISC",

package/snowball_tweet.js

@@ -99,7 +99,8 @@ $(function () {
                                     html.push('<div class="form-group text-left">');
                                     j.data.forEach(function (item) {
                                         total_num += item.num;
-                                        html.push('<a class="btn btn-default" data-val="', item.uid, '" style="margin-bottom: 10px;" href="#">', item.name, '(', item.num, ')</a>');
+                                        let item_num = (item.stock_num && item.stock_num > 0) ? item.stock_num : item.num;
+                                        html.push('<a class="btn btn-default" data-val="', item.uid, '" style="margin-bottom: 10px;" href="#">', item.name, '(', item_num, ')</a>');
                                     });
                                     html.push('</div>');
                                     html.push('<div class="form-group" style="margin: 10px 0;">');
@@ -333,8 +334,7 @@ $(function () {
 
         set_today_date: function() {
             let now = Util.now();
-            let date = new Date();
-            let hour = date.getHours();
+            let hour = new Date().getHours();
             let start_date = hour < 6 ? (now - Util.ONE_DAY_SECOND) : now;
             $('#tweet_start_date').data('daterangepicker').setStartDate(Util.seconds_to_format(start_date, "%Y-%m-%d"));
             $('#tweet_end_date').data('daterangepicker').setStartDate(Util.seconds_to_format(now, "%Y-%m-%d"));

package/status.js

@@ -849,13 +849,40 @@ $(function () {
                                 {"name": "物理内存", "table_sort": 1, "title": "Resident Set Size(常驻内存，进程实际占用的物理内存)"},
                                 {"name": "启动命令"},
                                 {"name": "创建时间", "class": "info", "table_sort": 1},
-                                {"name": "操作"}
+                                {"name": "操作", "id": "machine_action_log", "link": "#", "title": "操作日志记录"}
                             ]
                         });
+                        $("#machine_action_log").click(function() {
+                            let machine_id = $("#machines").val();
+                            if (machine_id) {
+                                let instruction = "screen_1_machine_action_log";
+                                Util.post(location.pathname, {action: "machine_instruction_add", "machine_id": machine_id, "instruction": instruction, "action_type": 2}, function (j) {
+                                    Util.hide_tips();
+                                    if (j.code === 1) {
+                                        Status.reset_screen_status("machine_process_div_body");
+                                        $("#machine_action_log").html("<a href='#'><span title='日志记录获取中...' class='label label-info'>操作</span></a>");
+                                        Util.show_tips("[获取操作日志记录] 已加到会话队列中", 4567, "alert-success");
+                                    } else if (j.code === 2) {
+                                        Util.show_tips("Machine 不存在！", 4567, "alert-danger");
+                                    } else {
+                                        Util.show_tips("[获取操作日志记录] 异常！", 4567, "alert-danger");
+                                    }
+                                });
+                            }
+                        });
                     }
                     let html = [], process_num = 0;
                     let screen_pid = j.screen_pid ? j.screen_pid : 0;
                     let screen_pid_date = j.screen_pid_date ? j.screen_pid_date : 0;
+                    if (screen_pid === 1) {
+                        if (screen_pid_date > 0) {
+                            $("#machine_action_log").html("<a href='#'><span title='日志记录已成功获取(" + Util.seconds_to_format(screen_pid_date) + ")' class='label label-success'>操作</span></a>");
+                        } else {
+                            $("#machine_action_log").html("<a href='#'><span title='日志记录获取中...' class='label label-info'>操作</span></a>");
+                        }
+                    } else {
+                        $("#machine_action_log").html("<a href='#'>操作</a>");
+                    }
                     j.process.forEach(function (item) {
                         process_num++;
                         let is_xmr = 0, is_screen = 0;
@@ -984,19 +1011,8 @@ $(function () {
                             Util.post(location.pathname, {action: "machine_instruction_add", "machine_id": machine_id, "instruction": instruction, "action_type": action_type}, function (j) {
                                 Util.hide_tips();
                                 if (j.code === 1) {
-                                    $("#" + element_id + " a").each(function() {
-                                        let span_object = $(this).find('span.label.label-info');
-                                        if (span_object.length) {
-                                            var span_text = span_object.text();
-                                            span_object.remove();
-                                            $(this).append(span_text);
-                                        } else {
-                                            let is_fetch_screen = $(this).attr("data-screen");
-                                            if (is_fetch_screen && is_fetch_screen == "1") {
-                                                $(this).text('会话').removeAttr('data-screen');
-                                            }
-                                        }
-                                    });
+                                    $("#machine_action_log").html("<a href='#'>操作</a>");
+                                    Status.reset_screen_status(element_id);
                                     this_object.html("<span title='会话数据获取中...' class='label label-info'>会话</span>");
                                     Util.show_tips("进程 [" + pid + "(" + action + ")] 已加到会话队列中", 4567, "alert-success");
                                 } else if (j.code === 2) {
@@ -1013,6 +1029,22 @@ $(function () {
             });
         },
 
+        reset_screen_status: function(element_id) {
+            $("#" + element_id + " a").each(function() {
+                let span_object = $(this).find('span.label.label-info');
+                if (span_object.length) {
+                    let span_text = span_object.text();
+                    span_object.remove();
+                    $(this).append(span_text);
+                } else {
+                    let is_fetch_screen = $(this).attr("data-screen");
+                    if (is_fetch_screen && is_fetch_screen == "1") {
+                        $(this).text('会话').removeAttr('data-screen');
+                    }
+                }
+            });
+        },
+
         pack_screen_html: function(is_screen, pid, screen_pid, screen_pid_date, cmdline) {
             if (is_screen === 1) {
                 let screen_html = "";
@@ -1307,7 +1339,7 @@ $(function () {
             machines.forEach(function (m) {
                 html.push("<option value='", m["machine_id"], "'>", m["ip"], "(", m["num"], ")</option>");
             });
-            $("#" + element_id).html(html.join(""));
+            document.getElementById(element_id).innerHTML = html.join("");
         },
 
         init_word_modal: function () {
@@ -1333,9 +1365,7 @@ $(function () {
             html.push('</div>');
             html.push('</div>');
             html.push('</form>');
-            let wmb_object = $("#word_modal_body");
-            wmb_object.html(html.join(""));
-            wmb_object.parent().parent().removeClass("modal-xlg");
+            $("#word_modal_body").html(html.join("")).parent().parent().removeClass("modal-xlg");
             let wm_object = $('#word_modal');
             wm_object.on('show.bs.modal', function (e) {
                 if ($(e.relatedTarget).attr("id") === "word_random") {
@@ -1352,18 +1382,18 @@ $(function () {
                     });
                 } else {
                     let tr_object = $(e.relatedTarget).parent().parent();
-                    let word = $(tr_object).children('td').eq(1).text();
+                    let word = tr_object.children('td').eq(1).text();
                     $("#word_modal_title").html(Util.pack_html_link("https://cn.bing.com/dict/search?q=" + word, "单词修改"));
                     $('#word_modify').css('display', 'inline');
                     $("#word_value").val(word).attr('readonly', true);
-                    $("#word_chinese").val($(tr_object).children('td').eq(2).text()).attr('readonly', false);
+                    $("#word_chinese").val(tr_object.children('td').eq(2).text()).attr('readonly', false);
                     $("#word_modify").off("click").click(function () {
                         let chinese = $("#word_chinese").val();
                         if (chinese) {
                             Util.post(location.pathname, {"action": "word_modify", "word": word, "chinese": chinese}, function (j) {
                                 if (j.code === 1) {
                                     $("#word_chinese").val(j.chinese);
-                                    $(tr_object).children('td').eq(2).html(j.chinese);
+                                    tr_object.children('td').eq(2).html(j.chinese);
                                     $("#word_tips").html("<b class='text-success'>修改成功！</b>");
                                 } else if (j.code === 2) {
                                     $("#word_tips").html("<b class='text-danger'>中文有误！</b>");

package/summary_daily.js

@@ -598,8 +598,8 @@ $(function () {
 
         render_stock_rate_html: function() {
             let html = [], index = 0;
-            let industry = $("#p_change_industry").val();
             let area = $("#p_change_area").val();
+            let industry = $("#p_change_industry").val();
             Modal["p_change_data"].forEach(function (item) {
                 if (Util.is_industry_area(item, industry, area)) {
                     index++;

package/util.js

@@ -1052,9 +1052,9 @@ const Util = {
         if (html.length > 0) {
             document.getElementById(element_id).innerHTML = html.join("");
         } else {
-            let element_object = $("#" + element_id);
-            let td_num = element_object.parent().find('thead td').length;
-            element_object.html('<tr><td colspan="' + td_num + '">暂无数据</td></tr>');
+            let element_object = document.getElementById(element_id);
+            let td_num = element_object.closest('table').querySelectorAll('thead td').length;
+            element_object.innerHTML = '<tr><td colspan="' + td_num + '">暂无数据</td></tr>';
         }
     },
 
@@ -1070,7 +1070,7 @@ const Util = {
                 html.push('<option value="', i["id"], '">', i["industry"], '(', i["num"], ')</option>');
             });
         }
-        $("#" + element_id).html(html.join(""));
+        document.getElementById(element_id).innerHTML = html.join("");
     },
 
     /**
@@ -1085,7 +1085,7 @@ const Util = {
                 html.push('<option value="', a["area"], '">', a["area"], '(', a["num"], ')</option>');
             });
         }
-        $("#" + element_id).html(html.join(""));
+        document.getElementById(element_id).innerHTML = html.join("");
     },
 
     /**
@@ -1094,10 +1094,12 @@ const Util = {
      * @param load_text
      */
     set_table_loading: function (element_id, load_text = "") {
-        let element_object = $("#" + element_id);
-        let td_num = element_object.parent().find('thead td').length;
-        load_text = load_text.length > 0 ? load_text : "Loading...";
-        element_object.html('<tr><td colspan="' + td_num + '">' + load_text + '</td></tr>');
+        let element_object = document.getElementById(element_id);
+        if (element_object) {
+            let td_num = element_object.closest('table').querySelectorAll('thead td').length;
+            load_text = load_text.length > 0 ? load_text : "Loading...";
+            element_object.innerHTML = '<tr><td colspan="' + td_num + '">' + load_text + '</td></tr>';
+        }
     },
 
     /**
@@ -1754,13 +1756,13 @@ const Util = {
             $("#word_process_div_body .word_del").each(function () {
                 $(this).click(function () {
                     let tr_object = $(this).parent().parent();
-                    let word = $(tr_object).children('td').eq(1).text();
-                    let word_chinese = $(tr_object).children('td').eq(2).text();
+                    let word = tr_object.children('td').eq(1).text();
+                    let word_chinese = tr_object.children('td').eq(2).text();
                     word_chinese = "“ " + word + "「" + word_chinese + "」”";
                     if (confirm("是否确定要删除 " + word_chinese + " ？")) {
                         Util.show_loading();
-                        Util.post(location.pathname, {"active_div": "word_del", "word": word}, function () {
-                            $(tr_object).remove();
+                        Util.post(location.pathname, {"action": "word_del", "word": word}, function () {
+                            tr_object.remove();
                             Util.hide_tips();
                             Util.show_tips("删除 " + word_chinese + " 成功", 4567, "alert-success");
                         });
@@ -2272,8 +2274,7 @@ const Util = {
      * @returns {*|number}
      */
     get_weekday: function () {
-        let date = new Date();
-        let weekday = date.getDay();
+        let weekday = new Date().getDay();
         weekday = weekday > 0 ? weekday : 7; // 星期天是0
         return weekday;
     },
@@ -2893,9 +2894,10 @@ const Util = {
     },
 
     uuid: function () {
-        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-            var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-            return v.toString(16);
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (char) {
+            let randomHexDigit = Math.random() * 16 | 0;
+            let digit = char == 'x' ? randomHexDigit : (randomHexDigit & 0x3 | 0x8);
+            return digit.toString(16);
         });
     },
 
@@ -3572,43 +3574,6 @@ const Util = {
         Util.render_table_html("index_table_body", html);
     },
 
-    /**
-     * 设置 option 的第 nth 项为默认项
-     * @param obj
-     * @param nth
-     */
-    set_option_selected: function (obj, nth) {
-        let option_val = "";
-        obj.find("option").each(function () {
-            if (option_val === "" || nth >= 0) {
-                option_val = $(this).attr("value");
-            }
-            nth -= 1;
-        });
-        obj.val(option_val);
-    },
-
-    /**
-     * 设置当年的第一个项为默认项
-     * @param obj
-     */
-    set_year_option_selected: function (obj) {
-        let date = new Date();
-        let year = date.getFullYear();
-        let option_val = "";
-        obj.find("option").each(function () {
-            let o_val = $(this).attr("value");
-            if (year === parseInt(o_val.split('-')[0])) {
-                option_val = o_val
-            }
-        });
-        if (option_val !== "") {
-            obj.val(option_val);
-        } else {
-            Util.set_option_selected(obj, 100);
-        }
-    },
-
     /**
      * 初始日期范围选择器
      * @param element_id
@@ -3651,7 +3616,7 @@ const Util = {
         html.push('<span class="fa fa-calendar-o form-control-feedback left" aria-hidden="true"></span>');
         html.push('</div>');
         html.push('</div>');
-        $("#" + element_id).html(html.join(""));
+        document.getElementById(element_id).innerHTML = html.join("");
         Util.init_range_picker_date(start_id, end_id, nth_day);
         Util.init_time_select_range(Obj, select_id, start_id, end_id, callback_func);
     },