sbd-npm 1.2.73 → 1.2.75

package/constant.js

@@ -134,7 +134,6 @@ const MenuList = [
 		'icon': 'retweet',
 		'menu': [
 			{'key': 'concept_recommend', 'name': '关注', 'url': '/27ca098faad33a8e4d109efe0112fd16'},
-			{'key': 'concept_macd', 'name': 'MACD', 'url': '/3400774e910fb611625b31d049d571fb'},
 			{'key': 'concept_cloud', 'name': '心似白云常自在', 'url': '/1d883188398a3a8c743748c5eb81fe7b'},
 			{'key': 'concept_vegetable', 'name': 'Veget', 'url': '/b1769a58f0f3d4a92bad61c97a2232f0'},
 			{'key': 'concept_zan', 'name': 'zangyn', 'url': '/860a3a9647efad436894b4aa3843da42'},

package/package.json

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

package/stock_basics.js

@@ -238,22 +238,8 @@ let Stock = {
                 $(this).attr("target", "_blank");
                 $(this).attr("rel", "noopener noreferrer nofollow");
             });
-            // 日均线抵扣价
-            if (item["price"] && item["ma_deduction"] && item["ma_deduction"].length > 0) {
-                let ma_deduction_html = [];
-                item["ma_deduction"].forEach(function (ma) {
-                    if (ma["deduction_price"] > 0) {
-                        let day_ma_str = ma["day"] + "日均线";
-                        if (ma["day"] === 20 || ma["day"] === 60 || ma["day"] === 120) {
-                            day_ma_str = "<span class='label label-info'>" + day_ma_str + "</span>";
-                        }
-                        let deduction_cls = Util.text_color(item["price"], ma["deduction_price"]);
-                        let ma_cls = Util.text_color(item["price"], ma["ma"]);
-                        ma_deduction_html.push(day_ma_str + ":<b class='" + ma_cls + "'>" + ma["ma"] + "</b>(<b class='" + deduction_cls + "'>" + ma["deduction_price"] + "</b>)");
-                    }
-                });
-                $("#ma_deduction").html(ma_deduction_html.join("&nbsp;&nbsp;"));
-            }
+            // 日均线/抵扣价数据
+            Util.render_ma_deduction(item, "ma_deduction");
             if (item["boll_up"] && item["boll_up"] > 0 && item["boll_down"] && item["boll_down"] > 0) {
                 $("#boll").html("<a title='当前上轨线 / 当前下轨线' target='_blank' rel='noopener noreferrer nofollow' href='" + Util.get_url("trend_boll") + "'><b class='text-danger'>" + Util.to_float(item["boll_up"], 2) + "</b> / <b class='text-success'>" + Util.to_float(item["boll_down"], 2) + "</b></a>");
             }
@@ -430,6 +416,18 @@ let Stock = {
 
     fetch_rps_data: function () {
         Util.show_loading();
+        Util.init_table_skeleton({
+            "element_id": "rps_table",
+            "head_cols": [
+                {"name": "时间"},
+                {"name": "RPS20", "tooltip": "20日股价相对强度，表示过去20个交易日内，该股票的价格涨幅超过了市场上多少的股票，该值为85，表示该股在过去20日内的价格涨幅超过了市场上85%的股票"},
+                {"name": "20日涨跌"},
+                {"name": "RPS60", "tooltip": "60日股价相对强度，表示过去60个交易日内，该股票的价格涨幅超过了市场上多少的股票，该值为85，表示该股在过去60日内的价格涨幅超过了市场上85%的股票"},
+                {"name": "60日涨跌"},
+                {"name": "RPS120", "tooltip": "120日股价相对强度，表示过去120个交易日内，该股票的价格涨幅超过了市场上多少的股票，该值为85，表示该股在过去120日内的价格涨幅超过了市场上85%的股票"},
+                {"name": "120日涨跌"},
+            ]
+        });
         Util.post("/stock/" + Stock.code, {action: "rps"}, function (j) {
             let _html = [];
             j["data"].forEach(function (item) {
@@ -444,15 +442,15 @@ let Stock = {
                 _html.push("</tr>");
             });
             if (_html.length > 0) {
-                Util.render_table_html("rps_data", _html);
+                Util.render_table_html("rps_table_body", _html);
             } else {
                 let now = Util.now();
                 if ((now - Stock.ttm_second) < Util.one_year_second) {
-                    let obj = $("#rps_data");
+                    let obj = $("#rps_table_body");
                     let td_num = obj.parent().find('thead td').length;
                     obj.html('<tr><td colspan="' + td_num + '">上市时间(' + Util.seconds_to_format(Stock.ttm_second, "%Y-%m-%d") + ')不足一年不做统计!</td></tr>');
                 } else {
-                    Util.render_table_html("rps_data", []);
+                    Util.render_table_html("rps_table_body", []);
                 }
             }
             Util.hide_tips();

package/util.js

@@ -2544,6 +2544,29 @@ const Util = {
         }
     },
 
+    /**
+     * 组装日均线/抵扣价数据
+     * @param item
+     * @param element_id
+     */
+    render_ma_deduction: function (item, element_id) {
+        if (item["price"] && item["ma_deduction"] && item["ma_deduction"].length > 0) {
+            let ma_deduction_html = [];
+            item["ma_deduction"].forEach(function (ma) {
+                if (ma["deduction_price"] > 0) {
+                    let day_ma_str = ma["day"] + "日均线";
+                    if (ma["day"] === 20 || ma["day"] === 60 || ma["day"] === 120) {
+                        day_ma_str = "<span class='label label-info'>" + day_ma_str + "</span>";
+                    }
+                    let deduction_cls = Util.text_color(item["price"], ma["deduction_price"]);
+                    let ma_cls = Util.text_color(item["price"], ma["ma"]);
+                    ma_deduction_html.push(day_ma_str + ":<b class='" + ma_cls + "'>" + ma["ma"] + "</b>(<b class='" + deduction_cls + "'>" + ma["deduction_price"] + "</b>)");
+                }
+            });
+            $("#" + element_id).html(ma_deduction_html.join("&nbsp;&nbsp;"));
+        }
+    },
+
     /**
      * 设置 option 的第 nth 项为默认项
      * @param obj