sbd-npm 1.3.69 → 1.3.71

package/package.json

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

package/summary_daily.js

@@ -47,10 +47,8 @@ $(function () {
         load_cache: function () {
             DailySummary["hsgt_money_flow_chart"] = Util.show_chart_loading(DailySummary["hsgt_money_flow_chart"], "hsgt_money_flow_line");
             try {
+                Util.set_table_loading("market_overview_zone");
                 let cache = DailySummary.get_cache();
-                if (cache.hasOwnProperty("market_overview")) {
-                    DailySummary.pack_market_overview(cache["market_overview"]);
-                }
                 if (cache.hasOwnProperty("index")) {
                     DailySummary.pack_index_data(cache["index"]);
                 }
@@ -88,11 +86,9 @@ $(function () {
          * 当前行情指数
          */
         pack_index_data: function (index_data) {
-            let _html = [];
-            let change_color_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";
@@ -147,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("");
             };
@@ -163,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);
         },
@@ -310,19 +306,37 @@ $(function () {
                             mo_amount += market["item"]["amount"];
                         }
                         _html.push("<tr>");
-                        _html.push("<td>", Util.pack_html_link(market["url"], market["name"]), "</td>");
-                        _html.push(DailySummary.pack_mo_item_html(market, "market_capital", "万亿"));
-                        _html.push(DailySummary.pack_mo_item_html(market, "pe", ""));
-                        _html.push(DailySummary.pack_mo_item_html(market, "volume", "亿股"));
-                        _html.push(DailySummary.pack_mo_item_html(market, "amount", "亿"));
+                        _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 && 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 {
+                                    amount = "<b title='前值: " + market["item"]["prev_amount"] + "亿' class='text-success'>" + market["item"]["amount"] + "亿</b>";
+                                }
+                            } else {
+                                amount = market["item"]["amount"] + "亿";
+                            }
+                        }
+                        _html.push("<td style='padding: 18px 0;'>", amount, "</td>");
                         _html.push("</tr>");
                     }
                 }
             }
             $("#market_overview_zone").html(_html.join(""));
-            if (market_overview_dict["total_amount_data"] && market_overview_dict["total_amount_data"].length === 2 && market_overview_dict["total_amount_data"][0]["amount"] > 0 && market_overview_dict["total_amount_data"][1]["amount"] > 0) {
-                mo_amount = Util.to_hundred_million(market_overview_dict["total_amount_data"][0]["amount"], 3)
-                previous_mo_amount = Util.to_hundred_million(market_overview_dict["total_amount_data"][1]["amount"], 3)
+            if (market_overview_dict["total_amount_data"] && market_overview_dict["total_amount_data"].length === 2 && market_overview_dict["total_amount_data"][0] > 0 && market_overview_dict["total_amount_data"][1] > 0) {
+                mo_amount = Util.to_hundred_million(market_overview_dict["total_amount_data"][0], 3)
+                previous_mo_amount = Util.to_hundred_million(market_overview_dict["total_amount_data"][1], 3)
             }
             if (mo_amount > previous_mo_amount) {
                 mo_amount_cls = "label-danger";
@@ -331,32 +345,13 @@ $(function () {
                 mo_amount_cls = "label-success";
             }
             let mo_amount_obj = $("#market_overview_amount");
-            mo_amount_obj.attr("title", Util.to_float(previous_mo_amount, 3));
+            mo_amount_obj.attr("title", "前值: " + Util.to_float(previous_mo_amount, 3) + "亿");
             mo_amount_obj.removeClass("label-danger");
             mo_amount_obj.removeClass("label-success");
             if (mo_amount_cls.length > 0) {
                 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;
         },
 
         /**
@@ -541,7 +536,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);
                     }
                 });
@@ -550,10 +545,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++;
@@ -570,8 +564,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 () {
@@ -586,7 +580,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();
             });
         }
@@ -601,8 +595,11 @@ $(function () {
         $("#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": "none",
         "head_cols": [
             {"name": "序号"},
             {"name": "代码"},
@@ -627,12 +624,15 @@ $(function () {
     });
     srm_obj.on('hidden.bs.modal', function () {
         $("#cp_val").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": "时间"},
@@ -644,8 +644,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

@@ -4197,7 +4197,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"])},