From f17368ab90dc7ffa242e51f87fe1ec1a3864094b Mon Sep 17 00:00:00 2001 From: taotao Date: Mon, 14 Oct 2024 18:15:35 +0000 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20simpleadmin/www/index.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleadmin/www/index.html | 82 +++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/simpleadmin/www/index.html b/simpleadmin/www/index.html index e58f1f1..fc688d7 100644 --- a/simpleadmin/www/index.html +++ b/simpleadmin/www/index.html @@ -1626,11 +1626,11 @@ // 01:17:02 up 3 days, 2:41, load average: 0.65, 0.66, 0.60 // Look for xx days in the result - const days = data.match(/(\d+) 天/); + const days = data.match(/(\d+) day/); // Do the same for hours - const hours = data.match(/(\d+) 小时/); + const hours = data.match(/(\d+) hour/); // Do the same for minutes - const minutes = data.match(/(\d+) 分钟/); + const minutes = data.match(/(\d+) min/); // 2:41 const hoursAndMinutes = data.match(/(\d+):(\d+),/); @@ -1640,127 +1640,127 @@ if (hoursAndMinutes[1] === "1") { this.uptime = days[1] + - " 天, " + + " day, " + hoursAndMinutes[1] + - " 小时 " + + " hour " + hoursAndMinutes[2] + - " 分钟"; + " minutes"; } else if (hoursAndMinutes[2] === 1) { this.uptime = days[1] + - " 天, " + + " day, " + hoursAndMinutes[1] + - " 小时 " + + " hours " + hoursAndMinutes[2] + - " 分钟"; + " minute"; } else { this.uptime = days[1] + - " 天, " + + " day, " + hoursAndMinutes[1] + - " 小时 " + + " hours " + hoursAndMinutes[2] + - " 分钟"; + " minutes"; } } else { if (hoursAndMinutes[1] === "1") { this.uptime = days[1] + - " 天, " + + " days, " + hoursAndMinutes[1] + - " 小时 " + + " hour " + hoursAndMinutes[2] + - " 分钟"; + " minutes"; } else if (hoursAndMinutes[2] === 1) { this.uptime = days[1] + - " 天, " + + " days, " + hoursAndMinutes[1] + - " 小时 " + + " hours " + hoursAndMinutes[2] + - " 分钟"; + " minute"; } else { this.uptime = days[1] + - " 天, " + + " days, " + hoursAndMinutes[1] + - " 小时 " + + " hours " + hoursAndMinutes[2] + - " 分钟"; + " minutes"; } } } else { if (hoursAndMinutes[1] === "1") { this.uptime = hoursAndMinutes[1] + - " 小时 " + + " hour " + hoursAndMinutes[2] + - " 分钟"; + " minutes"; } else if (hoursAndMinutes[2] === 1) { this.uptime = hoursAndMinutes[1] + - " 小时 " + + " hours " + hoursAndMinutes[2] + - " 分钟"; + " minute"; } else { this.uptime = hoursAndMinutes[1] + - " 小时 " + + " hours " + hoursAndMinutes[2] + - " 分钟"; + " minutes"; } } } else if (days != null) { if (hours != null) { if (days[1] === "1") { if (hours[1] === "1") { - this.uptime = days[1] + " 天, " + hours[1] + " 小时"; + this.uptime = days[1] + " day, " + hours[1] + " hour"; } else { - this.uptime = days[1] + " 天, " + hours[1] + " 小时"; + this.uptime = days[1] + " day, " + hours[1] + " hours"; } } else { if (hours[1] === "1") { - this.uptime = days[1] + " 天, " + hours[1] + " 小时"; + this.uptime = days[1] + " days, " + hours[1] + " hour"; } else { - this.uptime = days[1] + " 天, " + hours[1] + " 小时"; + this.uptime = days[1] + " days, " + hours[1] + " hours"; } } } else if (minutes != null) { if (days[1] === "1") { if (minutes[1] === "1") { this.uptime = - days[1] + " 天, " + minutes[1] + " 分钟"; + days[1] + " day, " + minutes[1] + " minute"; } else { this.uptime = - days[1] + " 天, " + minutes[1] + " 分钟"; + days[1] + " day, " + minutes[1] + " minutes"; } } else { if (minutes[1] === "1") { this.uptime = - days[1] + " 天, " + minutes[1] + " 分钟"; + days[1] + " days, " + minutes[1] + " minute"; } else { this.uptime = - days[1] + " 天, " + minutes[1] + " 分钟"; + days[1] + " days, " + minutes[1] + " minutes"; } } } else { if (days[1] === "1") { - this.uptime = days[1] + " 天"; + this.uptime = days[1] + " day"; } else { - this.uptime = days[1] + " 天"; + this.uptime = days[1] + " days"; } } } else if (hours != null) { if (hours[1] === "1") { - this.uptime = hours[1] + " 小时"; + this.uptime = hours[1] + " hour"; } else { - this.uptime = hours[1] + " 小时"; + this.uptime = hours[1] + " hours"; } } else if (minutes != null) { if (minutes[1] === "1") { - this.uptime = minutes[1] + " 分钟"; + this.uptime = minutes[1] + " minute"; } else { - this.uptime = minutes[1] + " 分钟"; + this.uptime = minutes[1] + " minutes"; } } else { this.uptime = "未知时间";