sbd-npm 1.1.24 → 1.1.28

package/package.json

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

package/summary_daily.js

@@ -6,6 +6,7 @@ $(document).ready(function () {
         is_trade_time: "{{ is_trade_time }}",
         big_deal: {},
         hsmf_data: {},
+        hsgt_money_flow_chart: false,
         mo_total_chart: false,
         mo_sh_chart: false,
         mo_szm_chart: false,
@@ -30,6 +31,8 @@ $(document).ready(function () {
         },
 
         load_cache: function () {
+            DailySummary["hsgt_money_flow_chart"] = Util.init_echarts_handle("hsgt_money_flow_line");
+            DailySummary["hsgt_money_flow_chart"].showLoading();
             try {
                 let cache = DailySummary.get_cache();
                 if (cache.hasOwnProperty("market_overview")) {
@@ -44,9 +47,6 @@ $(document).ready(function () {
                 if (cache.hasOwnProperty("big_deal")) {
                     DailySummary.pack_big_deal(cache["big_deal"], 0);
                 }
-                if (cache.hasOwnProperty("hmf")) {
-                    DailySummary.pack_hsgt_money_flow(cache["hmf"]);
-                }
                 if (cache.hasOwnProperty("news")) {
                     DailySummary.pack_news_data(cache["news"]);
                 }
@@ -167,6 +167,7 @@ $(document).ready(function () {
          */
         pack_hsgt_money_flow: function (hsgt_money_flow_data) {
             if ($("#hsgt_money_flow_line").length) {
+                DailySummary["hsgt_money_flow_chart"].hideLoading();
                 let time_arr = [];
                 let hsmf_data = [];
                 let hmf_arr = [];
@@ -196,9 +197,9 @@ $(document).ready(function () {
                     DailySummary.render_hsgt_val($("#total_mf_val"), tmf_val);
                     DailySummary.render_hsgt_val($("#hmf_val"), hmf_val);
                     DailySummary.render_hsgt_val($("#smf_val"), smf_val);
-                    let hmf_option = {
-                        color: ["#26B99A", "#34495E", "#BDC3C7", "#3498DB", "#9B59B6", "#8abb6f", "#759c6a", "#bfd3b7"],
+                    DailySummary["hsgt_money_flow_chart"].setOption({
                         tooltip: {
+                            trigger: "axis",
                             backgroundColor: "rgba(0,0,0,0.5)",
                             axisPointer: {
                                 type: "cross",
@@ -207,33 +208,16 @@ $(document).ready(function () {
                                 shadowStyle: {color: "rgba(200,200,200,0.3)"}
                             }
                         },
-                        categoryAxis: {
-                            axisLine: {lineStyle: {color: "#408829"}},
-                            splitLine: {lineStyle: {color: ["#eee"]}}
-                        },
-                        valueAxis: {
-                            axisLine: {lineStyle: {color: "#408829"}},
-                            splitArea: {
-                                show: !0,
-                                areaStyle: {color: ["rgba(250,250,250,0.1)", "rgba(200,200,200,0.1)"]}
-                            },
-                            splitLine: {lineStyle: {color: ["#eee"]}}
-                        },
-                        textStyle: {fontFamily: "Arial, Verdana, sans-serif"}
-                    };
-                    let hmf = echarts.init(document.getElementById("hsgt_money_flow_line"), hmf_option);
-                    let series_item_style = {normal: {areaStyle: {type: "default"}}};
-                    hmf.setOption({
-                        tooltip: {trigger: "axis"},
                         legend: {x: 20, y: 20, data: ["总流向", "沪股通", "深股通"]},
                         "grid": {"x": 30, "y": 50, "x2": 5, "y2": 20},
                         calculable: !0,
                         xAxis: [{type: "category", boundaryGap: !1, data: time_arr}],
                         yAxis: [{type: "value"}],
                         series: [
-                            {name: "总流向", type: "line", smooth: !0, itemStyle: series_item_style, data: hsmf_data},
-                            {name: "沪股通", type: "line", smooth: !0, itemStyle: series_item_style, data: hmf_arr},
-                            {name: "深股通", type: "line", smooth: !0, itemStyle: series_item_style, data: smf_arr}]
+                            {name: "总流向", type: "line", smooth: !0, itemStyle: {normal: {color: "#26B99A", areaStyle: {type: "default"}}}, data: hsmf_data},
+                            {name: "沪股通", type: "line", smooth: !0, itemStyle: {normal: {color: "#34495E", areaStyle: {type: "default"}}}, data: hmf_arr},
+                            {name: "深股通", type: "line", smooth: !0, itemStyle: {normal: {color: "#BDC3C7", areaStyle: {type: "default"}}}, data: smf_arr}
+                        ]
                     })
                 }
             }
@@ -302,7 +286,11 @@ $(document).ready(function () {
             }
             let mo_amount_obj = $("#market_overview_amount");
             mo_amount_obj.attr("title", Util.to_float(previous_mo_amount, 3));
-            mo_amount_obj.addClass(mo_amount_cls);
+            mo_amount_obj.removeClass("label-danger");
+            mo_amount_obj.removeClass("label-success");
+            if (mo_amount_cls.length > 0) {
+                mo_amount_obj.addClass(mo_amount_cls);
+            }
             mo_amount_obj.html(Util.to_float(mo_amount, 3) + "(" + mo_amount_sign + dist_amount + ")");
             DailySummary.set_cache("market_overview", market_overview_dict);
         },
@@ -331,8 +319,8 @@ $(document).ready(function () {
         fetch_statistics_daily: function () {
             let date = $("#trade_date").val();
             let news_type = $("#news_type").val();
-            let data = {date: date, action: "statistics_daily", limit_num: DailySummary.limit_num(), news_type: news_type};
-            Util.post(location.pathname, data, function (j) {
+            let payload = {date: date, action: "statistics_daily", limit_num: DailySummary.limit_num(), news_type: news_type};
+            Util.post(location.pathname, payload, function (j) {
                 DailySummary.pack_index_data(j["index"]);
                 DailySummary.pack_change_percent(j["change_percent"]);
                 DailySummary.pack_big_deal(j["big_deal"], j["big_deal_date"]);
@@ -341,7 +329,6 @@ $(document).ready(function () {
                 DailySummary.set_cache("index", j["index"]);
                 DailySummary.set_cache("change_percent", j["change_percent"]);
                 DailySummary.set_cache("big_deal", j["big_deal"]);
-                DailySummary.set_cache("hmf", j["hmf"]);
                 DailySummary.set_cache("news", j["news"]);
                 DailySummary.hide_loaded();
                 if (DailySummary.is_trade_time === 1) {
@@ -447,14 +434,14 @@ $(document).ready(function () {
             } else {
                 Util.show_tips("Loading...");
                 let data_type = $(obj).attr("id");
-                let data = {
+                let payload = {
                     date: $("#trade_date").val(),
                     start_date: $("#mo_start_time").val(),
                     end_date: $("#mo_end_time").val(),
                     action: "market_overview_detail",
                     data_type: data_type
                 };
-                Util.post(location.pathname, data, function (j) {
+                Util.post(location.pathname, payload, function (j) {
                     Modal.data_type = data_type;
                     $("#market_overview_load_status").html("");
                     if (data_type === "amount") {
@@ -490,12 +477,12 @@ $(document).ready(function () {
         render_stock_rate_modal: function (obj) {
             Util.show_tips("Loading...");
             let cp = $(obj).attr("data-cp");
-            let data = {date: $("#trade_date").val(), action: "p_change", p_change_type: $("#p_change_type").val()};
+            let payload = {date: $("#trade_date").val(), action: "p_change", p_change_type: $("#p_change_type").val()};
             if (cp) {
-                data["cp_range"] = cp.replace(/\s/g,"").replace(/%/g, "").replace("~", "range");
+                payload["cp_range"] = cp.replace(/\s/g,"").replace(/%/g, "").replace("~", "range");
                 $("#cp_val").html(cp);
             }
-            Util.post(location.pathname, data, function (j) {
+            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 = [];
@@ -614,10 +601,10 @@ $(document).ready(function () {
     });
 
     $("#news_type").change(function () {
-        let news_type = parseInt($("#news_type").val());
-        let data = {action: "news", limit_num: DailySummary.limit_num(), news_type: news_type};
         Util.show_tips("Loading...");
-        Util.post(location.pathname, data, function (j) {
+        let news_type = parseInt($("#news_type").val());
+        let payload = {action: "news", limit_num: DailySummary.limit_num(), news_type: news_type};
+        Util.post(location.pathname, payload, function (j) {
             DailySummary.pack_news_data(j["news_data"]);
             if (news_type === 2 && j["news_time"]) {
                 $("#news_type").attr("title", Util.seconds_to_format(j["news_time"]));

package/util.js

@@ -141,13 +141,14 @@ const Util = {
      * https://api.jquery.com/jquery.ajax/
      * @param url
      * @param payload
-     * @param callback
+     * @param callback 回调函数
+     * @param data_type json | text
      */
-    post: function (url, payload, callback) {
+    post: function (url, payload, callback, data_type = "json") {
         $.ajax({
             url: url,
             type: 'POST',
-            dataType: "json",
+            dataType: data_type,
             //headers: {'X-CSRFToken': Util.get_cookie('csrftoken')},
             data: payload,
             success: callback,
@@ -2070,6 +2071,15 @@ const Util = {
         return echarts.init(element);
     },
 
+    show_echarts_loading: function(chart_handle, element_id) {
+        Util.show_tips("Loading...");
+        if (!chart_handle) {
+            chart_handle = Util.init_echarts_handle(element_id);
+        }
+        chart_handle.showLoading();
+        return chart_handle;
+    },
+
     echarts_mark_point: {
         "symbol": "circle",
         "symbolSize": 8,
@@ -2590,8 +2600,8 @@ const Util = {
                 {'url': '/27166fcfc5f01ab0321b5f5bb62dd0dc', 'name': '每周概要'},
                 {'url': '/36bfa7608290cb24310a89b17fb04287', 'name': '市场概要'},
                 {'url': '/da44721a4d3f7076da38ab105d99e10f', 'name': '市场宽度'},
-                {'url': '/cd0dba3c406c34b0a52c33ecd18a5555', 'name': 'ETF'},
-                {'url': '/8b011542774efb75f7c912dbfcc4eb6a', 'name': '行业涨跌幅'},
+                {'url': '/cd0dba3c406c34b0a52c33ecd18a5555', 'name': 'ETF分析'},
+                {'url': '/8b011542774efb75f7c912dbfcc4eb6a', 'name': '板块涨跌'},
                 {'url': '/b8c96463bc69246f833f7e77f54aa7e8', 'name': '闲钱流向'},
                 {'url': '/cd3b237255de2b89eff8b79a37a860c3', 'name': '融资杠杠率'},
                 {'url': '/13a5f8cacb58863ad5ecefaf42641f8c', 'name': '板块动量'},