sbd-npm 1.1.79 → 1.1.82

package/menu.js

@@ -75,6 +75,7 @@ const MenuList = [
 			{'key': 'macro_pmi', 'name': '制造业采购经理指数(PMI)', 'url': '/6669696b194ae77d596371139e6b53a7'},
 			{'key': 'macro_new_investor', 'name': '新增投资者', 'url': '/2268c61c6d62cdc8c1c7143aa524e2f1'},
 			{'key': 'macro_gold', 'name': '黄金ETF(GLD)', 'url': '/584b9ceb0c85571831f7211903147d47'},
+			{'key': 'macro_crude', 'name': '原油', 'url': '/78f8b798631b52153ff029fd301f9b8a'},
 		]
 	},
 	{
@@ -131,8 +132,9 @@ const MenuList = [
 			{'key': 'concept_bellwether', 'name': '龙头股', 'url': '/2995afdea420471e00c536182e711bef'},
 			{'key': 'concept_market_situation', 'name': '市值风云', 'url': '/02fdaf4d66cdecb092bcd65f569aa493'},
 			{'key': 'concept_down_top', 'name': '15-21年的超跌股', 'url': '/ae3bbf97a358392cfaa0ceb35cb3fb57'},
-			{'key': 'concept_cannon', 'name': '黄家礼炮', 'url': '/d6128a3ad91d545f2920fa2e324c37e1'},
 			{'key': 'concept_cloud', 'name': '心似白云常自在', 'url': '/1d883188398a3a8c743748c5eb81fe7b'},
+			{'key': 'concept_cannon', 'name': '黄家礼炮', 'url': '/d6128a3ad91d545f2920fa2e324c37e1'},
+			{'key': 'concept_wen', 'name': '崇文不尚武', 'url': '/b6fd64a2c54250b8ac039123e74e9b7e'},
 			{'key': 'concept_niu', 'name': '老曾阿牛', 'url': '/0f4a2714971424024c1ddd8651c26569'},
 			{'key': 'concept_qian', 'name': '唐史主任司马迁', 'url': '/8b3e40fe74b4870244bc51125da7675a'},
 			{'key': 'concept_dan', 'name': '但斌', 'url': '/3ac0a5857b1d9a111497c0e817e647a1'},
@@ -141,7 +143,6 @@ const MenuList = [
 			{'key': 'concept_us', 'name': '美股', 'url': '/f986a81550e4d8a902f8bc0ef07757a6'},
 			{'key': 'concept_chip', 'name': '芯片', 'url': '/491de7096b1cb9355766e5ffdd7018b6'},
 			{'key': 'concept_military', 'name': '军工', 'url': '/1eb37c30e6be05148ba47c8ca6498a48'},
-			{'key': 'concept_hkscc', 'name': '港交所', 'url': '/f23d044c3944d827d799f77da41a911e'},
 			{'key': 'concept_ah', 'name': 'AH股', 'url': '/16f12053b288726b5d4720de879c3b5c'},
 			{'key': 'concept_st', 'name': 'ST股', 'url': '/e0eb8a51da63f7ceb16a769d7d20bada'},
 			{'key': 'concept_ten', 'name': '十倍股', 'url': '/c08abb44c7d6ce6fa09a8a66421acb20'},

package/package.json

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

package/util.js

@@ -764,7 +764,7 @@ const Util = {
      * 表格加载状态
      * @param element_id
      */
-    set_table_loading: function(element_id) {
+    set_table_loading: function (element_id) {
         let obj = $("#" + element_id);
         let td_num = obj.parent().find('thead td').length;
         obj.html('<tr><td colspan="' + td_num + '">Loading...</td></tr>');
@@ -846,7 +846,7 @@ const Util = {
         });
     },
 
-    render_stock_category_html: function() {
+    render_stock_category_html: function () {
         if (Util["stock_category_table_id"]) {
             let _html = [];
             let total_num = 0;
@@ -1888,7 +1888,17 @@ const Util = {
             Util.show_tips("Loading...");
             //获取股票详情数据
             Util.post("/action", {action: "code_detail", code_list: code_list.join("-")}, function (j) {
+                let valid_code_list = [];
+                let total_change_percent = 0;
+                let total_year_change_percent = 0;
                 $.each(j, function (code, item) {
+                    if (item["price"] && item["previous_price"] && item["price"] > 0 && item["previous_price"] > 0) {
+                        valid_code_list.push(item["code"]);
+                        total_change_percent += ((item["price"] - item["previous_price"]) / item["previous_price"]);
+                        if (item["year_price"] && item["year_price"] > 0) {
+                            total_year_change_percent += ((item["price"] - item["year_price"]) / item["year_price"]);
+                        }
+                    }
                     Util.render_price(item);
                     if (item["holder_num"] && item["holder_num"] > 0) {
                         $(".holder_" + code).each(function () {
@@ -1927,6 +1937,33 @@ const Util = {
                 } else {
                     Util.refresh_index_price(element_id, index_list.join("-"), is_us, 0);
                 }
+                if (valid_code_list.length > 0) {   // 涨跌统计
+                    if ($("#" + element_id + "_tips").length) {
+                        let total_num = valid_code_list.length;
+                        let average_change_percent = Math.round((total_change_percent / total_num) * 10000) / 100;
+                        let average_year_change_percent = Math.round((total_year_change_percent / total_num) * 10000) / 100;
+                        let week_tips_id = element_id + "week_tips";
+                        $("#" + element_id + "_tips").html('共 <span class="label label-info">' + total_num + '</span> 家 平均涨跌: ' + Util.parse_ratio(average_change_percent) + "<span id='" + week_tips_id + "'></span> 年初至今: " + Util.parse_ratio(average_year_change_percent));
+                        let code_price_dict = {};
+                        valid_code_list.forEach(function (code) {
+                            code_price_dict[code] = j[code]["price"];
+                        });
+                        Util.post("/action", {action: "code_5d_price", code_list: code_list.join("-")}, function (j) {
+                            let total_num = 0;
+                            let total_week_change_percent = 0;
+                            $.each(j, function (code, price_5d) {
+                                if (price_5d > 0 && code_price_dict[code]) {
+                                    total_num += 1;
+                                    total_week_change_percent += ((code_price_dict[code] - price_5d) / price_5d);
+                                }
+                            });
+                            if (total_num > 0) {
+                                let average_week_change_percent = Math.round((total_week_change_percent / total_num) * 10000) / 100;
+                                $("#" + week_tips_id).html(" 最近5日: " + Util.parse_ratio(average_week_change_percent));
+                            }
+                        });
+                    }
+                }
                 Util.hide_tips();
             });
         }