diff --git a/server.js b/server.js index 5948424..ae6cc3d 100644 --- a/server.js +++ b/server.js @@ -60,14 +60,18 @@ function getLatestSensorData(callback) { callback({ error: 'Error fetching latest sensor data' }); return; } - const data = results[0]; + const timestamps = data.map(row => new Date(row.timestamp).toISOString().slice(0, 19).replace('T', ' ')); + const temperatures = data.map(row => row.temperature); + const humidities = data.map(row => row.humidity); + const co2 = data.map(row => row.co2); + const pressure = data.map(row => row.pressure); callback({ - temperature: data.temperature, - humidity: data.humidity, - co2: data.co2, - pressure: data.pressure, - timestamps: data.timestamp.map(row => new Date(row.timestamp).toISOString().slice(0, 19).replace('T', ' ')) + timestamps, + temperatures, + humidities, + co2, + pressure }); }); } diff --git a/static/js/sensor-1.js b/static/js/sensor-1.js index 29095e9..c699b17 100644 --- a/static/js/sensor-1.js +++ b/static/js/sensor-1.js @@ -27,7 +27,7 @@ document.addEventListener('DOMContentLoaded', function () { // 添加新的数据 timestamps.push(data.timestamps); - temperatures.push(data.temperature); + temperatures.push(data.temperatures); updateChart(); });