sbd-npm 1.4.23 → 1.4.25

package/constant.js

@@ -213,8 +213,8 @@ const MenuList = [
 		'name': '雪球',
 		'icon': 'star',
 		'menu': [
-			{'key': 'snowball_trend', 'name': '自选趋势', 'url': '/0xeac2ca3d52697daa7aed771a48bb171d7444b20f'},
 			{'key': 'snowball_user', 'name': '用户列表', 'url': '/0x180887e91b7acef7489e55b42d3c0a8ed9e0095a'},
+			{'key': 'snowball_trend', 'name': '自选趋势', 'url': '/0xeac2ca3d52697daa7aed771a48bb171d7444b20f'},
 			{'key': 'snowball_tweet', 'name': '推文', 'url': '/0x598d09b0a082120be3b35cb1ddbd4c2581be71d0'},
 			{'key': 'snowball_red_packet', 'name': '红包数据', 'url': '/0xc85d5ceba4416d89a9b1f1c8476197101267d9e8'},
 			{'key': 'snowball_tool', 'name': '搜索工具', 'url': '/0xd7650207847ff99322e8432ffdbe54f9f11c6fe3'},

package/package.json

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

package/status.js

@@ -539,12 +539,22 @@ $(function () {
                 hw_html.push('</div>');
                 hw_html.push('&nbsp;&nbsp;<a href="#" data-toggle="modal" data-target=".client_action_modal" data-type="2" class="btn btn-warning">添加任务</a>');
                 hw_html.push('<a href="#" data-toggle="modal" data-target=".client_cookie_modal" class="btn btn-warning">雪球Cookie</a>');
+                hw_html.push('<a href="#" id="machine_refresh" class="btn btn-warning">刷新Machine</a>');
                 hw_html.push('</form>');
                 hw_html.push('<div id="worker_process_div"></div>');
                 $("#worker_div").html(hw_html.join(""));
                 if (!document.getElementById("client_action_add")) {
                     Status.init_client_action_modal();
                     Status.init_client_cookie_modal();
+                    $("#machine_refresh").click(function() {
+                        Util.show_loading();
+                        $("#machine_refresh").attr("disabled", true).html("正在处理中...");
+                        Util.post(location.pathname, {active_div: "machine_refresh"}, function (j) {
+                            $("#machine_refresh").html("刷新Machine").attr("disabled", false);
+                            Util.hide_tips();
+                        });
+                        return false;
+                    });
                 }
             }
             Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_init: is_init, machine_id: $("#workers").val()}, function (j) {
@@ -604,7 +614,7 @@ $(function () {
                         html.push("</tr>");
                     });
                     Util.render_table_html("worker_process_div_body", html);
-                    $("#worker_process_tip").html('共 <span class="label label-info">' + process_num + '</span> 进程，最后更新时间：' + Util.seconds_to_format(j["date"]));
+                    $("#worker_process_tip").html('共 <span class="label label-info">' + process_num + '</span> 进程，最后更新时间：' + Util.seconds_to_format(j["date"]) + '，Revision：' + j["revision"] + '，MachineId：' + j["machine_id"]);
                     $("#workers option[value='" + $("#workers").val() + "']").text(j["ip"] + "(" + process_num + ")");
                 }
                 Util.hide_tips();

package/util.js

@@ -279,6 +279,7 @@ const Util = {
         $.ajax({
             url: url,
             headers: {
+                'Cache-Control': 'no-cache',
                 'X-CSRF-TOKEN': Util.get_cookie('_csrf_token')
             },
             async: true,
@@ -2455,11 +2456,11 @@ const Util = {
     },
 
     /**
-     * 时间花费
+     * 计算执行过程中所花费的时间
      * @param time
      * @returns {string}
      */
-    count_down_time: function (time) {
+    calculate_execution_time: function (time) {
         let result = "";
         if (time > 1000) {
             let second = Math.round(time / 1000);