From 4802a2219690f169bd4a34710e2641e925fcfa1d Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Wed, 2 Oct 2024 19:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E8=81=8A=E5=A4=A9wss=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/CIDList.vue    | 21 +++++++++------------
 src/views/Chat.vue       |  5 +++++
 src/views/DeviceList.vue | 21 +++++++++------------
 src/views/Group.vue      | 21 +++++++++------------
 src/views/UserList.vue   | 21 +++++++++------------
 5 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/src/views/CIDList.vue b/src/views/CIDList.vue
index ecbb77c..7dce64b 100644
--- a/src/views/CIDList.vue
+++ b/src/views/CIDList.vue
@@ -204,24 +204,21 @@ export default {
 
 <template>
   <div>
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/videoList')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/videoList')"
       >视频列表</el-button
     >
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/device')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/device')"
       >设备管理</el-button
     >
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/User')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/User')"
       >用户</el-button
     >
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/chat')"
+      >聊天</el-button
+    >
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/group')"
+      >群组</el-button
+    >
     <el-button
       type="primary"
       size="mini"
diff --git a/src/views/Chat.vue b/src/views/Chat.vue
index 599abac..c418943 100644
--- a/src/views/Chat.vue
+++ b/src/views/Chat.vue
@@ -565,6 +565,10 @@ export default {
     },
     handleMenuSelect(val) {
       router.push(val);
+      //关闭websocket
+      if (this.socket!= null) {
+        this.socket.close();
+      }
     },
     toVideoList() {
       router.push("/videoList");
@@ -600,6 +604,7 @@ export default {
     if (this.eventSource) {
       this.eventSource.close();
     }
+    console.log("unmounted chat");
   },
 };
 </script>
diff --git a/src/views/DeviceList.vue b/src/views/DeviceList.vue
index fd970c3..9bfd2f5 100644
--- a/src/views/DeviceList.vue
+++ b/src/views/DeviceList.vue
@@ -238,24 +238,21 @@ export default {
 
 <template>
   <div>
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/videoList')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/videoList')"
       >视频列表</el-button
     >
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/device')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/device')"
       >设备管理</el-button
     >
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/User')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/User')"
       >用户</el-button
     >
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/chat')"
+      >聊天</el-button
+    >
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/group')"
+      >群组</el-button
+    >
     <el-button
       type="primary"
       size="mini"
diff --git a/src/views/Group.vue b/src/views/Group.vue
index 5529f56..e7f5eb7 100644
--- a/src/views/Group.vue
+++ b/src/views/Group.vue
@@ -300,24 +300,21 @@ export default {
 
 <template>
   <div>
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/videoList')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/videoList')"
       >视频列表</el-button
     >
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/device')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/device')"
       >设备管理</el-button
     >
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/User')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/User')"
       >用户</el-button
     >
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/chat')"
+      >聊天</el-button
+    >
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/group')"
+      >群组</el-button
+    >
     <el-button
       type="primary"
       size="mini"
diff --git a/src/views/UserList.vue b/src/views/UserList.vue
index c102cee..e3441be 100644
--- a/src/views/UserList.vue
+++ b/src/views/UserList.vue
@@ -270,24 +270,21 @@ export default {
 
 <template>
   <div>
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/videoList')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/videoList')"
       >视频列表</el-button
     >
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/device')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/device')"
       >设备管理</el-button
     >
-    <el-button
-      type="primary"
-      size="mini"
-      @click.prevent="handleMenuSelect('/User')"
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/User')"
       >用户</el-button
     >
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/chat')"
+      >聊天</el-button
+    >
+    <el-button type="primary" size="mini" @click.prevent="handleMenuSelect('/group')"
+      >群组</el-button
+    >
     <el-button
       type="primary"
       size="mini"