From 1cc5d55bac5f4496b05e8edbc6b45ec13a023af9 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Wed, 30 Aug 2023 17:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=9C=BA=E6=8C=89=E9=92=AE=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=20=E5=92=8C=20=E6=B6=88=E6=AF=92=E6=97=B6=E9=97=B4und?=
 =?UTF-8?q?efined=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                | 8 ++++----
 src/pages/Login.vue | 4 ++--
 src/utils/index.js  | 3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index c4ae906..fe3f0dd 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
-# VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
-# VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
+VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
+VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
 
-VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
-VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
+# VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
+# VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index 98b0145..e104e15 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -8,10 +8,10 @@
     />
     <p class="copyright">CopyRight@ xxxxxx公司</p>
     <div class="shutdown">
-      <div class="group" @click="shutdown">
+      <!-- <div class="group" @click="shutdown">
         <img :src="Shutdown" class="icon" alt="" />
         <p class="text">关机</p>
-      </div>
+      </div> -->
       <!-- <div class="group" @click="reboot">
         <img :src="Restart" class="icon" alt="" />
         <p class="text">重新启动</p>
diff --git a/src/utils/index.js b/src/utils/index.js
index 982b604..3e37571 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -29,6 +29,9 @@ function resolveData(obj, time, newData, key) {
 }
 
 export const time_To_hhmmss = seconds => {
+  if (seconds <= 0) {
+    return 0
+  }
   var hh
   var mm
   var ss