diff --git a/internal/web/ui.go b/internal/web/ui.go index 08628b1..26ffe5c 100644 --- a/internal/web/ui.go +++ b/internal/web/ui.go @@ -1014,19 +1014,18 @@ func (u *UI) pageConsole(w http.ResponseWriter, r *http.Request) { features = append(features, f) } - npu := 0.0 + npu, diskUsage, temp, cpuUsage, memUsage := 0.0, 0.0, 0.0, 0.0, 0.0 if m, ok := metrics[dev.DeviceID]; ok { + cpuUsage = m.CPU + memUsage = m.Mem npu = m.NPU - } - - diskUsage := 0.0 - temp := 0.0 - if m, ok := metrics[dev.DeviceID]; ok { diskUsage = m.Disk temp = m.Temperature } consoleDevices = append(consoleDevices, ConsoleDeviceData{ Device: dev, + CPUUsage: cpuUsage, + MemUsage: memUsage, NPUUsage: npu, DiskUsage: diskUsage, Temperature: temp, @@ -4585,6 +4584,8 @@ type DeviceMetric struct { type ConsoleDeviceData struct { Device *models.Device + CPUUsage float64 + MemUsage float64 NPUUsage float64 DiskUsage float64 Temperature float64 diff --git a/internal/web/ui/templates/console.html b/internal/web/ui/templates/console.html index 4424392..af155dd 100644 --- a/internal/web/ui/templates/console.html +++ b/internal/web/ui/templates/console.html @@ -30,6 +30,7 @@ {{$cd.Device.DisplayName}} {{$cd.Device.IP}} | {{len $cd.Channels}}/{{$cd.MaxUnits}} 路 + ＋ 从未分配添加
@@ -67,15 +68,19 @@
-
已分配视频源（{{len $cd.Cameras}}路）
-
- {{range $cam := $cd.Cameras}} - {{$cam}} - {{else}} - 暂无 - {{end}} +
设备负载
+
+
CPU{{printf "%.0f%%" $cd.CPUUsage}}
+
+
内存{{printf "%.0f%%" $cd.MemUsage}}
+
+
NPU{{printf "%.0f%%" $cd.NPUUsage}}
+
+
磁盘{{printf "%.0f%%" $cd.DiskUsage}}
+
+
温度{{printf "%.0f°C" $cd.Temperature}}
+
-
＋ 从未分配添加
@@ -210,6 +215,8 @@ })(); +

异常设备