ZaiZai 5 months ago
parent
commit
21cb3edac2
2 changed files with 17 additions and 12 deletions
  1. 4 4
      src/config/index.json
  2. 13 8
      src/layout/index.vue

+ 4 - 4
src/config/index.json

@@ -1,11 +1,11 @@
 {
     "version": "20230607160059",
     "target1": "http://127.0.0.1:8090",
-    "target": "http://39.108.216.210:8090",
-    "target3": "http://192.168.0.125:8090",
+    "target2": "http://39.108.216.210:8090",
+    "target": "http://192.168.0.125:8090",
     "target4": "http://183.247.216.148:28090",
-    "socket": "wss://measure.hczcxx.cn/websocket",
-    "socket2": "ws://192.168.0.125:9527/websocket",
+    "socket1": "wss://measure.hczcxx.cn/websocket",
+    "socket": "ws://192.168.0.125:9527/websocket",
     "localModel": false,
     "smsPhone": "",
     "vite": {

+ 13 - 8
src/layout/index.vue

@@ -236,17 +236,22 @@ const socketData = async (res) => {
 
 //倒计时
 let timeRef
+let startTime
 const isReminderShow = ref(false)
 const isReminderText = ref('')
-const setReminderText = (time) => {
-    if (time < 0) {
-        closeReminder()
-        return
+const setReminderText = (totalTime) => {
+    startTime = performance.now()
+    const step = () => {
+        const elapsedTime = Math.floor((performance.now() - startTime) / 1000)
+        const remainingTime = totalTime - elapsedTime
+        if (remainingTime < 0) {
+            closeReminder()
+            return
+        }
+        isReminderText.value = `系统将在${remainingTime}秒后,进行更新`
+        requestAnimationFrame(step)
     }
-    timeRef = setTimeout(() => {
-        isReminderText.value = `系统将在${time}秒后,进行更新`
-        setReminderText(time - 1)
-    }, 1000)
+    requestAnimationFrame(step)
 }
 
 //关闭倒计时