sbd-npm 1.3.67 → 1.3.69

package/package.json

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

package/summary_daily.js

@@ -300,9 +300,7 @@ $(function () {
          * 市场成交概况
          */
         pack_market_overview: function (market_overview_dict) {
-            let _html = [];
-            let previous_mo_amount = 0;
-            let mo_amount = 0;
+            let _html = [], previous_mo_amount = 0, mo_amount = 0, mo_amount_cls = "", mo_amount_sign = "";
             for (let market_type in market_overview_dict) {
                 if (market_overview_dict.hasOwnProperty(market_type)) {
                     let market = market_overview_dict[market_type];
@@ -322,13 +320,14 @@ $(function () {
                 }
             }
             $("#market_overview_zone").html(_html.join(""));
-            let mo_amount_cls = "";
-            let mo_amount_sign = "";
-            let dist_amount = Util.to_float(mo_amount - previous_mo_amount, 3);
-            if (dist_amount > 0) {
+            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 (mo_amount > previous_mo_amount) {
                 mo_amount_cls = "label-danger";
                 mo_amount_sign = "+";
-            } else if (dist_amount < 0) {
+            } else if (mo_amount < previous_mo_amount) {
                 mo_amount_cls = "label-success";
             }
             let mo_amount_obj = $("#market_overview_amount");
@@ -338,7 +337,7 @@ $(function () {
             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 + dist_amount + ")");
+            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);
         },
 

package/util.js

@@ -1224,23 +1224,38 @@ const Util = {
      */
     fetch_public_fund_change: function (code) {
         Util["pfc_stock_chart"] = Util.show_chart_loading(Util["pfc_stock_chart"], "pfc_stock_line_canvas");
-        Util.init_table_skeleton({
-            "element_id": "pfc_fund_table",
-            "head_cols": [
-                {"name": "季度时间", "class": "info", "table_sort": 1},
-                {"name": "当时股价", "table_sort": 1, "title": "当季最后一个交易日的收盘价"},
-                {"name": "持股总数", "table_sort": 1},
-                {"name": "持仓家数", "table_sort": 1},
-                {"name": "持仓市值", "table_sort": 1, "title": "当时股价 * 总持股数"},
-            ]
-        });
+        if ($("#pfc_fund_table_body").length === 0) {
+            Util.init_table_skeleton({
+                "element_id": "pfc_fund_table",
+                "head_cols": [
+                    {"name": "季度时间", "class": "info", "table_sort": 1},
+                    {"name": "当时股价", "table_sort": 1, "title": "当季最后一个交易日的收盘价"},
+                    {"name": "持股总数", "table_sort": 1},
+                    {"name": "持仓基金数", "table_sort": 1},
+                    {"name": "持股进前10的基金数", "table_sort": 1, "title": "基金数以持股数占比进前10内的股票来统计"},
+                    {"name": "持仓市值", "table_sort": 1, "title": "当时股价 * 持股总数"},
+                ]
+            });
+            if ($("#is_fund10_num").length > 0) {
+                $("#is_fund10_num").click(function() {
+                    Util.fetch_public_fund_change(code);
+                });
+            }
+        }
         Util.post("/stock/" + code, {action: "public_fund_change"}, function (j) {
             Util["pfc_stock_chart"].hideLoading();
-            let date_data = [], fund_num_data = [], stock_num_data = [], price_data = [], _html = [];
+            let date_data = [], fund_num_data = [], stock_num_data = [], price_data = [], _html = [], is_fund10_num = 0;
+            if ($("#is_fund10_num").length > 0) {
+                is_fund10_num = $("#is_fund10_num").prop("checked") ? 1 : 0;
+            }
             j["data"].forEach(function (item) {
                 let date_format = Util.seconds_to_format(item["date"], "%Y-%m-%d");
                 date_data.push(date_format);
-                fund_num_data.push(item["fund_num"]);
+                if (is_fund10_num === 1) {
+                    fund_num_data.push(item["fund_rank_num"]);
+                } else {
+                    fund_num_data.push(item["fund_num"]);
+                }
                 stock_num_data.push(item["stock_num"]);
                 price_data.push(item["price"]);
                 _html.push("<tr>");
@@ -1259,9 +1274,13 @@ const Util = {
                 if (item["pre_fund_num"]) {
                     fund_num_rate = "(" + Util.year_price_rate(item["fund_num"], item["pre_fund_num"], 1) + ")";
                 }
-                _html.push("<td>", item["fund_num"], fund_num_rate, "</td>");
-                let market_capital = item["price"] * item["stock_num"];
-                _html.push("<td data-val='", market_capital, "' title='", market_capital, "'>", Util.to_unit(market_capital, 4), "</td>");
+                _html.push("<td data-val='", item["fund_num"], "'>", item["fund_num"], fund_num_rate, "</td>");
+                let fund_rank_num_rate = "";
+                if (item["pre_fund_rank_num"]) {
+                    fund_rank_num_rate = "(" + Util.year_price_rate(item["fund_rank_num"], item["pre_fund_rank_num"], 1) + ")";
+                }
+                _html.push("<td data-val='", item["fund_rank_num"], "'>", item["fund_rank_num"], fund_rank_num_rate, "</td>");
+                _html.push("<td data-val='", item["hold_value"], "' title='", item["hold_value"], "'>", Util.to_unit(item["hold_value"], 3), "</td>");
                 _html.push("</tr>");
             });
             date_data = date_data.reverse();