sbd-npm 1.3.60 → 1.3.62

package/constant.js

@@ -27,11 +27,11 @@ const MenuList = [
 			{'key': 'trend_kdj', 'name': 'KDJ金叉', 'url': '/0x3382bdaec4e8715ce27ca2b538dce09a2f8f5e50'},
 			{'key': 'trend_macd_cross', 'name': 'MACD金叉', 'url': '/0x277bc35fcd21059103dd7917c8bfe0c474880b85'},
 			{'key': 'trend_bull_trend', 'name': '多头趋势', 'url': '/0x37b24777154ee090926e57bfa5602efa5c89b8a8'},
+			{'key': 'trend_fund_hold', 'name': '基金数持股变化', 'url': '/0x706c0e77ca3e314b5186c763e6ee857b744e9880'},
 			{'key': 'trend_money_inflow', 'name': '资金流入历史最高', 'url': '/0xfbfc92be1eebe9ccf5b2f14b9a2ea25f2cc941b8'},
 			{'key': 'trend_boll', 'name': '布林线', 'url': '/0x7f2c6b9542ce7626669ab4910cbf7e8812883fea'},
 			{'key': 'trend_holder_minimum', 'name': '股东数历史最少', 'url': '/0xf0c0c360a283689c83ae216c6bbb03777d8068ca'},
 			{'key': 'trend_down_maximum', 'name': '历史高位最大跌幅', 'url': '/0x8d7b8abeec94e2ebe4b25115272d9d5899355c43'},
-			{'key': 'trend_fund_hold', 'name': '基金数持股变化', 'url': '/0x706c0e77ca3e314b5186c763e6ee857b744e9880'},
 			{'key': 'trend_week_minimum', 'name': '周成交低点', 'url': '/0xa9dfc159b157ae3b694a12dc42fb8feaa75bcf51'},
 			{'key': 'trend_margin', 'name': '融资融券余额涨幅', 'url': '/0x9a2c22255e4f87592b10432c8ab24b14c82692af'},
 			{'key': 'trend_index_month', 'name': '指数每年月份涨跌', 'url': '/0xf59cc6347d851edfe836a6c1c23c518cb83e27de'},

package/package.json

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

package/stock_basics.js

@@ -89,7 +89,7 @@ let Stock = {
                 Util.fetch_public_fund(Stock["code"]);
                 break;
             case "public_fund_change":
-                Stock.fetch_public_fund_change();
+                Util.fetch_public_fund_change(Stock["code"]);
                 break;
             case "big_deal":
                 Stock.fetch_big_deal();
@@ -916,62 +916,6 @@ let Stock = {
         });
     },
 
-    /**
-     * 公募持股变化
-     */
-    fetch_public_fund_change: function () {
-        Stock["pfc_stock_chart"] = Util.show_chart_loading(Stock["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},
-                {"name": "总持股数", "table_sort": 1},
-                {"name": "持仓家数", "table_sort": 1},
-                {"name": "持仓市值", "table_sort": 1, "title": "当时股价 * 总持股数"},
-            ]
-        });
-        Util.post("/stock/" + Stock["code"], {action: "public_fund_change"}, function (j) {
-            Stock["pfc_stock_chart"].hideLoading();
-            let date_data = [], fund_num_data = [], stock_num_data = [], price_data = [], _html = [];
-            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"]);
-                stock_num_data.push(item["stock_num"]);
-                price_data.push(item["price"]);
-                _html.push("<tr>");
-                _html.push("<td>", Util.pack_html_link("https://data.eastmoney.com/zlsj/detail/" + date_format + "-1-" + Stock["code"] + ".html", date_format), "</td>");
-                _html.push("<td>", item["price"], "</td>");
-                _html.push("<td data-val='", item["stock_num"], "' title='", item["stock_num"], "'>", Util.to_unit(item["stock_num"], 3), "股</td>");
-                _html.push("<td>", item["fund_num"], "</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("</tr>");
-            });
-            date_data = date_data.reverse();
-            fund_num_data = fund_num_data.reverse();
-            stock_num_data = stock_num_data.reverse();
-            price_data = price_data.reverse();
-            Stock["pfc_stock_chart"] = Util.multi_axis_line(Stock["pfc_stock_chart"], "pfc_stock_line_canvas", date_data, '总持股数', stock_num_data, '股价', price_data);
-            Stock["pfc_fund_chart"] = Util.multi_axis_line(Stock["pfc_fund_chart"], "pfc_fund_line_canvas", date_data, '持仓家数', fund_num_data, '股价', price_data);
-            if (j["data"].length > 1) {
-                let cur_stock_num = j["data"][0]["stock_num"];
-                let pre_stock_num = j["data"][1]["stock_num"];
-                if (cur_stock_num > 0 && pre_stock_num > 0) {
-                    $("#pfc_stock_tips").html("(当前持股数: <b class='text-info'>" + Util.to_unit(cur_stock_num, 4) + "</b>, 环比: " + Util.year_price_rate(cur_stock_num, pre_stock_num) + ")");
-                }
-                let cur_fund_num = j["data"][0]["fund_num"];
-                let pre_fund_num = j["data"][1]["fund_num"];
-                if (cur_fund_num > 0 && pre_fund_num > 0) {
-                    $("#pfc_fund_tips").html("(当前基金数: <b class='text-info'>" + cur_fund_num + "</b>, 环比: " + Util.year_price_rate(cur_fund_num, pre_fund_num) + ")");
-                }
-            }
-            Util.render_table_html("pfc_fund_table_body", _html);
-            Util.hide_tips();
-        });
-    },
-
     handle_metrics_statistics: function (metrics, date_type) {
         Stock[metrics + "_bar_chart"] = Util.startup_metrics_statistics(Stock[metrics + "_bar_chart"], metrics, date_type);
         if (metrics === "margin" || metrics === "hkex_holding") {

package/util.js

@@ -1093,50 +1093,8 @@ const Util = {
                 {"name": ""},
             ]
         });
