diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 50236bc..5409e31 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -44,12 +44,17 @@ onMounted(() => { }) }) -// 当前消毒液余量百分比 +// 当前消毒液余量百分比(最大不超过100) const nowLiquidProgress = computed(() => { - if (!liquidInfo.value.nowLiquid) { + const now = Number(liquidInfo.value.nowLiquid) + const total = Number(liquidTotal.value) + if (!now || total <= 0) { return 0 } - return roundNumber(Number((liquidInfo.value.nowLiquid / liquidTotal.value) * 100), 0) + // 先算出百分比并四舍五入 + const rawPercent = roundNumber((now / total) * 100, 0) + // 如果大于100,就返回100;否则返回原值 + return rawPercent > 100 ? 100 : rawPercent }) // 当前消毒液余量