diff --git a/web/js/serverstatus.js b/web/js/serverstatus.js index a29348c..ce3a692 100644 --- a/web/js/serverstatus.js +++ b/web/js/serverstatus.js @@ -79,7 +79,6 @@ function uptime() { "</tr>" + "<tr class=\"expandRow " + hack + "\"><td colspan=\"16\"><div class=\"accordian-body collapse\" id=\"rt" + i + "\">" + "<div id=\"expand_mem\">加载中</div>" + - "<div id=\"expand_swap\">加载中</div>" + "<div id=\"expand_hdd\">加载中</div>" + "<div id=\"expand_tupd\">加载中</div>" + "<div id=\"expand_ping\">加载中</div>" + @@ -224,9 +223,8 @@ function uptime() { TableRow.children["memory"].children[0].children[0].className = "progress-bar progress-bar-success"; TableRow.children["memory"].children[0].children[0].style.width = Mem + "%"; TableRow.children["memory"].children[0].children[0].innerHTML = Mem + "%"; - ExpandRow[0].children["expand_mem"].innerHTML = "内存: " + bytesToSize(result.servers[i].memory_used*1024, 2) + " / " + bytesToSize(result.servers[i].memory_total*1024, 2); - // Swap - ExpandRow[0].children["expand_swap"].innerHTML = "交换分区: " + bytesToSize(result.servers[i].swap_used*1024, 2) + " / " + bytesToSize(result.servers[i].swap_total*1024, 2); + // 内存|swap + ExpandRow[0].children["expand_mem"].innerHTML = "内存|虚存: " + bytesToSize(result.servers[i].memory_used*1024, 1) + " / " + bytesToSize(result.servers[i].memory_total*1024, 1) + " | " + bytesToSize(result.servers[i].swap_used*1024, 0) + " / " + bytesToSize(result.servers[i].swap_total*1024, 0); // HDD var HDD = ((result.servers[i].hdd_used/result.servers[i].hdd_total)*100.0).toFixed(0);