Update.

Author: xOS

resource/template/theme-default/network.html

@@ -86,7 +86,13 @@
                 ],
                 xAxis: {
                     type: 'time',
-                    boundaryGap: false
+                    boundaryGap: false,
+                    axisLabel: {
+                        formatter: function (value) {
+                            // 确保时间戳正确格式化
+                            return echarts.format.formatTime('MM-dd hh:mm', value);
+                        }
+                    }
                 },
                 yAxis: {
                     type: 'value',
@@ -178,25 +184,52 @@
                   });
             },
             parseMonitorInfo(monitorInfo) {
+                console.log('Monitor Info:', monitorInfo); // 调试日志
                 let tSeries = [];
                 let tLegendData = [];
                 var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
+                
+                // 检查数据有效性
+                if (!monitorInfo || !monitorInfo.result || monitorInfo.result.length === 0) {
+                    console.warn('No monitor data available');
+                    this.option.title.text = "No Data Available";
+                    this.myChart.clear();
+                    this.myChart.setOption(this.option);
+                    return;
+                }
+                
                 for (let i = 0; i < monitorInfo.result.length; i++) {
                     var lcolor = lcolors[i % lcolors.length];
                     var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
                     var rgbaColorBar = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.35)';
                     let loss = 0;
                     let data = [];
                     let datal = [];
+                    
+                    // 调试时间戳数据
+                    if (i === 0 && monitorInfo.result[i].created_at && monitorInfo.result[i].created_at.length > 0) {
+                        console.log('First timestamp:', monitorInfo.result[i].created_at[0]);
+                        console.log('Timestamp type:', typeof monitorInfo.result[i].created_at[0]);
+                        console.log('Date from timestamp:', new Date(monitorInfo.result[i].created_at[0]));
+                    }
+                    
                     for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
                         avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
+                        let timestamp = monitorInfo.result[i].created_at[j];
+                        
+                        // 确保时间戳是有效的数字
+                        if (typeof timestamp !== 'number' || isNaN(timestamp)) {
+                            console.warn('Invalid timestamp:', timestamp);
+                            continue;
+                        }
+                        
                         if (avgDelay > 0 && avgDelay < MaxTCPPingValue) {
-                            data.push([monitorInfo.result[i].created_at[j], avgDelay]);
+                            data.push([timestamp, avgDelay]);
                         }
                         else {
                             loss += 1;
                             datal.push({
-                                xAxis: monitorInfo.result[i].created_at[j],
+                                xAxis: timestamp,
                                 label: { show: false },
                                 emphasis: { disabled: true },
                                 lineStyle: {
@@ -231,7 +264,14 @@
                             }
                     });
                 }
-                this.option.title.text = monitorInfo.result[0].server_name;
+                
+                // 设置标题，优先使用第一个有效的服务器名称
+                let titleText = "Network Monitor";
+                if (monitorInfo.result.length > 0 && monitorInfo.result[0].server_name) {
+                    titleText = monitorInfo.result[0].server_name;
+                }
+                
+                this.option.title.text = titleText;
                 this.option.series = tSeries;
                 this.option.legend.data = tLegendData;
                 const maxLegendsPerRowMobile = localStorage.getItem("maxLegendsPerRowMobile") ? localStorage.getItem("maxLegendsPerRowMobile") : 2;

service/singleton/api.go

@@ -407,7 +407,13 @@ func (m *MonitorAPIService) GetMonitorHistories(query map[string]any) *MonitorIn
 				if server, exists := ServerList[history.ServerID]; exists && server != nil {
 					serverName = server.Name
 				} else {
-					serverName = "Unknown Server"
+					// 如果内存中没有，尝试从数据库查询
+					var dbServer model.Server
+					if err := DB.Where("id = ?", history.ServerID).First(&dbServer).Error; err == nil {
+						serverName = dbServer.Name
+					} else {
+						serverName = "Unknown Server"
+					}
 				}
 				ServerLock.RUnlock()
 
@@ -420,7 +426,9 @@ func (m *MonitorAPIService) GetMonitorHistories(query map[string]any) *MonitorIn
 				resultMap[history.MonitorID] = infos
 				sortedMonitorIDs = append(sortedMonitorIDs, history.MonitorID)
 			}
-			infos.CreatedAt = append(infos.CreatedAt, history.CreatedAt.Truncate(time.Minute).Unix()*1000)
+			// 修复时间戳计算：确保返回正确的毫秒时间戳
+			timestampMs := history.CreatedAt.Truncate(time.Minute).Unix() * 1000
+			infos.CreatedAt = append(infos.CreatedAt, timestampMs)
 			infos.AvgDelay = append(infos.AvgDelay, history.AvgDelay)
 		}
 		for _, monitorID := range sortedMonitorIDs {