sbd-npm 1.3.71 → 1.3.73

package/package.json

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

package/stock_basics.js

@@ -367,6 +367,7 @@ let Stock = {
                 "element_id": "big_deal_summary_table",
                 "head_cols": [
                     {"name": "主力总净流入", "link": money_inflow_url},
+                    {"name": "60日主力净流入"},
                     {"name": "20日主力净流入", "link": money_inflow_url + "?money_inflow_type=5"},
                     {"name": "10日主力净流入", "link": money_inflow_url + "?money_inflow_type=4"},
                     {"name": "5日主力净流入", "link": money_inflow_url + "?money_inflow_type=3"},
@@ -394,7 +395,7 @@ let Stock = {
                 }
                 if (j["money_net_inflow"]) {
                     let _html = [], i = 0, total_net_inflow = 0;
-                    let day3_net_inflow = 0, day5_net_inflow = 0, day10_net_inflow = 0, day20_net_inflow = 0
+                    let day3_net_inflow = 0, day5_net_inflow = 0, day10_net_inflow = 0, day20_net_inflow = 0, day60_net_inflow = 0;
                     j["money_net_inflow"].forEach(function (item) {
                         i++;
                         total_net_inflow += item["main_net_inflow"];
@@ -410,6 +411,9 @@ let Stock = {
                         if (i <= 20) {
                             day20_net_inflow += item["main_net_inflow"];
                         }
+                        if (i <= 60) {
+                            day60_net_inflow += item["main_net_inflow"];
+                        }
                         _html.push("<tr>");
                         _html.push("<td>", Util.seconds_to_format(item["date"], "%Y-%m-%d"), "</td>");
                         _html.push("<td><b class='", Util.text_color(item["price_change"]), "'>", item["price"], "(", item["price_change"], "%)</b></td>");
@@ -425,11 +429,12 @@ let Stock = {
                     Util.render_table_html("big_deal_table_body", _html);
                     _html = [];
                     _html.push("<tr>");
-                    _html.push("<td><b class='", Util.text_color(total_net_inflow), "'>", Util.to_unit(total_net_inflow, 4), "</b></td>");
-                    _html.push("<td><b class='", Util.text_color(day20_net_inflow), "'>", Util.to_unit(day20_net_inflow, 4), "</b></td>");
-                    _html.push("<td><b class='", Util.text_color(day10_net_inflow), "'>", Util.to_unit(day10_net_inflow, 4), "</b></td>");
-                    _html.push("<td><b class='", Util.text_color(day5_net_inflow), "'>", Util.to_unit(day5_net_inflow, 4), "</b></td>");
-                    _html.push("<td><b class='", Util.text_color(day3_net_inflow), "'>", Util.to_unit(day3_net_inflow, 4), "</b></td>");
+                    _html.push("<td><b class='", Util.text_color(total_net_inflow), "'>", Util.to_unit(total_net_inflow, 3), "</b></td>");
+                    _html.push("<td><b class='", Util.text_color(day60_net_inflow), "'>", Util.to_unit(day60_net_inflow, 3), "</b></td>");
+                    _html.push("<td><b class='", Util.text_color(day20_net_inflow), "'>", Util.to_unit(day20_net_inflow, 3), "</b></td>");
+                    _html.push("<td><b class='", Util.text_color(day10_net_inflow), "'>", Util.to_unit(day10_net_inflow, 3), "</b></td>");
+                    _html.push("<td><b class='", Util.text_color(day5_net_inflow), "'>", Util.to_unit(day5_net_inflow, 3), "</b></td>");
+                    _html.push("<td><b class='", Util.text_color(day3_net_inflow), "'>", Util.to_unit(day3_net_inflow, 3), "</b></td>");
                     _html.push("</tr>");
                     Util.render_table_html("big_deal_summary_table_body", _html);
                 }

package/summary_daily.js

@@ -50,7 +50,7 @@ $(function () {
                 Util.set_table_loading("market_overview_zone");
                 let cache = DailySummary.get_cache();
                 if (cache.hasOwnProperty("index")) {
-                    DailySummary.pack_index_data(cache["index"]);
+                    DailySummary.pack_index_summary_data(cache["index"]);
                 }
                 if (cache.hasOwnProperty("change_percent")) {
                     DailySummary.pack_change_percent(cache["change_percent"]);
@@ -85,7 +85,7 @@ $(function () {
         /**
          * 当前行情指数
          */
-        pack_index_data: function (index_data) {
+        pack_index_summary_data: function (index_data) {
             let _html = [], change_color_data = [];
             index_data.forEach(function (item) {
                 let cls = "", sort = "";
@@ -110,10 +110,10 @@ $(function () {
                 let index_name = item["href"] ? Util.pack_html_link(item["href"], item["name"]) : item["name"];
                 _html.push('<span class="count_top"><i class="fa"></i> ', index_name, '</span>');
                 _html.push('<div class="count ', cls, '">', item["value"], '</div>');
-                _html.push('<span class="count_bottom"><i class="', cls, '"><i class="fa ', sort, '"></i>', item["change"], '(<span id="', change_rate_id, '">', item["change_rate"], '</span>%)</i></span>');
+                _html.push('<span class="count_bottom"><i class="', cls, '"><i class="fa ', sort, '"></i>', item["change"], '(<span id="', change_rate_id, '">', Util.to_float(item["change_rate"], 2), '</span>%)</i></span>');
                 _html.push('</div>');
             });
-            $("#index_data").html(_html.join(""));
+            $("#index_summary_data").html(_html.join(""));
             change_color_data.forEach(function (item) {
                 let change_rate_obj = $("#change_rate_" + item["key"]);
                 change_rate_obj.css("background-color", item["new"]);
@@ -174,7 +174,7 @@ $(function () {
             let bd_obj = $('#big_deal_pie');
             if (bd_obj.length) {
                 if (big_deal_date > 0) {
-                    $("#big_deal_date").html("(" + Util.seconds_to_format(big_deal_date, "%Y-%m-%d") + ") ");
+                    $("#big_deal_date").html("(" + Util.seconds_to_format(big_deal_date, "%Y-%m-%d") + ")");
                 }
                 if (DailySummary.big_deal === {} || DailySummary.big_deal["buy1000"] !== bd["buy1000"] || DailySummary.big_deal["buy800"] !== bd["buy800"]
                     || DailySummary.big_deal["buy600"] !== bd["buy600"] || DailySummary.big_deal["buy400"] !== bd["buy400"]
@@ -358,16 +358,14 @@ $(function () {
          * 一些统计数据
          */
         fetch_statistics_daily: function () {
-            let date = $("#trade_date").val();
-            let news_type = $("#news_type").val();
             let payload = {
-                date: date,
+                date: $("#trade_date").val(),
                 action: "statistics_daily",
                 limit_num: DailySummary.limit_num(),
-                news_type: news_type
+                news_type: $("#news_type").val()
             };
             Util.post(location.pathname, payload, function (j) {
-                DailySummary.pack_index_data(j["index"]);
+                DailySummary.pack_index_summary_data(j["index"]);
                 DailySummary.pack_change_percent(j["change_percent"]);
                 DailySummary.pack_big_deal(j["big_deal"], j["big_deal_date"]);
                 DailySummary.pack_hsgt_money_flow(j["hmf"]);
@@ -435,6 +433,34 @@ $(function () {
                 });
                 Util.render_table_html(market + "_table_body", _html);
             }
+        },
+
+        // 指数历史行情数据
+        render_index_hist_modal: function() {
+            Util.show_loading();
+            let payload = {
+                action: "index_hist",
+                index_code: "ths_all_a",
+                start_date: $("#index_hist_modal_start_date").val(),
+                end_date: $("#index_hist_modal_end_date").val()
+            };
+            Util.post("/action", payload, function (j) {
+                let _html = [];
+                j["data"].forEach(function (item) {
+                    _html.push("<tr>");
+                    _html.push("<td>", Util.seconds_to_format(item["date"], "%Y-%m-%d"), "</td>");
+                    _html.push("<td>", item["open"], "</td>");
+                    _html.push("<td>", item["low"], "</td>");
+                    _html.push("<td>", item["high"], "</td>");
+                    _html.push("<td>", item["close"], "</td>");
+                    _html.push("<td>", Util.parse_ratio(item["p_change_rate"]), "</td>");
+                    _html.push("<td data-val='", item["volume"], "'>", Util.to_unit(item["volume"]), "股</td>");
+                    _html.push("<td data-val='", item["amount"], "'>", Util.to_unit(item["amount"]), "</td>");
+                    _html.push("</tr>");
+                });
+                Util.render_table_html("index_hist_modal_body_body", _html);
+                Util.hide_tips();
+            });
         }
 
     };
@@ -461,8 +487,7 @@ $(function () {
             if (!chart_instance) {
                 $("#" + element_id).html('<div class="x_panel"><div class="x_title"><h2>' + title + '</h2><div class="clearfix"></div></div><div class="x_content2" style="height:450px;"><div id="' + line_id + '" class="graph_line"></div></div></div>');
             }
-            let date_data = [];
-            let val_data = [];
+            let date_data = [], val_data = [];
             data.forEach(function (item) {
                 if (item[key] && item[key] > 0) {
                     date_data.push(Util.seconds_to_format(item["date"], "%Y-%m-%d"));
@@ -475,7 +500,7 @@ $(function () {
         render_market_overview_modal: function (obj) {
             let title = $.trim($(obj).text());
             $("#at_title").html("[" + title + "]数据");
-            $("#market_overview_load_status").html("<tr><td colspan='6'>Loading...</td></tr>");
+            Util.set_table_loading("market_overview_load_status");
             if (Modal.mo_end_time === 0) {
                 Modal.init_market_overview_time(obj);
             } else {
@@ -591,15 +616,46 @@ $(function () {
         Modal.render_market_overview_modal(e.relatedTarget);
     });
     mom_obj.on('hidden.bs.modal', function () { // 此事件在模态框被隐藏（并且同时在 CSS 过渡效果完成）之后被触发
+        Util.set_table_loading("market_overview_load_status");
+        Util.hide_tips();
+    });
+
+    Util.init_modal_skeleton("index_hist_modal", '');
+    $("#index_hist_modal_title").html(Util.pack_html_link("https://m.10jqka.com.cn/stockpage/48_883957/", "同花顺全A指数"));
+    Util.init_table_skeleton({
+        "element_id": "index_hist_modal_body",
+        "caption": '<caption class="text-right" style="margin-top: -10px; padding-bottom: 10px;"><div class="form-inline"><div class="form-group" id="index_hist_modal_start_end_date"></div><button class="btn btn-default" id="index_hist_modal_query">查 询</button></div></caption>',
+        "head_cols": [
+            {"name": "日期", "class": "info", "table_sort": 1},
+            {"name": "开盘价", "table_sort": 1},
+            {"name": "最低价", "table_sort": 1},
+            {"name": "最高价", "table_sort": 1},
+            {"name": "收盘价", "table_sort": 1},
+            {"name": "涨跌", "table_sort": 1},
+            {"name": "成交量", "table_sort": 1},
+            {"name": "成交额", "table_sort": 1},
+        ]
+    });
+    let mam_obj = $('#index_hist_modal');
+    mam_obj.on('shown.bs.modal', function (e) {
+        Util.set_table_loading("index_hist_modal_body_body");
+        if ($("#index_hist_modal_start_date").length <= 0) {
+            Util.init_range_date("index_hist_modal_start_end_date", DailySummary, "render_index_hist_modal");
+        }
+        $("#index_hist_modal_query").click(function () {
+            DailySummary.render_index_hist_modal();
+        });
+        DailySummary.render_index_hist_modal();
+    });
+    mam_obj.on('hidden.bs.modal', function () {
         Util.hide_tips();
-        $("#market_overview_load_status").html("<tr><td colspan='6'>Loading...</td></tr>");
     });
 
     Util.init_modal_skeleton("stock_rate_modal", '');
     $("#stock_rate_modal_title").html("<span id='cp_val'></span>涨跌幅");
     Util.init_table_skeleton({
         "element_id": "stock_rate_modal_body",
-        "caption": "none",
+        "caption": '<caption class="text-right" id="stock_rate_modal_body_body_tips"></caption>',
         "head_cols": [
             {"name": "序号"},
             {"name": "代码"},
@@ -624,6 +680,7 @@ $(function () {
     });
     srm_obj.on('hidden.bs.modal', function () {
         $("#cp_val").html("");
+        $("#stock_rate_modal_body_body_tips").html("");
         Util.set_table_loading("stock_rate_modal_body_body");
         Util.hide_tips();
     });

package/util.js

@@ -1636,9 +1636,9 @@ const Util = {
         Util.init_modal_skeleton(component_id);
         Util.init_table_skeleton({
             "element_id": component_id + "_body",
-            "caption": '<caption class="text-right"><div class="form-inline"><div class="form-group" id="currency_modal_start_end_date"></div><button class="btn btn-default" id="' + component_id + '_query">查 询</button></div></caption>',
+            "caption": '<caption class="text-right" style="margin-top: -10px;"><div class="form-inline"><div class="form-group" id="currency_modal_start_end_date"></div><button class="btn btn-default" id="' + component_id + '_query">查 询</button></div></caption>',
             "head_cols": [
-                {"name": "日期", "table_sort": 1},
+                {"name": "日期", "class": "info", "table_sort": 1},
                 {"name": "价格", "table_sort": 1},
                 {"name": "最低价", "table_sort": 1},
                 {"name": "最高价", "table_sort": 1},
@@ -1724,13 +1724,13 @@ const Util = {
         Util.init_modal_skeleton(component_id);
         Util.init_table_skeleton({
             "element_id": component_id + "_body",
-            "caption": '<caption class="text-right"><div class="form-inline"><div class="form-group" id="' + component_id + '_start_end_date"></div><button class="btn btn-default" id="' + component_id + '_query">查 询</button></div></caption>',
+            "caption": '<caption class="text-right" style="margin-top: -10px;"><div class="form-inline"><div class="form-group" id="' + component_id + '_start_end_date"></div><button class="btn btn-default" id="' + component_id + '_query">查 询</button></div></caption>',
             "head_cols": [
-                {"name": "日期", "table_sort": 1},
+                {"name": "日期", "class": "info", "table_sort": 1},
                 {"name": "开盘价", "table_sort": 1},
-                {"name": "收盘价", "table_sort": 1},
                 {"name": "最低价", "table_sort": 1},
                 {"name": "最高价", "table_sort": 1},
+                {"name": "收盘价", "table_sort": 1},
                 {"name": "涨跌", "table_sort": 1},
                 {"name": "成交额", "table_sort": 1},
                 {"name": "总市值", "table_sort": 1},
@@ -1738,8 +1738,8 @@ const Util = {
         });
         let component_obj = $('#' + component_id);
         component_obj.on('shown.bs.modal', function (e) {   // 此事件在模态框已经显示出来触发
-            let coin = $(e.relatedTarget).attr("data-coin");
             Util.set_table_loading(component_id + "_body_body");
+            let coin = $(e.relatedTarget).attr("data-coin");
             if ($("#" + component_id + "_start_date").length <= 0) {
                 Util.init_range_date(component_id + "_start_end_date", Util, "render_btc_modal", 60);
             }
@@ -1752,7 +1752,6 @@ const Util = {
             Util.render_btc_modal();
         });
         component_obj.on('hidden.bs.modal', function () {   // 此事件在模态框被隐藏（并且同时在 CSS 过渡效果完成）之后被触发
-            Util.set_table_loading(component_id + "_body_body");
             Util.hide_tips();
         });
     },
@@ -1767,7 +1766,13 @@ const Util = {
             return false;
         }
         Util.show_loading();
-        let payload = {coin: coin, start_date: $("#btc_modal_start_date").val(), end_date: $("#btc_modal_end_date").val(), action: "btc_data", "currency_type": $("#currency_type").val()};
+        let payload = {
+            coin: coin,
+            start_date: $("#btc_modal_start_date").val(),
+            end_date: $("#btc_modal_end_date").val(),
+            action: "btc_data",
+            "currency_type": $("#currency_type").val()
+        };
         Util.post(Util.get_url("coin_price"), payload, function (j) {
             let _html = [], low_price = 0, high_price = 0;
             j["data"].forEach(function (item) {
@@ -1786,9 +1791,9 @@ const Util = {
                 }
                 _html.push("<td>", Util.seconds_to_format(item["date"], "%Y-%m-%d"), "</td>");
                 _html.push("<td>", item["open"], "</td>");
-                _html.push("<td>", item["price"], "</td>");
                 _html.push("<td>", item["low"], "</td>");
                 _html.push("<td>", item["high"], "</td>");
+                _html.push("<td>", item["price"], "</td>");
                 _html.push("<td>", Util.parse_ratio(item["p_change"]), "</td>");
                 _html.push("<td>", Util.to_unit(item["amount"]), "</td>");
                 _html.push("<td>", Util.to_unit(item["market_capital"]), "</td>");