From 95ca093d5180e4453ebbdcf6e0fc77465ae2a58d Mon Sep 17 00:00:00 2001 From: zhaixiaojian Date: Wed, 17 Jul 2024 14:16:05 +0800 Subject: [PATCH] * [bug#52657,done,1h,0h] fix cpu and memory display issues. --- module/instance/js/view.ui.js | 11 +---------- module/instance/model.php | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/module/instance/js/view.ui.js b/module/instance/js/view.ui.js index e294c432c3..0da7694470 100644 --- a/module/instance/js/view.ui.js +++ b/module/instance/js/view.ui.js @@ -24,8 +24,6 @@ $('#mainContent').on('click', '.db-management', function() ); }); -var currentStatus = instanceStatus; -let currentDiskStatus = null; var timer = null; const postData = new FormData(); postData.append('idList[]', instanceID); @@ -55,15 +53,8 @@ function refreshStatus() { if(res.data.length == 0) return false; - if(currentStatus != res.data[0].status || currentDiskStatus != res.data[0].diskStatus) - { - loadPage($.createLink('instance', 'view', `instanceID=${instanceID}`), '#setting,#statusTD,#dbStatusTD,#systemLoad,.float-toolbar'); - currentStatus = res.data[0].status; - currentDiskStatus = res.data[0].diskStatus; - return false; - } + loadPage($.createLink('instance', 'view', `instanceID=${instanceID}`), '#setting,#statusTD,#dbStatusTD,#systemLoad,.float-toolbar'); } - } }); } diff --git a/module/instance/model.php b/module/instance/model.php index 46a4d9c974..92edd4d282 100644 --- a/module/instance/model.php +++ b/module/instance/model.php @@ -881,11 +881,9 @@ class instanceModel extends model if($instance->status == 'running') $this->saveAuthInfo($instance); } - $diskSettings = $this->cne->getDiskSettings($instance); $status = new stdclass; $status->id = $instance->id; $status->status = $instance->status; - $status->diskStatus = $diskSettings->requestSize != $diskSettings->size ? 'adjust' : 'normal'; $newStatusList[] = $status; }