修改服务器监控详情指标卡片区域的信息显示
This commit is contained in:
@@ -1311,20 +1311,58 @@ async function loadMetrics() {
|
||||
fetchMetric('network')
|
||||
]);
|
||||
|
||||
// 格式化数据,确保updateStatusCards函数能正确处理
|
||||
const formattedMetrics = {
|
||||
cpu: cpuData,
|
||||
memory: memoryData,
|
||||
disk: formatDiskDataForCards(diskData),
|
||||
network: formatNetworkDataForCards(networkSumData)
|
||||
};
|
||||
|
||||
// 更新状态卡片
|
||||
updateStatusCards(formattedMetrics);
|
||||
|
||||
// 更新图表
|
||||
updateCharts(cpuData, memoryData, diskData, networkSumData);
|
||||
|
||||
// 从设备状态API获取数据,用于状态卡片显示
|
||||
let deviceStatusData = null;
|
||||
if (state.currentDeviceID) {
|
||||
try {
|
||||
const response = await fetch(`${API_BASE_URL}/devices/status?device_id=${state.currentDeviceID}`);
|
||||
if (response.ok) {
|
||||
deviceStatusData = await response.json();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch device status:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// 准备状态卡片数据
|
||||
let formattedMetricsForCards;
|
||||
|
||||
if (deviceStatusData && deviceStatusData.id) {
|
||||
// 使用设备状态API返回的数据
|
||||
formattedMetricsForCards = {
|
||||
cpu: deviceStatusData.status.cpu || cpuData,
|
||||
cpu_hz: deviceStatusData.status.cpu_hz || 0,
|
||||
memory: deviceStatusData.status.memory || memoryData,
|
||||
disk: {
|
||||
// 格式化磁盘数据,与现有代码兼容
|
||||
'/': {
|
||||
used_percent: deviceStatusData.status.disk || 0,
|
||||
total: state.historyMetrics.disk && state.historyMetrics.disk['/'] && state.historyMetrics.disk['/'].total || 0
|
||||
}
|
||||
},
|
||||
network: {
|
||||
bytes_sent: deviceStatusData.status.network_sent || 0,
|
||||
bytes_received: deviceStatusData.status.network_received || 0,
|
||||
tx_bytes: deviceStatusData.status.network_tx_bytes || 0,
|
||||
rx_bytes: deviceStatusData.status.network_rx_bytes || 0
|
||||
}
|
||||
};
|
||||
} else {
|
||||
// 回退到原有逻辑
|
||||
formattedMetricsForCards = {
|
||||
cpu: cpuData,
|
||||
memory: memoryData,
|
||||
disk: formatDiskDataForCards(diskData),
|
||||
network: formatNetworkDataForCards(networkSumData)
|
||||
};
|
||||
}
|
||||
|
||||
// 更新状态卡片
|
||||
updateStatusCards(formattedMetricsForCards);
|
||||
|
||||
// 更新刷新状态指示器
|
||||
updateRefreshStatus();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user