sbd-npm 1.3.70 → 1.3.72

package/package.json

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

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,12 +85,10 @@ $(function () {
         /**
          * 当前行情指数
          */
-        pack_index_data: function (index_data) {
-            let _html = [];
-            let change_color_data = [];
+        pack_index_summary_data: function (index_data) {
+            let _html = [], change_color_data = [];
             index_data.forEach(function (item) {
-                let cls = "";
-                let sort = "";
+                let cls = "", sort = "";
                 if (item["change"] > 0) {
                     cls = "red";
                     sort = "fa-sort-asc";
@@ -115,7 +113,7 @@ $(function () {
                 _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('</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"]);
@@ -145,7 +143,7 @@ $(function () {
                 _stock_rate_html.push('<span class="sr-only">', rate_width, '% Complete</span>');
                 _stock_rate_html.push('</div>');
                 _stock_rate_html.push('</div></div>');
-                _stock_rate_html.push('<div class="w_right w_20"><span><a href="#" data-toggle="modal" data-target=".stock-rate-modal" data-cp="', rate_range, '">', rate, '</a></span></div>');
+                _stock_rate_html.push('<div class="w_right w_20"><span><a href="#" data-toggle="modal" data-target=".stock_rate_modal" data-cp="', rate_range, '">', rate, '</a></span></div>');
                 _stock_rate_html.push('</div>');
                 return _stock_rate_html.join("");
             };
@@ -161,8 +159,8 @@ $(function () {
             $("#stock_rate_bar").html(stock_rate_html.join(""));
             let up_num = pr["r0_3"] + pr["r3_5"] + pr["r5_7"] + pr["r7_10"];
             let down_num = pr["r10_7"] + pr["r7_5"] + pr["r5_3"] + pr["r3_0"];
-            let stock_rate_tips = '涨: <b style="color: #FFF;" class="label label-danger">' + up_num + '</b> (涨停:<b><a style="text-decoration: underline;" class="text-danger" href="#" data-toggle="modal" data-target=".stock-rate-modal" data-cp="10% ~ 10%">' + pr["r10"] + '</a></b>), ';
-            stock_rate_tips += '跌: <b style="color: #FFF;" class="label label-success">' + down_num + '</b> (跌停:<b><a style="text-decoration: underline;" class="text-success" href="#" data-toggle="modal" data-target=".stock-rate-modal" data-cp="-10% ~ -10%">' + pr["r_10"] + '</a></b>), ';
+            let stock_rate_tips = '涨: <b style="color: #FFF;" class="label label-danger">' + up_num + '</b> (涨停:<b><a style="text-decoration: underline;" class="text-danger" href="#" data-toggle="modal" data-target=".stock_rate_modal" data-cp="10% ~ 10%">' + pr["r10"] + '</a></b>), ';
+            stock_rate_tips += '跌: <b style="color: #FFF;" class="label label-success">' + down_num + '</b> (跌停:<b><a style="text-decoration: underline;" class="text-success" href="#" data-toggle="modal" data-target=".stock_rate_modal" data-cp="-10% ~ -10%">' + pr["r_10"] + '</a></b>), ';
             stock_rate_tips += '涨跌比: <b style="color: #FFF;" class="label label-info">' + Util.to_float(up_num / down_num, 2) + '</b>';
             $("#stock_rate_tips").html(stock_rate_tips);
         },
@@ -176,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"]
@@ -309,18 +307,22 @@ $(function () {
                         }
                         _html.push("<tr>");
                         _html.push("<td style='padding: 18px 0;'>", Util.pack_html_link(market["url"], market["name"]), "</td>");
+                        if (!market["item"]["market_capital"] && market["item"]["prev_market_capital"]) {
+                            market["item"]["market_capital"] = market["item"]["prev_market_capital"];
+                        }
                         _html.push("<td style='padding: 18px 0;'>", (market["item"]["market_capital"] ? (market["item"]["market_capital"] + "万亿") : "--"), "</td>");
+                        if (!market["item"]["pe"] && market["item"]["prev_pe"]) {
+                            market["item"]["pe"] = market["item"]["prev_pe"];
+                        }
                         _html.push("<td style='padding: 18px 0;'>", (market["item"]["pe"] ? market["item"]["pe"] : "--"), "</td>");
                         _html.push("<td style='padding: 18px 0;'>", (market["item"]["volume"] ? (market["item"]["volume"] + "亿股") : "--"), "</td>");
                         let amount = "--";
                         if (market["item"]["amount"] && market["item"]["amount"] > 0) {
-                            if (market["item"]["prev_amount"] && market["item"]["prev_amount"] > 0) {
+                            if (market["item"]["prev_amount"] && market["item"]["prev_amount"] > 0 && market["item"]["amount"] !== market["item"]["prev_amount"]) {
                                 if (market["item"]["amount"] > market["item"]["prev_amount"]) {
                                     amount = "<b title='前值: " + market["item"]["prev_amount"] + "亿' class='text-danger'>" + market["item"]["amount"] + "亿</b>";
-                                } else if (market["item"]["amount"] < market["item"]["prev_amount"]) {
-                                    amount = "<b title='前值: " + market["item"]["prev_amount"] + "亿' class='text-success'>" + market["item"]["amount"] + "亿</b>";
                                 } else {
-                                    amount = market["item"]["amount"] + "亿";
+                                    amount = "<b title='前值: " + market["item"]["prev_amount"] + "亿' class='text-success'>" + market["item"]["amount"] + "亿</b>";
                                 }
                             } else {
                                 amount = market["item"]["amount"] + "亿";
@@ -350,41 +352,20 @@ $(function () {
                 mo_amount_obj.addClass(mo_amount_cls);
             }
             mo_amount_obj.html(Util.to_float(mo_amount, 3) + "(" + mo_amount_sign + Util.to_float(mo_amount - previous_mo_amount, 3) + ")");
-            DailySummary.set_cache("market_overview", market_overview_dict);
-        },
-
-        pack_mo_item_html: function (market, key, unit) {
-            let _html = "<td>--</td>";
-            if (market["item"]) {
-                let val = market["item"][key];
-                if (val && val > 0) {
-                    let prev_val = market["item"]["prev_" + key];
-                    let mo_trend = "";
-                    if (val > prev_val) {
-                        mo_trend = "<b class='text-danger'> ↑</b>";
-                    } else if (val < prev_val) {
-                        mo_trend = "<b class='text-success'> ↓</b>";
-                    }
-                    _html = "<td title='" + prev_val + "'>" + val + unit + mo_trend + "</td>";
-                }
-            }
-            return _html;
         },
 
         /**
          * 一些统计数据
          */
         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"]);
@@ -452,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["close"], "</td>");
+                    _html.push("<td>", item["low"], "</td>");
+                    _html.push("<td>", item["high"], "</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();
+            });
         }
 
     };
@@ -478,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"));
@@ -492,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 {
@@ -553,7 +561,7 @@ $(function () {
                 Modal.render_stock_rate_html();
                 $("#p_change_type").change(function () {
                     if (!Util.is_load) {
-                        Util.set_table_loading("stock_rate_table_body");
+                        Util.set_table_loading("stock_rate_modal_body_body");
                         Modal.render_stock_rate_modal(obj);
                     }
                 });
@@ -562,10 +570,9 @@ $(function () {
         },
 
         render_stock_rate_html: function() {
-            let _html = [];
+            let _html = [], index = 0;
             let industry = $("#p_change_industry").val();
             let area = $("#p_change_area").val();
-            let index = 0;
             Modal["p_change_data"].forEach(function (item) {
                 if (Util.is_industry_area(item, industry, area)) {
                     index++;
@@ -582,8 +589,8 @@ $(function () {
                     _html.push("</tr>");
                 }
             });
-            Util.render_table_html("stock_rate_table_body", _html);
-            Util.init_stock_stuff("stock_rate_table_body", [], 0, 0);
+            Util.render_table_html("stock_rate_modal_body_body", _html);
+            Util.init_stock_stuff("stock_rate_modal_body_body", [], 0, 0);
         },
 
         render_news_modal: function () {
@@ -598,7 +605,7 @@ $(function () {
                     _html.push("<td>", Util.sub_str(item["content"], 40), "</td>");
                     _html.push("</tr>");
                 });
-                Util.render_table_html("news_modal_table_body", _html);
+                Util.render_table_html("news_modal_body_body", _html);
                 Util.hide_tips();
             });
         }
@@ -609,12 +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"><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": "日期", "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_table",
+        "element_id": "stock_rate_modal_body",
+        "caption": '<caption class="text-right" id="stock_rate_modal_body_body_tips"></caption>',
         "head_cols": [
             {"name": "序号"},
             {"name": "代码"},
@@ -639,12 +680,16 @@ $(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();
-        $("#stock_rate_table_body").html("<tr><td colspan='9'>Loading...</td></tr>");
     });
 
+    Util.init_modal_skeleton("news_modal", '');
+    $("#news_modal_title").html(Util.pack_html_link("http://www.pbc.gov.cn/zhengcehuobisi/125207/125213/125431/125475/index.html", "中国人民银行公开市场业务交易公告"));
     Util.init_table_skeleton({
-        "element_id": "news_modal_table",
+        "element_id": "news_modal_body",
+        "caption": "none",
         "head_cols": [
             {"name": "标题"},
             {"name": "时间"},
@@ -656,8 +701,8 @@ $(function () {
         Modal.render_news_modal();
     });
     news_obj.on('hidden.bs.modal', function () {
+        Util.set_table_loading("news_modal_body_body");
         Util.hide_tips();
-        $("#news_modal_table_body").html("<tr><td colspan='3'>Loading...</td></tr>");
     });
 
     $("#hgt_bound").change(function () {

package/util.js

@@ -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) {
@@ -4197,7 +4202,7 @@ const Util = {
     big_deal_pie: function (element_id, data) {
         let buy = Util.to_unit(data["buy1000"] + data["buy800"] + data["buy600"] + data["buy400"]);
         let sell = Util.to_unit(data["sell1000"] + data["sell800"] + data["sell600"] + data["sell400"]);
-        $("#" + element_id + "_tips").html("流入: <b class='text-danger'>" + Util.strip_html(buy) + "</b>，流出: <b class='text-success'>" + Util.strip_html(sell) + "</b>");
+        $("#" + element_id + "_tips").html("流入:<b class='text-danger'>" + Util.strip_html(buy) + "</b>，流出:<b class='text-success'>" + Util.strip_html(sell) + "</b>");
         let bd_data = [
             {name: '超大单流入', value: Util.to_hundred_million(data["buy1000"])},
             {name: '大单流入', value: Util.to_hundred_million(data["buy800"])},