diff --git a/components/metrics/RealtimeChart.js b/components/metrics/RealtimeChart.js index 00bd0051..05da3cec 100644 --- a/components/metrics/RealtimeChart.js +++ b/components/metrics/RealtimeChart.js @@ -11,7 +11,7 @@ function mapData(data) { data?.reduce((obj, { timestamp }) => { const t = startOfMinute(new Date(timestamp)); if (t.getTime() > last) { - obj = { t: format(t, 'yyyy-LL-dd HH:mm:00'), y: 1 }; + obj = { x: format(t, 'yyyy-LL-dd HH:mm:00'), y: 1 }; arr.push(obj); last = t.getTime(); } else { diff --git a/db/mysql/migrations/01_init/migration.sql b/db/mysql/migrations/01_init/migration.sql index 6e310932..8687dd41 100644 --- a/db/mysql/migrations/01_init/migration.sql +++ b/db/mysql/migrations/01_init/migration.sql @@ -140,4 +140,4 @@ CREATE TABLE `team_website` ( ) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -- AddSystemUser -INSERT INTO "user" (user_id, username, role, password) VALUES ('41e2b680-648e-4b09-bcd7-3e2b10c06264' , 'admin', 'admin', '$2b$10$BUli0c.muyCW1ErNJc3jL.vFRFtFJWrT8/GcR4A.sUdCznaXiqFXa'); \ No newline at end of file +INSERT INTO user (user_id, username, role, password) VALUES ('41e2b680-648e-4b09-bcd7-3e2b10c06264' , 'admin', 'admin', '$2b$10$BUli0c.muyCW1ErNJc3jL.vFRFtFJWrT8/GcR4A.sUdCznaXiqFXa'); \ No newline at end of file diff --git a/lib/date.js b/lib/date.js index 13b19e36..6907786c 100644 --- a/lib/date.js +++ b/lib/date.js @@ -181,8 +181,8 @@ export function getDateArray(data, startDate, endDate, unit) { const n = diff(endDate, startDate) + 1; function findData(date) { - const d = data.find(({ x, t }) => { - return normalize(getDateFromString(x || t)).getTime() === date.getTime(); + const d = data.find(({ x }) => { + return normalize(getDateFromString(x)).getTime() === date.getTime(); }); return d?.y || 0;