sbd-npm 1.1.66 → 1.1.70

package/menu.js

@@ -53,7 +53,7 @@ const MenuList = [
 			{'key': 'trend_fund_hold', 'name': '基金持股变化', 'url': '/067740976f85ec14ddae02b51829ce35'},
 			{'key': 'trend_week_minimum', 'name': '周成交低点', 'url': '/722d94429b8e689fe78dca1cf67a4c67'},
 			{'key': 'trend_margin', 'name': '融资融券余额涨幅', 'url': '/1964a6bc56dc3ce6825b23667c7fb588'},
-			{'key': 'trend_price', 'name': '股价升跌幅度', 'url': '/43ef6aeb36475f8f8f44d477b1990390'},
+			{'key': 'trend_price', 'name': '股价涨跌幅度', 'url': '/43ef6aeb36475f8f8f44d477b1990390'},
 			{'key': 'trend_down', 'name': '当前连跌个股', 'url': '/07fb907c7e7572fbeae98bacf5c44593'},
 			{'key': 'trend_down_analysis', 'name': '连跌反弹概率', 'url': '/e9a32e4601fca33a9c3b68103f61c3bc'},
 			{'key': 'trend_index_month', 'name': '指数每年月份涨跌', 'url': '/86691e421938098bab7679e43bea67a6'},
@@ -191,7 +191,6 @@ const MenuList = [
 			{'key': 'snowball_trend', 'name': '自选趋势', 'url': '/08c40d908dd87e29a607b6945309edf0'},
 			{'key': 'snowball_user', 'name': '用户列表', 'url': '/97339b8453883dd27e6087ae7db6f62a'},
 			{'key': 'snowball_tweet', 'name': '推文', 'url': '/9a9aef7fced3f15ff7647de75d70798c'},
-			{'key': 'snowball_red_packet', 'name': '红包数据', 'url': '/23d88182f12431fe67f658b725cbaf1d'},
 			{'key': 'snowball_tool', 'name': '搜索工具', 'url': '/ac88ee85f27e11aa06f2b8f46b03a0eb'},
 		]
 	},

package/package.json

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

package/summary_daily.js

