sbd-npm 1.1.3 → 1.1.7

package/package.json

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

package/summary_daily.js

@@ -105,7 +105,10 @@ $(document).ready(function () {
          * @param pr
          */
         pack_change_percent: function (pr) {
-            let total_rate = pr["r10_7"] + pr["r7_5"] + pr["r5_3"] + pr["r3_0"] + pr["r0_3"] + pr["r3_5"] + pr["r5_7"] + pr["r7_10"];
+            let pr_array = [pr["r10_7"], pr["r7_5"], pr["r5_3"], pr["r3_0"], pr["r0_3"], pr["r3_5"], pr["r5_7"], pr["r7_10"]];
+            pr_array.sort(function(pr1, pr2){return pr2 - pr1});
+            //pr_array = pr_array.slice(0, 3);
+            let total_rate = pr_array[0] + pr_array[1];
             let _pack_stock_rate = function (rate_range, rate, bg_color) {
                 let rate_width = Math.round((rate / total_rate) * 100);
                 rate_width = rate_width > 0 ? rate_width : 1;
@@ -131,7 +134,9 @@ $(document).ready(function () {
             stock_rate_html.push(_pack_stock_rate("-7% ~ -5%", pr["r7_5"], "bg-green"));
             stock_rate_html.push(_pack_stock_rate("-10% ~ -7%", pr["r10_7"], "bg-green"));
             $("#stock_rate_bar").html(stock_rate_html.join(""));
+            $("#rate_up").html(pr["r0_3"] + pr["r3_5"] + pr["r5_7"] + pr["r7_10"]);
             $("#rate_up_limit").html(pr["r10"]);
+            $("#rate_down").html(pr["r10_7"] + pr["r7_5"] + pr["r5_3"] + pr["r3_0"]);
             $("#rate_down_limit").html(pr["r_10"]);
         },
 

package/util.js

@@ -209,15 +209,14 @@ let Util = {
      * @returns {string}
      */
     map_url: function (location, location_name = "") {
-        if (location === "--") {
-            return location;
-        } else if (location) {
-            location_name = location_name === "" ? location : location_name;
-            if (location_name.length > 8) {
-                return "<a title='" + location + "' target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://map.baidu.com/m?fr=ps01000&word=" + location + "'>" + location_name.substr(0, 8) + "</a>";
-            } else {
-                return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://map.baidu.com/m?fr=ps01000&word=" + location + "'>" + location_name + "</a>";
+        if (location) {
+            if (location === "--") {
+                return location;
+            }
+            if (location_name === "") {
+                location_name = location.length > 8 ? location.substr(0, 8) : location;
             }
+            return "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://map.baidu.com/m?fr=ps01000&word=" + location + "'>" + location_name + "</a>";
         }
         return "--";
     },
@@ -285,11 +284,20 @@ let Util = {
                 $(this).html(price);
             });
             $(".year_price_" + code).each(function () {
-                let year_price = $(this).attr("data-val");
-                if (year_price) {
-                    $(this).html(Util.year_price_rate(item["price"], Util.to_float(year_price)));
+                if (item["year_price"]) {
+                    $(this).html(Util.year_price_rate(item["price"], item["year_price"]));
+                } else {
+                    let year_price = $(this).attr("data-val");
+                    if (year_price) {
+                        $(this).html(Util.year_price_rate(item["price"], Util.to_float(year_price)));
+                    }
                 }
             });
+            if (item["high_52week"]) {
+                $(".high_52week_" + code).each(function () {
+                    $(this).html(Util.year_price_rate(item["price"], item["high_52week"]));
+                });
+            }
         }
         if (item["high"]) {
             let high_price = Util.digit_compare_trend(item["high"], item["previous_price"]);