-        let payload = {
-            action: "public_fund",
-            public_fund_date: $("#public_fund_date").val()
-        };
-        Util.post("/stock/" + code, payload, function (j) {
-            let _html = [], total_public_fund = 0, total_stock_num = 0, total_market_capital = 0;
-            j["data"].forEach(function (item) {
-                total_public_fund++;
-                total_stock_num += item["stock_num"];
-                total_market_capital += item["market_capital"];
-                let public_date = "--";
-                if (item["public_date"] > 0) {
-                    public_date = Util.seconds_to_format(item["public_date"], "%Y-%m-%d");
-                }
-                let net = item["net"];
-                let cls = Util.text_color(item["change_percent"])
-                if (cls !== "") {
-                    net = "<b class='" + cls + "'>" + net + "(" + Util.to_float(item["change_percent"], 2) + "%)</b>";
-                }
-                _html.push("<tr class='", (($.inArray(item["fund_code"], j["etf_code_list"]) > -1) ? "danger" : ""), "'>");
-                _html.push("<td>", total_public_fund, "</td>");
-                _html.push("<td>", Util.pack_html_link('https://fund.eastmoney.com/' + item["fund_code"] + '.html', item["fund_code"]), "</td>");
-                _html.push("<td title='基金概况'>", Util.pack_html_link('https://fundf10.eastmoney.com/jbgk_' + item["fund_code"] + '.html', item["fund_name"]), "</td>");
-                _html.push("<td>", net, "</td>");
-                _html.push("<td>", item["assets"], "亿</td>");
-                _html.push("<td>", item["fund_type"], "</td>");
-                _html.push("<td>", item["invest_type"], "</td>");
-                _html.push("<td>", Util.pack_fund_administrator(item), "</td>");
-                _html.push("<td>", public_date, "</td>");
-                _html.push("<td data-val='", item["stock_num"], "' title='", item["stock_num"], "'>", Util.to_unit(item["stock_num"], 3), "股</td>");
-                _html.push("<td data-val='", item["market_capital"], "' title='", item["market_capital"], "'>", Util.to_unit(item["market_capital"], 3), "</td>");
-                _html.push("<td><a class='link_cls' data-toggle='modal' data-target='.public_fund_modal' data-val='", item["fund_code"], "'>详细</a></td>");
-                _html.push("</tr>");
-            });
-            Util.render_table_html("public_fund_table_body", _html);
-            let public_fund_tips = "";
-            if (j["cur_fund_num"]) {
-                total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + j["cur_fund_num"] + '</span>');
-                public_fund_tips = '共 ' + total_public_fund + ' 家(' + Util.year_price_rate(j["cur_fund_num"], j["pre_fund_num"], 1) + ')， <span class="label label-info">' + Util.to_unit(j["cur_stock_num"], 3) + '</span> 股(' + Util.year_price_rate(j["cur_stock_num"], j["pre_stock_num"], 1) + ')，<span class="label label-info">' + Util.to_unit(j["hold_value"], 3) + '</span>市值';
-            } else {
-                total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + total_public_fund + '</span>');
-                public_fund_tips = '共 ' + total_public_fund + ' 家， <span class="label label-info">' + Util.to_unit(total_stock_num, 3) + '</span> 股，<span class="label label-info">' + Util.to_unit(total_market_capital, 3) + '</span>市值';
-            }
-            $("#public_fund_tips").html(public_fund_tips);
+        Util.post("/stock/" + code, {action: "public_fund", public_fund_date: $("#public_fund_date").val()}, function (j) {
+            Util.render_public_fund(j);
             if (j["date"] && j["date"] > 0) {
                 $("#public_fund_title").find("a").each(function() {
                     let t_text = $(this).text();
@@ -1158,12 +1116,157 @@ const Util = {
                     $("#public_fund_date").change(function () {
                         Util.fetch_public_fund(code);
                     });
+                    $(".public_fund_difference").each(function() {
+                        $(this).click(function() {
+                            let public_fund_date = $("#public_fund_date").val();
+                            if (Util.regexp_date_yyyy_mm_dd(public_fund_date)) {
+                                public_fund_date = Util.format_to_second(public_fund_date);
+                                let prev_public_fund_date = Util.get_prev_public_fund_date("public_fund_date", public_fund_date);
+                                if (prev_public_fund_date > 0 && public_fund_date > prev_public_fund_date) {
+                                    Util.show_loading();
+                                    Util.set_table_loading("public_fund_table_body");
+                                    let payload = {
+                                        action: "public_fund_difference",
+                                        type: $(this).attr("data-val"),
+                                        date: public_fund_date,
+                                        pre_date: prev_public_fund_date
+                                    };
+                                    Util.post("/stock/" + code, payload, function (j) {
+                                        Util.render_public_fund(j);
+                                        Util.hide_tips();
+                                    });
+                                }
+                            }
+                        });
+                    });
                 });
             }
             Util.hide_tips();
         });
     },
 
