sbd-npm 1.4.48 → 1.4.50

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.4.48",
+    "version": "1.4.50",
     "description": "Stock Big Data",
     "author": "DHQ <dhq314@gmail.com>",
     "license": "ISC",

package/status.js

@@ -554,7 +554,8 @@ $(function () {
         },
 
         fetch_task_data: function(is_init = 0) {
-            Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_init: is_init, machine_id: $("#task_machines").val()}, function (j) {
+            let machine_id = $("#task_machines").val();
+            Util.post(location.pathname, {active_div: localStorage[Status.tab_token], is_init: is_init, machine_id: machine_id}, function (j) {
                 if (j["machines"]) {
                     Status.pack_machine_component("task_machines", j["machines"]);
                     if (j["machines"].length > 0) {
@@ -614,6 +615,9 @@ $(function () {
                         $("#task_add").html('添加任务').prop('disabled', false).removeClass("btn-warning").addClass("btn-default");
                     }
                 }
+                if (j["ip_process_num"]) {
+                    $("#task_machines option[value='" + machine_id + "']").text(j["ip_process_num"]);
+                }
                 Util.hide_tips();
             });
         },
@@ -713,7 +717,7 @@ $(function () {
                     });
                     Util.render_table_html("machine_process_div_body", html);
                     $("#machine_process_tip").html('共 <span class="label label-info">' + process_num + '</span> 进程，最后更新时间：' + Util.seconds_to_format(j["date"]) + '，Revision：' + j["revision"] + '，MachineId：' + j["machine_id"]);
-                    $("#machines option[value='" + $("#machines").val() + "']").text(j["ip"] + "(" + process_num + ")");
+                    $("#machines option[value='" + j["machine_id"] + "']").text(j["ip"] + "(" + process_num + ")");
                 } else if (is_init === 1) {
                     $('#machines').html('<option value="">暂无Machine</option>');
                 }

package/util.js

@@ -420,8 +420,11 @@ const Util = {
             if (location_name === "") {
                 location_name = location.length > 20 ? location.substring(0, 20) : 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 "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://www.amap.com/search?query=" + location + "'>" + location_name + "</a>";
+            if (Util.is_has_chinese(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 "<a target='_blank' class='link_cls map_link' rel='noopener noreferrer nofollow' href='https://www.amap.com/search?query=" + location + "'>" + location_name + "</a>";
+            }
+            return Util.google_map_url(location, location_name);
         }
         return "--";
     },
@@ -1711,7 +1714,8 @@ const Util = {
                 $(this).click(function () {
                     let tr_obj = $(this).parent().parent();
                     let word = $(tr_obj).children('td').eq(1).text();
-                    if (confirm("是否确定要删除“ " + word + " ” ？")) {
+                    let chinese = $(tr_obj).children('td').eq(2).text();
+                    if (confirm("是否确定要删除“ " + word + "「" + chinese + "」 ” ？")) {
                         Util.post(location.pathname, {"active_div": "word_del", "word": word}, function () {
                             $(tr_obj).remove();
                             Util.show_tips("删除 “ " + word + " ” 成功", 3456, "alert-success");
@@ -2595,8 +2599,7 @@ const Util = {
      * @returns {boolean}
      */
     is_has_chinese: function (str) {
-        let re = /[^\u4e00-\u9fa5]/;
-        return !re.test(str);
+        return /[\u4e00-\u9fa5]/.test(str);
     },
 
     /**
@@ -3653,7 +3656,11 @@ const Util = {
             }
             start_obj.val(start_date);
         }
-        start_obj.daterangepicker({locale: {format: 'YYYY-MM-DD'}, singleDatePicker: true, singleClasses: "picker_2"});
+        start_obj.daterangepicker({
+            locale: {format: 'YYYY-MM-DD'},
+            singleDatePicker: true,
+            singleClasses: "picker_2"
+        });
         if (end_id.length > 0) {
             let end_obj = $('#' + end_id);
             if (!Util.regexp_date_yyyy_mm_dd(end_obj.val())) {