diff --git a/index.html b/index.html
index ed29d79..bf61059 100644
--- a/index.html
+++ b/index.html
@@ -100,20 +100,24 @@
serverDataContainer.appendChild(errDiv);
}
- function parse_storage(num){
+ function parse_data_unit(num, fixedLen=2){
+ if (num < 1024){
+ return num.toFixed(fixedLen) + " KB";
+ }
+
num /= 1024;
if (num < 1024){
- return num.toFixed(2) + " MB";
+ return num.toFixed(fixedLen) + " MB";
}
num /= 1024;
if (num < 1024){
- return num.toFixed(2) + " GB";
+ return num.toFixed(fixedLen) + " GB";
}
num /= 1024;
if (num < 1024){
- return num.toFixed(2) + " TB";
+ return num.toFixed(fixedLen) + " TB";
}
}
@@ -163,8 +167,10 @@
let inNum = serverData[key].network_info.in;
let outNum = serverData[key].network_info.out;
+ inNum = parse_data_unit(inNum)
+ outNum = parse_data_unit(outNum)
- networkInfo.innerHTML += " 网络 : in: " + inNum.toFixed(1) + " KB/s, out: " + outNum.toFixed(1) + " KB/s";
+ networkInfo.innerHTML += " 网络 : in: " + inNum + "/s, out: " + outNum + "/s";
serverCard.appendChild(networkInfo);
// 分割线
@@ -178,8 +184,8 @@
let totalNum = serverData[key].memory_info.total
let usedNum = serverData[key].memory_info.used
- let totalMem = parse_storage(totalNum);
- let usedMem = parse_storage(usedNum);
+ let totalMem = parse_data_unit(totalNum);
+ let usedMem = parse_data_unit(usedNum);
let tmpColor = "green";
if (usedNum / totalNum > 0.8)
tmpColor = "red";
@@ -202,8 +208,8 @@
let targetPath = serverData[key].storage_info_list[i].path;
let totalNum = serverData[key].storage_info_list[i].total
let availableNum = serverData[key].storage_info_list[i].available
- let totalStorage = parse_storage(totalNum);
- let availableStorage = parse_storage(totalNum - availableNum);
+ let totalStorage = parse_data_unit(totalNum);
+ let availableStorage = parse_data_unit(totalNum - availableNum);
let tmpColor = "green";
if (availableNum / totalNum < 0.1)
tmpColor = "red";