sbd-npm 1.5.34 → 1.5.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/status.js +7 -1
- package/util.js +4 -3
package/package.json
CHANGED
package/status.js
CHANGED
|
@@ -892,7 +892,13 @@ $(function () {
|
|
|
892
892
|
html.push("</tr>");
|
|
893
893
|
});
|
|
894
894
|
Util.render_table_html("machine_process_div_body", html);
|
|
895
|
-
|
|
895
|
+
let process_num_cls = "label-info";
|
|
896
|
+
let machine_id_status = j.machine_id;
|
|
897
|
+
if (!j.is_activate || j.is_activate !== "1") {
|
|
898
|
+
process_num_cls = "label-default";
|
|
899
|
+
machine_id_status = '<span style="font-size: 90%" class="label label-default">' + j.machine_id + '</span>';
|
|
900
|
+
}
|
|
901
|
+
$("#machine_process_tip").html('共 <span class="label ' + process_num_cls + '">' + process_num + '</span> 进程，文件数：' + (j.files_count && j.files_count > 0 ? j.files_count : 0) + '，最后更新时间：' + Util.seconds_to_format(j.date) + '，Revision：' + j.revision + '，MachineId：' + machine_id_status);
|
|
896
902
|
$("#machines option[value='" + j.machine_id + "']").text(j.ip + "(" + process_num + ")");
|
|
897
903
|
// 终止进程
|
|
898
904
|
Status.handle_process_kill("machine_process_div_body", 2);
|
package/util.js
CHANGED
|
@@ -30,6 +30,7 @@ const Util = {
|
|
|
30
30
|
countdown_timer_id: 0,
|
|
31
31
|
is_init: 0,
|
|
32
32
|
is_load: false,
|
|
33
|
+
|
|
33
34
|
// 1年的天数
|
|
34
35
|
ONE_YEAR_DAY: 365,
|
|
35
36
|
// 一天的秒数
|
|
@@ -2871,15 +2872,15 @@ const Util = {
|
|
|
2871
2872
|
*/
|
|
2872
2873
|
request_arguments: function () {
|
|
2873
2874
|
// let url = location.search; //获取url中"?"符后的字串
|
|
2874
|
-
// let
|
|
2875
|
+
// let ra_object = {};
|
|
2875
2876
|
// if (url.includes("?")) {
|
|
2876
2877
|
// let query_array = url.slice(1).split("&");
|
|
2877
2878
|
// for (let i = 0; i < query_array.length; i++) {
|
|
2878
2879
|
// let query = query_array[i].split("=");
|
|
2879
|
-
//
|
|
2880
|
+
// ra_object[query[0]] = query[1];
|
|
2880
2881
|
// }
|
|
2881
2882
|
// }
|
|
2882
|
-
// return
|
|
2883
|
+
// return ra_object;
|
|
2883
2884
|
return Object.fromEntries(new URLSearchParams(location.search));
|
|
2884
2885
|
},
|
|
2885
2886
|
|