diff --git a/app/Library/SystemInfo.php b/app/Library/SystemInfo.php index 1bf1755de9964990663aa523deadcdf81f194fc0..e6b3bf9f06092e31064972c1eb2e09b4580cfe28 100644 --- a/app/Library/SystemInfo.php +++ b/app/Library/SystemInfo.php @@ -92,11 +92,12 @@ class SystemInfo $rs = fread($fp, 1024); $sys_info = explode("\n", $rs); $mem_info = explode(",", $sys_info[2]); //内存占有量 数组 - $this->memory['total'] = trim(trim($mem_info[0], 'KiB Mem : '), ' total'); - $this->memory['used'] = trim(trim($mem_info[2], 'used')); + + $this->memory['total'] = round(trim(trim($mem_info[0], 'KiB Mem : '), ' total'), 0); + $this->memory['used'] = round(trim(trim($mem_info[2], 'used')), 0); $this->memory['buffer_cache'] = trim(trim($mem_info[3], 'buff/cache')); - $this->memory['free'] = trim(trim($mem_info[1], 'free')); - $this->memory['usage_ratio'] = round($this->memory['used'] / intval($this->memory['total']), 4) * 100; //百分比 + $this->memory['free'] = round(trim(trim($mem_info[1], 'free')), 0); + $this->memory['usage_ratio'] = round($this->memory['used'] / $this->memory['total'], 4) * 100; //百分比 } return $this->memory; } diff --git a/app/Modules/Admin/Services/IndexService.php b/app/Modules/Admin/Services/IndexService.php index 08d69385c2955f6675491f3030427ad5d02957d7..adc3e4c6aa58e66489bc2a015e635fbb95108c25 100644 --- a/app/Modules/Admin/Services/IndexService.php +++ b/app/Modules/Admin/Services/IndexService.php @@ -189,7 +189,7 @@ class IndexService extends BaseService $memory_info = $systemInfo->getMemory(); $memory = [ - 'chart_legend' => ['used', 'free'], + 'chart_legend' => ['used', 'free', 'buffer_cache'], 'chart_series' => [ [ 'name' => 'used', @@ -199,6 +199,10 @@ class IndexService extends BaseService 'name' => 'free', 'value' => $memory_info['free'], ], + [ + 'name' => 'buffer_cache', + 'value' => $memory_info['buffer_cache'], + ], ], ];