From 5aeeedb7ae85d90bd4bde8c0ab23c372181948a6 Mon Sep 17 00:00:00 2001
From: luming <lm@rainss.cn>
Date: Sat, 2 Dec 2023 21:20:12 +0800
Subject: [PATCH] Modify display.

---
 src/common/uptimerobot.js     | 15 +++++++++------
 src/components/uptimerobot.js |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/common/uptimerobot.js b/src/common/uptimerobot.js
index 7658790..2265253 100644
--- a/src/common/uptimerobot.js
+++ b/src/common/uptimerobot.js
@@ -8,12 +8,15 @@ export async function GetMonitors(apikey, days) {
 
   const dates = [];
   const today = dayjs(new Date().setHours(0, 0, 0, 0));
-  for (let d = 0; d < days; d++) {
+  // for (let d = 0; d < days; d++) {
+  //   dates.push(today.subtract(d, 'day'));
+  // }
+  for (let d = days - 1; d >= 0; d--) {
     dates.push(today.subtract(d, 'day'));
   }
   const ranges = dates.map((date) => `${date.unix()}_${date.add(1, 'day').unix()}`);
-  const start = dates[dates.length - 1].unix();
-  const end = dates[0].add(1, 'day').unix();
+  const start = dates[0].unix();
+  const end = dates[dates.length - 1].add(1, 'day').unix();
   ranges.push(`${start}_${end}`);
   const postdata = {
     api_key: apikey,
@@ -22,7 +25,7 @@ export async function GetMonitors(apikey, days) {
     log_types: '1-2',
     logs_start_date: start,
     logs_end_date: end,
-    custom_uptime_ranges: ranges.reverse().join('-'),
+    custom_uptime_ranges: ranges.join('-'),
   };
 
   const response = await axios.post('https://uptimestatus.qikaile.tk/v2/getMonitors', postdata, {
@@ -40,10 +43,10 @@ export async function GetMonitors(apikey, days) {
   return response.data.monitors.map((monitor) => {
 
     const ranges = monitor.custom_uptime_ranges.split('-');
-    const average = formatNumber(ranges.shift());
+    const average = formatNumber(ranges.pop());
     const daily = [];
     const map = [];
-    dates.reverse().forEach((date, index) => {
+    dates.forEach((date, index) => {
       map[date.format('YYYYMMDD')] = index;
       daily[index] = {
         date: date,
diff --git a/src/components/uptimerobot.js b/src/components/uptimerobot.js
index a0a52ec..fe2d63c 100644
--- a/src/components/uptimerobot.js
+++ b/src/components/uptimerobot.js
@@ -48,7 +48,7 @@ function UptimeRobot({ apikey }) {
         })}
       </div>
       <div className='summary'>
-        <span className='summary-day'>{site.daily[site.daily.length - 1].date.format('YYYY-MM-DD')}</span>
+        <span className='summary-day'>{site.daily[0].date.format('YYYY-MM-DD')}</span>
         <span className='summary-note'>
           {site.total.times
             ? `最近 ${CountDays} 天内故障 ${site.total.times} 次，累计 ${formatDuration(site.total.duration)}，平均可用率 ${site.average}%`