From eee16a835b413a5ef7c169ba00bc750b26de5286 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 16 Apr 2024 10:37:57 +0800
Subject: [PATCH] websocket

---
 src/config/websocket.js          | 6 +++++-
 src/pages/shells/index/index.vue | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/config/websocket.js b/src/config/websocket.js
index 4ce3541..7f46136 100644
--- a/src/config/websocket.js
+++ b/src/config/websocket.js
@@ -101,7 +101,11 @@ export function sendWebsocket (url, agentData, successCallback, errCallback) {
 /**
  * 关闭websocket函数
  */
-export function closeWebsocket () {
+export function closeWebsocket (flag) {
+  if (flag) {
+    websock.close()
+    return
+  }
   if (websock) {
     websock.close() // 关闭websocket
     websock.onclose() // 关闭websocket
diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue
index da61ac6..527842f 100644
--- a/src/pages/shells/index/index.vue
+++ b/src/pages/shells/index/index.vue
@@ -263,11 +263,11 @@ export default {
     }
   },
   beforeDestroy () {
-    clearInterval(this.timer)
+    clearTimeout(this.timer)
     closeWebsocket(true)
   },
   destroyed () {
-    clearInterval(this.timer)
+    clearTimeout(this.timer)
   },
   methods: {
     handleSelect (key) {
@@ -372,7 +372,7 @@ export default {
     },
     wsMessage (res) {
       // console.log(res)
-      clearInterval(this.timer)
+      clearTimeout(this.timer)
       let data = res.head
       this.$store.dispatch('materObj', res.home.result)
       if (data.code === '1') {