sbd-npm 1.3.9 → 1.3.11

package/constant.js

@@ -108,7 +108,7 @@ const MenuList = [
 		]
 	},
 	{
-		'name': '公告/研报',
+		'name': '公告研报',
 		'icon': 'tasks',
 		'menu': [
 			{'key': 'notice_organization', 'name': '机构研报', 'url': '/0xa8ca8c2ac5ab28d5d5d083831008a7af474ce391'},
@@ -148,11 +148,10 @@ const MenuList = [
 			{'key': 'concept_star50', 'name': '科创50', 'url': '/0x9b4e2daac43b0391842cb8e62c8b9aa07662d8bd'},
 			{'key': 'concept_bellwether', 'name': '龙头股', 'url': '/0x4acb881cf7b392df48e10b52fe77115836d4cc10'},
 			{'key': 'concept_market_situation', 'name': '市值风云', 'url': '/0xa2df531f71114d2001427d83d9955d2ab0a50cdf'},
-			{'key': 'concept_down_top', 'name': '15-21年超跌股', 'url': '/0x4f30e7aa31c910be8b4cecf1ec5cbcfa0fcd74b7'},
+			{'key': 'concept_chip', 'name': '芯片半导体', 'url': '/0xeaae1cab877b70e100512be6dbdb4a9b09afe732'},
 			{'key': 'concept_auto_intelligent', 'name': '智能电动车', 'url': '/0x4594dd03fe141df964e980080769c5e171243ef0'},
 			{'key': 'concept_hk', 'name': '港股', 'url': '/0xd63fedf985a711ff5b3b6567ee94e1ba49d3787c'},
 			{'key': 'concept_us', 'name': '美股', 'url': '/0x77b7acd63bd93517f933bf0a02dafe82260f4791'},
-			{'key': 'concept_chip', 'name': '芯片', 'url': '/0xeaae1cab877b70e100512be6dbdb4a9b09afe732'},
 			{'key': 'concept_military', 'name': '军工', 'url': '/0xe578dbe70c35bda0813a95ea97abd4a604733ed0'},
 			{'key': 'concept_ten', 'name': '十倍股', 'url': '/0x8b46e8304b225e4ff0f25216dfcdf217c4a6f720'},
 		]

package/package.json

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

package/stock_basics.js

@@ -910,7 +910,8 @@ let Stock = {
                     let _html = [];
                     _html.push('<select id="public_fund_date">');
                     j["data"].forEach(function (item) {
-                        _html.push('<option value="', item["date"], '">', item["date"], '</option>');
+                        let date_format = Util.seconds_to_format(item["date"], "%Y-%m-%d");
+                        _html.push('<option value="', date_format, '">', date_format, '(', item["num"], ')</option>');
                     });
                     _html.push('</select>');
                     $("#public_fund_date_zone").html(_html.join(""));
@@ -1121,9 +1122,10 @@ let Stock = {
                 rzye_high = Math.max(rzye_high, item["rzye"]);
                 date_data.push(Util.seconds_to_format(item["date"], "%Y-%m-%d"));
                 rzye_data.push(Util.to_hundred_million(item["rzye"], 3));
-                rqye_data.push(Util.to_float(item["rqye"] / 10000, 2));
+                rqye_data.push(Util.to_float(item["rqye"], 2));
                 price_data.push(item["price"]);
             });
+            $("#margin_title").html(Util.pack_html_link(j["url"], "[" + Stock.name + "]融资余额"));
             let margin_summary = "";
             if (j["latest"].length > 0) {
                 if (j["latest"].length === 1) {
@@ -1141,7 +1143,7 @@ let Stock = {
                     margin_summary = " 最新(" + Util.seconds_to_format(d1["date"], "%Y-%m-%d") + "): " + Util.to_unit(d1["rzye"], 3) + dist_tips;
                 }
             }
-            margin_summary = Util.pack_html_link(j["url"], "[" + Stock.name + "]融资余额(单位:亿)") + margin_summary + ' 最高: ' + Util.to_unit(rzye_high, 3) + ' 最低: ' + Util.to_unit(rzye_low, 3);
+            margin_summary = margin_summary + ' 最高: ' + Util.to_unit(rzye_high, 3) + ' 最低: ' + Util.to_unit(rzye_low, 3);
             if (j["high"] && j["high"]["date"] && j["high"]["date"] > 0) {
                 margin_summary += ' 历史最高: ' + Util.to_unit(j["high"]["rzye"], 3) + '(' + Util.seconds_to_format(j["high"]["date"], "%Y-%m-%d") + ')';
             }
@@ -1149,7 +1151,7 @@ let Stock = {
                 margin_summary += ' 历史最低: ' + Util.to_unit(j["low"]["rzye"], 3) + '(' + Util.seconds_to_format(j["low"]["date"], "%Y-%m-%d") + ')';
             }
             $("#margin_summary").html(margin_summary);
-            Stock["rzye_chart"] = Util.multi_axis_line(Stock["rzye_chart"], "rzye_line_canvas", date_data, '融资余额', rzye_data, '股价', price_data);
+            Stock["rzye_chart"] = Util.multi_axis_line(Stock["rzye_chart"], "rzye_line_canvas", date_data, '融资余额(单位:亿)', rzye_data, '股价', price_data);
             let flow_data = [], color_data = [];
             date_data = [];
             j["flow_data"].forEach(function (item) {

package/summary_daily.js

@@ -17,7 +17,6 @@ $(document).ready(function () {
 
     let DailySummary = {
 
-        is_load: false,
         is_trade_time: 0,
         big_deal: {},
         hsmf_data: {},
@@ -70,10 +69,9 @@ $(document).ready(function () {
         },
 
         fetch_data: function () {
-            if (DailySummary.is_load) {
+            if (Util.is_load) {
                 return false;
             }
-            DailySummary.is_load = true;
             Util.show_loading();
             Util.post(location.pathname, {date: $("#trade_date").val(), action: "market_overview"}, function (j) {
                 DailySummary.pack_market_overview(j["market_overview"]);
@@ -83,7 +81,6 @@ $(document).ready(function () {
         },
 
         hide_loaded: function () {
-            DailySummary.is_load = false;
             Util.hide_tips();
         },
 
@@ -453,7 +450,7 @@ $(document).ready(function () {
         singleDatePicker: true,
         singleClasses: "picker_2"
     }, function () {
-        if (!DailySummary.is_load) {
+        if (!Util.is_load) {
             setTimeout(DailySummary.fetch_data, 123);
         }
     });
@@ -544,8 +541,8 @@ $(document).ready(function () {
                 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>");
+                    if (!Util.is_load) {
+                        Util.set_table_loading("stock_rate_table_body");
                         Modal.render_stock_rate_modal(obj);
                     }
                 });

package/util.js

@@ -218,6 +218,7 @@ const Util = {
             data: payload,
             success: function(data) {
                 callback(data);
+                Util.is_init = 1;
                 Util.is_load = false;
             },
             error: function (jqXHR, textStatus, errorThrown) {