@@ -442,10 +442,11 @@ $(document).ready(function () {
     });
     // 成交概况数据
     let Modal = {
-        data_type: "",
 
+        data_type: "",
         mo_start_time: 0,
         mo_end_time: 0,
+        p_change_data: [],
 
         render_market_overview_line: function (data, key, element_id, title, chart_instance) {
             let line_id = element_id + "_chart";
@@ -523,25 +524,8 @@ $(document).ready(function () {
             Util.post(location.pathname, payload, function (j) {
                 Util.render_type_option($("#p_change_industry"), j["data"], "industry", Modal.render_stock_rate_html);
                 Util.render_type_option($("#p_change_area"), j["data"], "area", Modal.render_stock_rate_html);
-                let _html = [];
-                let industry = $("#p_change_industry").val();
-                let area = $("#p_change_area").val();
-                let index = 0;
-                j["data"].forEach(function (item) {
-                    if (Util.is_industry_area(item, industry, area)) {
-                        index++;
-                        _html.push("<tr>");
-                        _html.push("<td>", index, "</td>");
-                        _html = Util.stock_basics_html(_html, item);
-                        if (item["continue_top_day"]) {
-                            _html.push("<td title='连续涨停" + item["continue_top_day"] + "天'>", Util.parse_ratio(item["p_change"]), " <span class='badge alert-danger'>" + item["continue_top_day"] + "<span></td>");
-                        } else {
-                            _html.push("<td>", Util.parse_ratio(item["p_change"]), "</td>");
-                        }
-                        _html.push("</tr>");
-                    }
-                });
-                Util.render_table_html("stock_rate_table_body", _html);
+                Modal["p_change_data"] = j["data"];
+                Modal.render_stock_rate_html();
                 $("#p_change_type").change(function () {
                     if (!DailySummary.is_load) {
                         $("#stock_rate_table_body").html("<tr><td colspan='9'>Loading...</td></tr>");
@@ -552,6 +536,31 @@ $(document).ready(function () {
             });
         },
 
+        render_stock_rate_html: function() {
+            let _html = [];
+            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++;
+                    _html.push("<tr>");
+                    _html.push("<td>", index, "</td>");
+                    _html = Util.stock_basics_html(_html, item);
+                    _html.push("<td>", Util.year_price_rate(item["stock_price"], item["year_price"]), "</td>");
+                    _html.push("<td class='holder_", item["code"], "'>--</td>");
+                    if (item["continue_top_day"]) {
+                        _html.push("<td title='连续涨停" + item["continue_top_day"] + "天'>", Util.parse_ratio(item["p_change"]), " <span class='badge alert-danger'>" + item["continue_top_day"] + "<span></td>");
+                    } else {
+                        _html.push("<td>", Util.parse_ratio(item["p_change"]), "</td>");
+                    }
+                    _html.push("</tr>");
+                }
+            });
+            Util.render_table_html("stock_rate_table_body", _html);
+            Util.init_stock_stuff("stock_rate_table_body", [], 0, 0);
+        },
+
         render_news_modal: function () {
             Util.show_tips("Loading...");
             Util.post(location.pathname, {action: "pbc_news"}, function (j) {
@@ -591,6 +600,8 @@ $(document).ready(function () {
             {"name": "行业", "select_id": "p_change_industry"},
             {"name": "地区", "select_id": "p_change_area"},
             {"name": "当前价", "table_sort": 1},
+            {"name": "年初至今", "table_sort": 1},
+            {"name": "股东数", "table_sort": 1},
             {
                 "name": "类型",
                 "select_id": "p_change_type",

package/util.js

@@ -333,22 +333,30 @@ const Util = {
     render_price: function (item) {
         let code = item["code"];
         if (item["price"]) {
-            let price = Util.digit_compare_trend(item["price"], item["previous_price"]);
-            $(".price_" + code).each(function () {
-                if ($(this).attr("data-color")) {
-                    let pre_price = parseFloat(Util.strip_bracket_string($(this).text()));
-                    if (item["price"] > pre_price && pre_price > 0) {
-                        $(this).css("background-color", "#FF7B7B");
-                        $(this).animate({backgroundColor: $(this).attr("data-color")}, 2000);
-                    } else if (item["price"] > 0 && item["price"] < pre_price) {
-                        $(this).css("background-color", "#ADFFAD");
-                        $(this).animate({backgroundColor: $(this).attr("data-color")}, 2000);
+            if ($("#price_change_" + code).length) {
+                let price_cls = Util.text_color(item["price"], item["previous_price"]);
+                $(".price_" + code).each(function () {
+                    $(this).html("<b class='" + price_cls + "'>" + item["price"] + "</b>");
+                });
+                $("#price_change_" + code).html(Util.year_price_rate(item["price"], item["previous_price"]));
+            } else {
+                let price = Util.digit_compare_trend(item["price"], item["previous_price"]);
+                $(".price_" + code).each(function () {
+                    if ($(this).attr("data-color")) {
+                        let pre_price = parseFloat(Util.strip_bracket_string($(this).text()));
+                        if (item["price"] > pre_price && pre_price > 0) {
+                            $(this).css("background-color", "#FF7B7B");
+                            $(this).animate({backgroundColor: $(this).attr("data-color")}, 2000);
+                        } else if (item["price"] > 0 && item["price"] < pre_price) {
+                            $(this).css("background-color", "#ADFFAD");
+                            $(this).animate({backgroundColor: $(this).attr("data-color")}, 2000);
+                        }
+                    } else {
+                        $(this).attr("data-color", $(this).css("background-color"));
                     }
-                } else {
-                    $(this).attr("data-color", $(this).css("background-color"));
-                }
-                $(this).html(price);
-            });
+                    $(this).html(price);
+                });
+            }
             $(".year_price_" + code).each(function () {
                 if (item["year_price"]) {
                     $(this).html(Util.year_price_rate(item["price"], item["year_price"]));
@@ -793,8 +801,8 @@ const Util = {
             {"name": "名称"},
             {"name": "PE", "title": "市盈率(Price Earnings Ratio)", "table_sort": 1},
             {"name": "总市值", "table_sort": 1},
-            {"name": "行业"},
-            {"name": "地区"},
+            {"name": "行业", "select_id": "stock_category_industry"},
+            {"name": "地区", "select_id": "stock_category_area"},
             {"name": "当前价", "table_sort": 1},
             {"name": "最高价"},
             {"name": "最低价"},
@@ -805,7 +813,7 @@ const Util = {
             head_cols.push({"name": "成交金额", "table_sort": 1});
             head_cols.push({"name": "成交均价", "table_sort": 1});
             head_cols.push({"name": "股东数", "table_sort": 1});
-            head_cols.push({"name": "备注", "id": "remark_title"});
+            head_cols.push({"name": "备注", "id": "stock_category_remark_title"});
         }
         let table_options = {
             "element_id": table_id,
@@ -816,30 +824,14 @@ const Util = {
             table_options["alert"] = alert_tips;
         }
         Util.init_table_skeleton(table_options);
+        Util["stock_category_table_id"] = table_id;
         Util.post(location.pathname, {active_div: stock_category}, function (j) {
-            let _html = [];
-            let total_num = 0;
-            j["data"].forEach(function (item) {
-                total_num++;
-                _html.push("<tr>");
-                item["code"] = item["code"].toLowerCase();
-                _html = Util.stock_basics_html(_html, item);
-                _html.push("<td id='high_", item["code"], "'>0</td>");
-                _html.push("<td id='low_", item["code"], "'>0</td>");
-                _html.push("<td data-val='", item["year_price"], "' class='year_price_", item["code"], "'>--</td>");
-                _html.push("<td class='high_52week_", item["code"], "'>--</td>");
-                if (stock_category !== "us") {
-                    _html.push("<td id='amount_", item["code"], "'>--</td>");
-                    _html.push("<td id='average_", item["code"], "'>--</td>");
-                    _html.push("<td class='holder_", item["code"], "'>--</td>");
-                    _html.push("<td id='remark_", item["code"], "'></td>");
-                }
-                _html.push("</tr>");
-            });
-            Util.render_table_html(table_id + "_body", _html);
-            $("#" + table_id + "_body_tips").html('共 <span class="label label-info">' + total_num + '</span> 家');
+            Util["stock_category_data"] = j["data"];
+            Util.render_type_option($("#stock_category_industry"), j["data"], "industry", Util.render_stock_category_html);
+            Util.render_type_option($("#stock_category_area"), j["data"], "area", Util.render_stock_category_html);
+            Util.render_stock_category_html();
             if (j["concept_url"]) {
-                $("#remark_title").html(Util.pack_html_link(j["concept_url"], "备注<i class='glyphicon glyphicon-link'></i>"));
+                $("#stock_category_remark_title").html(Util.pack_html_link(j["concept_url"], "备注<i class='glyphicon glyphicon-link'></i>"));
             }
             Util.hide_tips();
             let index_list = j["index_list"] ? j["index_list"] : [];
@@ -848,6 +840,39 @@ const Util = {
         });
     },
 
+    render_stock_category_html: function() {
+        if (Util["stock_category_table_id"]) {
+            let _html = [];
+            let total_num = 0;
+            if (Util["stock_category_data"]) {
+                let industry = $("#stock_category_industry").val();
+                let area = $("#stock_category_area").val();
+                let is_us = $("#stock_category_remark_title").length === 0 ? 1 : 0;
+                Util["stock_category_data"].forEach(function (item) {
+                    if (Util.is_industry_area(item, industry, area)) {
+                        total_num++;
+                        _html.push("<tr>");
+                        item["code"] = item["code"].toLowerCase();
+                        _html = Util.stock_basics_html(_html, item);
+                        _html.push("<td id='high_", item["code"], "'>0</td>");
+                        _html.push("<td id='low_", item["code"], "'>0</td>");
+                        _html.push("<td data-val='", item["year_price"], "' class='year_price_", item["code"], "'>--</td>");
+                        _html.push("<td class='high_52week_", item["code"], "'>--</td>");
+                        if (is_us === 0) {
+                            _html.push("<td id='amount_", item["code"], "'>--</td>");
+                            _html.push("<td id='average_", item["code"], "'>--</td>");
+                            _html.push("<td class='holder_", item["code"], "'>--</td>");
+                            _html.push("<td id='remark_", item["code"], "'></td>");
+                        }
+                        _html.push("</tr>");
+                    }
+                });
+            }
+            Util.render_table_html(Util["stock_category_table_id"] + "_body", _html);
+            $("#" + Util["stock_category_table_id"] + "_body_tips").html('共 <span class="label label-info">' + total_num + '</span> 家');
+        }
+    },
+
     /**
      * 初始公募基金组件
      * @param component_id
@@ -882,7 +907,14 @@ const Util = {
             let _html = [];
             if (j["fund_code"]) {
                 $("#" + component_id + "_title").html(Util.pack_html_link("http://fundf10.eastmoney.com/jbgk_" + j["fund_code"] + ".html", j["fund_name"]));
-                let net = j["net"] > 0 ? j["net"] : "--";
+                let net = "--";
+                if (j["net"] > 0) {
+                    net = j["net"];
+                    let net_cls = Util.text_color(j["change_percent"]);
+                    if (net_cls !== "") {
+                        net = "<b class='" + net_cls + "'>" + net + "(" + Util.to_float(j["change_percent"], 2) + "%)</b>";
+                    }
+                }
                 let assets = j["assets"] > 0 ? (j["assets"] + "亿") : "--";
                 let public_date = j["public_date"] > 0 ? Util.seconds_to_format(j["public_date"], "%Y-%m-%d") : "--";
                 let issue_date = j["issue_date"] > 0 ? Util.seconds_to_format(j["issue_date"], "%Y-%m-%d") : "--";
@@ -2274,7 +2306,7 @@ const Util = {
             html.push('<option value="">', obj.children('option').eq(0).text(), '</option>');
         }
         $.each(option_data, function (val, val_num) {
-            html.push('<option value="', val, '">', (val.substr(0, 10)), '(', val_num, ')</option>');
+            html.push('<option value="', val, '">', (val.substr(0, 6)), '(', val_num, ')</option>');
         });
         obj.html(html.join(""));
         obj.change(function () {

package/.npmignore

@@ -1 +0,0 @@
-sbd-npm.md