|
|
@@ -3,7 +3,6 @@ let memChart = null;
|
|
|
let diskChart = null;
|
|
|
let sysStatusTimer = null;
|
|
|
let resizeHandler = null;
|
|
|
-let page1Active = false;
|
|
|
|
|
|
function getSystemInfo(){
|
|
|
fetch("/api/system/info")
|
|
|
@@ -110,28 +109,14 @@ function getLoadInfo(){
|
|
|
return r.json();
|
|
|
})
|
|
|
.then(data => {
|
|
|
- if(!page1Active){
|
|
|
- return;
|
|
|
- }
|
|
|
- document.getElementById("load1m").textContent = data.load1m || "--";
|
|
|
- document.getElementById("load5m").textContent = data.load5m || "--";
|
|
|
- document.getElementById("load15m").textContent = data.load15m || "--";
|
|
|
- document.getElementById("runQueue").textContent = data.runQueue || "--";
|
|
|
- document.getElementById("bootTime").textContent = data.bootTime || "--";
|
|
|
- document.getElementById("uptime").textContent = data.uptime || "--";
|
|
|
+ ["load1m","load5m","load15m","runQueue","bootTime","uptime"]
|
|
|
+ .forEach(id => setText(id, data[id]));
|
|
|
})
|
|
|
.catch(e => {
|
|
|
- if(!page1Active){
|
|
|
- return;
|
|
|
- }
|
|
|
- console.error("network status failed:", e);
|
|
|
-
|
|
|
- document.getElementById("load1m").textContent = "--";
|
|
|
- document.getElementById("load5m").textContent = "--";
|
|
|
- document.getElementById("load15m").textContent = "--";
|
|
|
- document.getElementById("runQueue").textContent = "--";
|
|
|
- document.getElementById("bootTime").textContent = "--";
|
|
|
- document.getElementById("uptime").textContent = "--";
|
|
|
+ console.error("load info failed:", e);
|
|
|
+
|
|
|
+ ["load1m","load5m","load15m","runQueue","bootTime","uptime"]
|
|
|
+ .forEach(id => setText(id, null));
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -145,50 +130,22 @@ function getServiceInfo(){
|
|
|
return r.json();
|
|
|
})
|
|
|
.then(data => {
|
|
|
- if(!page1Active){
|
|
|
- return;
|
|
|
- }
|
|
|
- document.getElementById("var1").textContent = data.var1 || "--";
|
|
|
- document.getElementById("var2").textContent = data.var2 || "--";
|
|
|
- document.getElementById("var3").textContent = data.var3 || "--";
|
|
|
- document.getElementById("var4").textContent = data.var4 || "--";
|
|
|
- document.getElementById("var5").textContent = data.var5 || "--";
|
|
|
- document.getElementById("var6").textContent = data.var6 || "--";
|
|
|
- document.getElementById("var7").textContent = data.var7 || "--";
|
|
|
- document.getElementById("var8").textContent = data.var8 || "--";
|
|
|
- document.getElementById("var9").textContent = data.var9 || "--";
|
|
|
- document.getElementById("var11").textContent = data.var11 || "--";
|
|
|
- document.getElementById("var22").textContent = data.var22 || "--";
|
|
|
- document.getElementById("var33").textContent = data.var33 || "--";
|
|
|
- document.getElementById("var44").textContent = data.var44 || "--";
|
|
|
- document.getElementById("var55").textContent = data.var55 || "--";
|
|
|
- document.getElementById("var66").textContent = data.var66 || "--";
|
|
|
- document.getElementById("var77").textContent = data.var77 || "--";
|
|
|
- document.getElementById("var88").textContent = data.var88 || "--";
|
|
|
+ [
|
|
|
+ "var1","var2","var3","var4","var5",
|
|
|
+ "var6","var7","var8","var9",
|
|
|
+ "var11","var22","var33","var44",
|
|
|
+ "var55","var66","var77","var88"
|
|
|
+ ].forEach(id => setText(id, data[id]));
|
|
|
})
|
|
|
.catch(e => {
|
|
|
- if(!page1Active){
|
|
|
- return;
|
|
|
- }
|
|
|
console.error("getAllServiceStatus() failed:", e);
|
|
|
|
|
|
- document.getElementById("var1").textContent = "--";
|
|
|
- document.getElementById("var2").textContent = "--";
|
|
|
- document.getElementById("var3").textContent = "--";
|
|
|
- document.getElementById("var4").textContent = "--";
|
|
|
- document.getElementById("var5").textContent = "--";
|
|
|
- document.getElementById("var6").textContent = "--";
|
|
|
- document.getElementById("var7").textContent = "--";
|
|
|
- document.getElementById("var8").textContent = "--";
|
|
|
- document.getElementById("var9").textContent = "--";
|
|
|
- document.getElementById("var11").textContent = "--";
|
|
|
- document.getElementById("var22").textContent = "--";
|
|
|
- document.getElementById("var33").textContent = "--";
|
|
|
- document.getElementById("var44").textContent = "--";
|
|
|
- document.getElementById("var55").textContent = "--";
|
|
|
- document.getElementById("var66").textContent = "--";
|
|
|
- document.getElementById("var77").textContent = "--";
|
|
|
- document.getElementById("var88").textContent = "--";
|
|
|
+ [
|
|
|
+ "var1","var2","var3","var4","var5",
|
|
|
+ "var6","var7","var8","var9",
|
|
|
+ "var11","var22","var33","var44",
|
|
|
+ "var55","var66","var77","var88"
|
|
|
+ ].forEach(id => setText(id, null));
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -304,8 +261,6 @@ function switchAutoUpgrade(action)
|
|
|
}
|
|
|
|
|
|
function initPage1(){
|
|
|
- page1Active = true;
|
|
|
-
|
|
|
cpuChart=echarts.init(document.getElementById("cpu-chart"));
|
|
|
memChart=echarts.init(document.getElementById("mem-chart"));
|
|
|
diskChart=echarts.init(document.getElementById("disk-chart"));
|
|
|
@@ -353,8 +308,6 @@ function initPage1(){
|
|
|
}
|
|
|
|
|
|
function exitPage1(){
|
|
|
- page1Active = false;
|
|
|
-
|
|
|
stopSysStatusRefresh();
|
|
|
|
|
|
if(resizeHandler){
|