feat: GPU table display + fan speed collection

This commit is contained in:
ngfchl
2026-06-19 17:58:10 +08:00
parent 742928a93d
commit 7204f637ac
2 changed files with 61 additions and 46 deletions
+3 -1
View File
@@ -142,6 +142,7 @@ type GPUInfo struct {
CoreClock float64 `json:"core_clock_mhz"` CoreClock float64 `json:"core_clock_mhz"`
MemClock float64 `json:"mem_clock_mhz"` MemClock float64 `json:"mem_clock_mhz"`
Power float64 `json:"power_watts"` Power float64 `json:"power_watts"`
FanSpeed float64 `json:"fan_speed"`
} }
// ═══════════════════════════════════════════════ // ═══════════════════════════════════════════════
@@ -1085,7 +1086,7 @@ func tryNvidiaSMI() []GPUInfo {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel() defer cancel()
out, err := exec.CommandContext(ctx, "nvidia-smi", out, err := exec.CommandContext(ctx, "nvidia-smi",
"--query-gpu=index,name,memory.total,memory.used,memory.free,temperature.gpu,utilization.gpu,clocks.current.graphics,clocks.current.memory,power.draw", "--query-gpu=index,name,memory.total,memory.used,memory.free,temperature.gpu,utilization.gpu,clocks.current.graphics,clocks.current.memory,power.draw,fan.speed",
"--format=csv,noheader,nounits", "--format=csv,noheader,nounits",
).Output() ).Output()
if err != nil { if err != nil {
@@ -1109,6 +1110,7 @@ func tryNvidiaSMI() []GPUInfo {
CoreClock: parseFloat(parts[7]), CoreClock: parseFloat(parts[7]),
MemClock: parseFloat(parts[8]), MemClock: parseFloat(parts[8]),
Power: parseFloat(parts[9]), Power: parseFloat(parts[9]),
FanSpeed: parseFloat(parts[10]),
}) })
} }
return gpus return gpus
+58 -45
View File
@@ -678,60 +678,59 @@
} }
/* ═══ GPU ═══ */ /* ═══ GPU ═══ */
.gpu-item { .gpu-table-wrap {
background: rgba(0, 0, 0, .18); overflow-x: auto
border-radius: 8px;
padding: 10px 12px
} }
.gpu-item + .gpu-item { .gpu-table {
margin-top: 6px width: 100%;
} border-collapse: collapse;
.gpu-hdr {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 6px
}
.gpu-nm {
font-size: 12px;
font-weight: 500
}
.gpu-tmp {
font-family: var(--mono);
font-size: 11px; font-size: 11px;
font-weight: 500 font-family: var(--mono)
} }
.gpu-rows { .gpu-table th {
display: grid; text-align: left;
grid-template-columns:1fr 1fr; font-size: 9px;
gap: 4px 14px; font-weight: 600;
font-size: 11px letter-spacing: .8px;
text-transform: uppercase;
color: var(--dim);
padding: 6px 8px;
border-bottom: 1px solid var(--border);
white-space: nowrap
} }
.gr { .gpu-table td {
display: flex; padding: 7px 8px;
flex-direction: column; border-bottom: 1px solid rgba(30, 37, 58, .5);
gap: 1px white-space: nowrap
} }
.gr-l { .gpu-table tr:last-child td {
border-bottom: none
}
.gpu-table tr:hover td {
background: rgba(0, 229, 160, .03)
}
.gpu-idx {
color: var(--dim); color: var(--dim);
font-size: 10px font-size: 10px
} }
.gr-v { .gpu-nm {
font-family: var(--mono); font-family: var(--font);
font-weight: 500 font-weight: 500;
font-size: 11px
} }
.gpu-vram { .gpu-vram-cell {
grid-column: 1/-1; display: flex;
margin-top: 4px flex-direction: column;
gap: 3px;
min-width: 80px
} }
/* ═══ Mining ═══ */ /* ═══ Mining ═══ */
@@ -1418,20 +1417,34 @@
function buildGPU(gpus, infoGPUs, isOn) { function buildGPU(gpus, infoGPUs, isOn) {
var list = isOn ? gpus : (infoGPUs || []); var list = isOn ? gpus : (infoGPUs || []);
if (!list.length) return '<div class="sec"><div class="sec-tt">GPU</div><div style="color:var(--dim);font-size:12px">未检测到</div></div>'; if (!list.length) return '<div class="sec"><div class="sec-tt">GPU</div><div style="color:var(--dim);font-size:12px">未检测到</div></div>';
var h = '<div class="sec"><div class="sec-tt">GPU</div>'; var h = '<div class="sec"><div class="sec-tt">GPU \u00B7 <span class="hl">' + list.length + ' \u5F20</span></div>';
h += '<div class="gpu-table-wrap"><table class="gpu-table"><thead><tr>'
+ '<th>#</th><th>\u578B\u53F7</th><th>\u8D1F\u8F7D</th><th>\u6E29\u5EA6</th><th>\u529F\u8017</th><th>\u6838\u5FC3</th><th>\u663E\u5B58</th><th>\u663E\u5B58\u7528\u91CF</th><th>\u98CE\u6247</th>'
+ '</tr></thead><tbody>';
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
var g = list[i], gl = g.load_percent || 0, tmp = g.temperature || 0, var g = list[i], gl = g.load_percent || 0, tmp = g.temperature || 0,
pwr = g.power || g.power_watts || 0, cc = g.core_clock || g.core_clock_mhz || 0, pwr = g.power || g.power_watts || 0, cc = g.core_clock || g.core_clock_mhz || 0,
mc = g.mem_clock || g.mem_clock_mhz || 0, vt = g.vram_total || g.vram_total_mb || 0, mc = g.mem_clock || g.mem_clock_mhz || 0, vt = g.vram_total || g.vram_total_mb || 0,
vu = g.vram_used || g.vram_used_mb || 0; vu = g.vram_used || g.vram_used_mb || 0, fan = g.fan_speed || 0;
h += '<div class="gpu-item"><div class="gpu-hdr"><span class="gpu-nm">' + esc(g.name || 'N/A') + '</span><span class="gpu-tmp">' + tT(tmp > 0 ? tmp : null) + '</span></div>'; h += '<tr>'
if (isOn && (gl > 0 || pwr > 0 || cc > 0)) h += '<div class="gpu-rows"><div class="gr"><span class="gr-l">GPU 负载</span><span class="gr-v" style="color:' + pC(gl) + '">' + gl.toFixed(1) + '%</span></div><div class="gr"><span class="gr-l">功耗</span><span class="gr-v">' + Math.round(pwr) + ' W</span></div><div class="gr"><span class="gr-l">核心频率</span><span class="gr-v">' + Math.round(cc) + ' MHz</span></div><div class="gr"><span class="gr-l">显存频率</span><span class="gr-v">' + Math.round(mc) + ' MHz</span></div></div>'; + '<td class="gpu-idx">' + (i + 1) + '</td>'
+ '<td class="gpu-nm">' + esc(g.name || 'N/A') + '</td>'
+ '<td style="color:' + pC(gl) + '">' + gl.toFixed(0) + '%</td>'
+ '<td>' + tT(tmp > 0 ? tmp : null) + '</td>'
+ '<td>' + Math.round(pwr) + ' W</td>'
+ '<td>' + Math.round(cc) + ' MHz</td>'
+ '<td>' + Math.round(mc) + ' MHz</td>';
if (vt > 0) { if (vt > 0) {
var vp = vu / vt * 100; var vp = vu / vt * 100;
h += '<div class="gpu-vram"><div class="sr" style="margin-bottom:4px"><span class="sl">显存</span><span class="sv">' + (vu / 1024).toFixed(1) + ' / ' + (vt / 1024).toFixed(1) + ' GB</span></div><div class="bar mini"><div class="bf" style="width:' + vp + '%;background:' + pC(vp) + '"></div></div></div>' h += '<td><div class="gpu-vram-cell"><span>' + (vu / 1024).toFixed(1) + '/' + (vt / 1024).toFixed(1) + 'G</span>'
+ '<div class="bar mini"><div class="bf" style="width:' + vp + '%;background:' + pC(vp) + '"></div></div></div></td>';
} else {
h += '<td>\u2014</td>';
} }
h += '</div>'; h += '<td>' + (fan > 0 ? Math.round(fan) + '%' : '\u2014') + '</td>';
h += '</tr>';
} }
h += '</tbody></table></div>';
return h + '</div>'; return h + '</div>';
} }