chenx221/yii2-netdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

修复错误的百分比计算

Browse Source 
更新备注
This commit is contained in:
Chenx221 2024-03-03 13:45:31 +08:00
parent 9686944875
commit ba2d350baf
Signed by: chenx221
GPG Key ID: D7A9EC07024C3021
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/UserController.php
View File

@ -338,7 +338,7 @@ class UserController extends Controller
return $this->render('info', [
'model' => $model,
'usedSpace' => $usedSpace, // B
'vaultUsedSpace' => $vaultUsedSpace,
'vaultUsedSpace' => $vaultUsedSpace, // B
'storageLimit' => $storageLimit, // MB
]);
}

19
views/user/info.php
View File

@ -16,16 +16,17 @@ use yii\bootstrap5\Html;
$this->title = '个人设置';
FontAwesomeAsset::register($this);
$this->registerCssFile('@web/css/user-info.css');
$details = IPLocation::getDetails($model->last_login_ip);
$details = IPLocation::getDetails($model->last_login_ip); // IP LOCATION
$usedSpace_F = FileSizeHelper::formatBytes($usedSpace);
$vaultUsedSpace_F = FileSizeHelper::formatBytes($vaultUsedSpace);
$storageLimit_F = FileSizeHelper::formatMegaBytes($storageLimit);
$totalUsed_F = FileSizeHelper::formatBytes($usedSpace + $vaultUsedSpace);
$is_unlimited = ($storageLimit === -1);
$usedPercent = $is_unlimited ? 0 : round($usedSpace / $storageLimit * 100);
$vaultUsedPercent = $is_unlimited ? 0 : round($vaultUsedSpace / $storageLimit * 100);
$totalUsedPercent = min(($usedPercent + $vaultUsedPercent), 100);
// 容量计算
$usedSpace_F = FileSizeHelper::formatBytes($usedSpace); //网盘已用空间 格式化文本
$vaultUsedSpace_F = FileSizeHelper::formatBytes($vaultUsedSpace); //保险箱已用空间 格式化文本
$storageLimit_F = FileSizeHelper::formatMegaBytes($storageLimit); //存储限制 格式化文本
$totalUsed_F = FileSizeHelper::formatBytes($usedSpace + $vaultUsedSpace); //总已用空间 格式化文本
$is_unlimited = ($storageLimit === -1); //检查是否为无限制容量
$usedPercent = $is_unlimited ? 0 : round($usedSpace / ($storageLimit * 1024 * 1024) * 100); //网盘已用百分比
$vaultUsedPercent = $is_unlimited ? 0 : round($vaultUsedSpace / ($storageLimit * 1024 * 1024) * 100); //保险箱已用百分比
$totalUsedPercent = min(($usedPercent + $vaultUsedPercent), 100); //总已用百分比
?>
<div class="user-info">