Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-06-08 22:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #10 from xAlokyx/copilot/fix-overview-loading-issue

Browse source 
fix: resolve Overview page stuck on loading spinner
This commit is contained in:
ALOKY 2026-04-06 18:41:13 +03:00 committed by GitHub
commit 02645f6b58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
web/html/index.html
View file

@ -695,7 +695,7 @@
this.logicalPro = data.logicalPro; this.logicalPro = data.logicalPro;
this.cpuSpeedMhz = data.cpuSpeedMhz; this.cpuSpeedMhz = data.cpuSpeedMhz;
this.disk = new CurTotal(data.disk.current, data.disk.total); this.disk = new CurTotal(data.disk.current, data.disk.total);
this.loads = data.loads.map(load => NumberFormatter.toFixed(load, 2)); this.loads = (data.loads || [0, 0, 0]).map(load => NumberFormatter.toFixed(load, 2));
this.mem = new CurTotal(data.mem.current, data.mem.total); this.mem = new CurTotal(data.mem.current, data.mem.total);
this.netIO = data.netIO; this.netIO = data.netIO;
this.netTraffic = data.netTraffic; this.netTraffic = data.netTraffic;
@ -905,17 +905,19 @@
try { try {
const msg = await HttpUtil.get('/panel/api/server/status'); const msg = await HttpUtil.get('/panel/api/server/status');
if (msg.success) { if (msg.success) {
if (!this.loadingStates.fetched) { this.setStatus(msg.obj);
this.loadingStates.fetched = true; } else if (!this.loadingStates.fetched) {
} this.loadingStates.fetched = true;
this.setStatus(msg.obj, true);
} }
} catch (e) { } catch (e) {
console.error("Failed to get status:", e); console.error("Failed to get status:", e);
if (!this.loadingStates.fetched) {
this.loadingStates.fetched = true;
}
} }
}, },
setStatus(data) { setStatus(data) {
this.loadingStates.fetched = true;
this.status = new Status(data); this.status = new Status(data);
// Push CPU percent into history (clamped 0..100) // Push CPU percent into history (clamped 0..100)
const v = Math.max(0, Math.min(100, Number(data?.cpu ?? 0))) const v = Math.max(0, Math.min(100, Number(data?.cpu ?? 0)))