sbd-npm 1.1.96 → 1.1.99

package/package.json

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

package/stock_basics.js

@@ -356,10 +356,10 @@ let Stock = {
             Util.init_table_skeleton({
                 "element_id": "big_deal_summary_table",
                 "head_cols": [
-                    {"name": "20日主力净流入", "table_sort": 1},
-                    {"name": "10日主力净流入", "table_sort": 1},
-                    {"name": "5日主力净流入", "table_sort": 1},
-                    {"name": "3日主力净流入", "table_sort": 1},
+                    {"name": "20日主力净流入"},
+                    {"name": "10日主力净流入"},
+                    {"name": "5日主力净流入"},
+                    {"name": "3日主力净流入"},
                 ]
             });
             Util.init_table_skeleton({

package/util.js

@@ -262,7 +262,7 @@ const Util = {
                 return location;
             }
             if (location_name === "") {
-                location_name = location.length > 10 ? location.substr(0, 10) : location;
+                location_name = location.length > 20 ? location.substr(0, 20) : location;
             }
             return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://map.baidu.com/m?fr=ps01000&word=" + location + "'>" + location_name + "</a>";
         }
@@ -281,7 +281,7 @@ const Util = {
                 return location;
             }
             if (location_name === "") {
-                location_name = location.length > 10 ? location.substr(0, 10) : location;
+                location_name = location.length > 20 ? location.substr(0, 20) : location;
             }
             return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://www.google.com/maps?&hl=zh-Hans&q=" + location + "'>" + location_name + "</a>";
         }
@@ -1350,6 +1350,8 @@ const Util = {
         _html.push('<option value="10">半年前</option>');
         _html.push('<option value="11">一年前</option>');
         _html.push('<option value="99">所有时间</option>');
+        _html.push('<option value="100">还原</option>');
+        _html.push('<option value="101">置空</option>');
         select_obj.html(_html.join(""));
         select_obj.change(function () {
             let select_val = $("#" + select_id).val();
@@ -1358,6 +1360,7 @@ const Util = {
             sd_obj.attr("disabled", false);
             ed_obj.attr("disabled", false);
             let weekday = Util.get_weekday();
+            let date = new Date();
             let year = date.getFullYear();
             let month = date.getMonth() + 1;
             let current_month_format = year + "-" + (month < 10 ? '0' + month : month) + "-01";
@@ -1426,6 +1429,14 @@ const Util = {
                     sd_obj.attr("disabled", true);
                     ed_obj.attr("disabled", true);
                     break;
+                case "100": // 还原
+                    sd_obj.val(Obj.start_date);
+                    ed_obj.val(Obj.end_date);
+                    break;
+                case "101": // 置空
+                    sd_obj.val("");
+                    ed_obj.val("");
+                    break;
             }
             Util.init_range_picker_date(start_id, end_id);
             if (select_val === "0") {  // 记录之前的时间
@@ -1917,6 +1928,7 @@ const Util = {
                 let valid_code_list = [];
                 let total_change_percent = 0;
                 let total_year_change_percent = 0;
+                let total_d5_change_percent = 0;
                 $.each(j, function (code, item) {
                     if (item["price"] && item["previous_price"] && item["price"] > 0 && item["previous_price"] > 0) {
                         valid_code_list.push(item["code"]);
@@ -1924,6 +1936,9 @@ const Util = {
                         if (item["year_price"] && item["year_price"] > 0) {
                             total_year_change_percent += ((item["price"] - item["year_price"]) / item["year_price"]);
                         }
+                        if (item["d5_price"] && item["d5_price"] > 0) {
+                            total_d5_change_percent += ((item["price"] - item["d5_price"]) / item["d5_price"]);
+                        }
                     }
                     Util.render_price(item);
                     if (item["holder_num"] && item["holder_num"] > 0) {
@@ -1968,29 +1983,8 @@ const Util = {
                     if ($("#" + element_id + "_tips").length) {
                         let average_change_percent = Math.round((total_change_percent / total_num) * 10000) / 100;
                         let average_year_change_percent = Math.round((total_year_change_percent / total_num) * 10000) / 100;
-                        let week_tips_id = element_id + "week_tips";
-                        $("#" + element_id + "_tips").html('共 <span class="label label-info">' + total_num + '</span> 家 平均涨跌: ' + Util.parse_ratio(average_change_percent) + "<span id='" + week_tips_id + "'></span> 年初至今: " + Util.parse_ratio(average_year_change_percent));
-                        let code_price_dict = {};
-                        valid_code_list.forEach(function (code) {
-                            code_price_dict[code] = j[code]["price"];
-                        });
-                        Util.post("/action", {action: "code_d5_price", code_list: code_list.join("-")}, function (j) {
-                            let total_num = 0;
-                            let total_week_change_percent = 0;
-                            $.each(j, function (code, d5_price) {
-                                if (d5_price > 0 && code_price_dict[code]) {
-                                    total_num += 1;
-                                    total_week_change_percent += ((code_price_dict[code] - d5_price) / d5_price);
-                                    $(".d5_price_" + code).each(function () {
-                                        $(this).html(Util.year_price_rate(code_price_dict[code], d5_price));
-                                    });
-                                }
-                            });
-                            if (total_num > 0) {
-                                let average_week_change_percent = Math.round((total_week_change_percent / total_num) * 10000) / 100;
-                                $("#" + week_tips_id).html(" 最近5日: " + Util.parse_ratio(average_week_change_percent));
-                            }
-                        });
+                        let average_d5_change_percent = Math.round((total_d5_change_percent / total_num) * 10000) / 100;
+                        $("#" + element_id + "_tips").html('共 <span class="label label-info">' + total_num + '</span> 家 平均涨跌: ' + Util.parse_ratio(average_change_percent) + " 最近5日: " + Util.parse_ratio(average_d5_change_percent) + " 年初至今: " + Util.parse_ratio(average_year_change_percent));
                     }
                 }
                 Util.hide_tips();