+    /**
+     * 基金数据渲染
+     */
+    render_public_fund: function(j) {
+        let _html = [], total_public_fund = 0, total_stock_num = 0, total_market_capital = 0;
+        j["data"] = j["data"] ? j["data"] : [];
+        j["data"].forEach(function (item) {
+            total_public_fund++;
+            total_stock_num += item["stock_num"];
+            total_market_capital += item["market_capital"];
+            let public_date = "--";
+            if (item["public_date"] > 0) {
+                public_date = Util.seconds_to_format(item["public_date"], "%Y-%m-%d");
+            }
+            let net = item["net"];
+            let cls = Util.text_color(item["change_percent"])
+            if (cls !== "") {
+                net = "<b class='" + cls + "'>" + net + "(" + Util.to_float(item["change_percent"], 2) + "%)</b>";
+            }
+            _html.push("<tr class='", (($.inArray(item["fund_code"], j["etf_code_list"]) > -1) ? "danger" : ""), "'>");
+            _html.push("<td>", total_public_fund, "</td>");
+            _html.push("<td>", Util.pack_html_link('https://fund.eastmoney.com/' + item["fund_code"] + '.html', item["fund_code"]), "</td>");
+            _html.push("<td title='基金概况'>", Util.pack_html_link('https://fundf10.eastmoney.com/jbgk_' + item["fund_code"] + '.html', item["fund_name"]), "</td>");
+            _html.push("<td>", net, "</td>");
+            _html.push("<td>", item["assets"], "亿</td>");
+            _html.push("<td>", item["fund_type"], "</td>");
+            _html.push("<td>", item["invest_type"], "</td>");
+            _html.push("<td>", Util.pack_fund_administrator(item), "</td>");
+            _html.push("<td>", public_date, "</td>");
+            _html.push("<td data-val='", item["stock_num"], "' title='", item["stock_num"], "'>", Util.to_unit(item["stock_num"], 3), "股</td>");
+            _html.push("<td data-val='", item["market_capital"], "' title='", item["market_capital"], "'>", Util.to_unit(item["market_capital"], 3), "</td>");
+            _html.push("<td><a class='link_cls' data-toggle='modal' data-target='.public_fund_modal' data-val='", item["fund_code"], "'>详细</a></td>");
+            _html.push("</tr>");
+        });
+        Util.render_table_html("public_fund_table_body", _html);
+        let public_fund_tips = "";
+        if (j["cur_fund_num"]) {
+            total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + j["cur_fund_num"] + '</span>');
+            public_fund_tips = '共 ' + total_public_fund + ' 家(' + Util.year_price_rate(j["cur_fund_num"], j["pre_fund_num"], 1) + ')， <span class="label label-info">' + Util.to_unit(j["cur_stock_num"], 3) + '</span> 股(' + Util.year_price_rate(j["cur_stock_num"], j["pre_stock_num"], 1) + ')，<span class="label label-info">' + Util.to_unit(j["hold_value"], 3) + '</span>市值';
+        } else {
+            total_public_fund = Util.pack_html_link(Util.get_url("trend_fund_hold"), '<span class="label label-info">' + total_public_fund + '</span>');
+            public_fund_tips = '共 ' + total_public_fund + ' 家， <span class="label label-info">' + Util.to_unit(total_stock_num, 3) + '</span> 股，<span class="label label-info">' + Util.to_unit(total_market_capital, 3) + '</span>市值';
+        }
+        $("#public_fund_tips").html(public_fund_tips);
+    },
+
+    /**
+     * 前一季度日时间
+     */
+    get_prev_public_fund_date: function(element_id, current_date) {
+        let prev_date = 0;
+        $("#" + element_id).find("option").each(function() {
+            if (prev_date === 0) {
+                let p_date = $(this).val();
+                if (Util.regexp_date_yyyy_mm_dd(p_date)) {
+                    p_date = Util.format_to_second(p_date);
+                    if (current_date > p_date) {
+                        prev_date = p_date;
+                    }
+                }
+            }
+        });
+        return prev_date;
+    },
+
+    /**
+     * 公募持股变化
+     * @param code
+     */
+    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},
+                {"name": "总持股数", "table_sort": 1},
+                {"name": "持仓家数", "table_sort": 1},
+                {"name": "持仓市值", "table_sort": 1, "title": "当时股价 * 总持股数"},
+            ]
+        });
+        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 = [];
+            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"]);
+                stock_num_data.push(item["stock_num"]);
+                price_data.push(item["price"]);
+                _html.push("<tr>");
+                _html.push("<td>", Util.pack_html_link("https://data.eastmoney.com/zlsj/detail/" + date_format + "-1-" + code + ".html", date_format), "</td>");
+                _html.push("<td>", item["price"], "</td>");
+                _html.push("<td data-val='", item["stock_num"], "' title='", item["stock_num"], "'>", Util.to_unit(item["stock_num"], 3), "股</td>");
+                _html.push("<td>", item["fund_num"], "</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("</tr>");
+            });
+            date_data = date_data.reverse();
+            fund_num_data = fund_num_data.reverse();
+            stock_num_data = stock_num_data.reverse();
+            price_data = price_data.reverse();
+            Util["pfc_stock_chart"] = Util.multi_axis_line(Util["pfc_stock_chart"], "pfc_stock_line_canvas", date_data, '总持股数', stock_num_data, '股价', price_data);
+            Util["pfc_fund_chart"] = Util.multi_axis_line(Util["pfc_fund_chart"], "pfc_fund_line_canvas", date_data, '持仓家数', fund_num_data, '股价', price_data);
+            if (j["data"].length > 1) {
+                let cur_stock_num = j["data"][0]["stock_num"];
+                let pre_stock_num = j["data"][1]["stock_num"];
+                if (cur_stock_num > 0 && pre_stock_num > 0) {
+                    $("#pfc_stock_tips").html("(当前持股数: <b class='text-info'>" + Util.to_unit(cur_stock_num, 4) + "</b>, 环比: " + Util.year_price_rate(cur_stock_num, pre_stock_num) + ")");
+                }
+                let cur_fund_num = j["data"][0]["fund_num"];
+                let pre_fund_num = j["data"][1]["fund_num"];
+                if (cur_fund_num > 0 && pre_fund_num > 0) {
+                    $("#pfc_fund_tips").html("(当前基金数: <b class='text-info'>" + cur_fund_num + "</b>, 环比: " + Util.year_price_rate(cur_fund_num, pre_fund_num) + ")");
+                }
+            }
+            Util.render_table_html("pfc_fund_table_body", _html);
+            Util.hide_tips();
+        });
+    },
+
     /**
      * 初始分类股票的显示表格
      * @param portfolio