From 795c84ce1639acd0b1e25d86bff731d3ad3c6488 Mon Sep 17 00:00:00 2001 From: xiaji Date: Thu, 30 Apr 2026 14:23:18 +0800 Subject: [PATCH] Fix battery count display - show total quantity instead of record count --- ups_management/ups_manager/models.py | 4 ++++ .../ups_manager/templates/ups_manager/ups_list.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ups_management/ups_manager/models.py b/ups_management/ups_manager/models.py index add2120..58fb1cb 100644 --- a/ups_management/ups_manager/models.py +++ b/ups_management/ups_manager/models.py @@ -44,6 +44,10 @@ class UPSHost(models.Model): created_at = models.DateTimeField(auto_now_add=True, verbose_name='创建时间') updated_at = models.DateTimeField(auto_now=True, verbose_name='更新时间') + @property + def total_battery_count(self): + return sum(battery.quantity for battery in self.battery_set.all()) + def __str__(self): if self.ip_address and not self.ip_address.startswith('-'): return f'{self.brand} {self.model} - {self.ip_address}' diff --git a/ups_management/ups_manager/templates/ups_manager/ups_list.html b/ups_management/ups_manager/templates/ups_manager/ups_list.html index b20d0ba..daa4d16 100644 --- a/ups_management/ups_manager/templates/ups_manager/ups_list.html +++ b/ups_management/ups_manager/templates/ups_manager/ups_list.html @@ -52,7 +52,7 @@ {{ ups.ip_address }} {{ ups.quantity }} {{ ups.location }} - {{ ups.battery_set.count }} + {{ ups.total_battery_count }} {{ ups.last_maintenance_date|default:"-" }} {{ ups.contact|default:"-" }}