From 791b1748ebe02bd7b17f81c62db3fc827eac9c1d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 30 Oct 2023 13:51:05 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3294=20fix:websocket=20=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/terminalLogMonitorTab.vue          | 5 ++++-
 .../src/components/common/table/settings/mibTable.vue        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
index ff503b899..af10d2578 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
@@ -105,8 +105,11 @@ export default {
       } else {
         baseUrl = baseUrl.replace('http://', 'ws://').replace('https://', 'ws://')
       }
+      if (!baseUrl.endsWith('/')) {
+        baseUrl += '/'
+      }
       /// monitor
-      const url = baseUrl + '/terminal/monitor.ws?' + '&token=' + token + '&uuid=' + this.obj.uuid
+      const url = baseUrl + 'terminal/monitor.ws?' + '&token=' + token + '&uuid=' + this.obj.uuid
       if (this.terminalSocket) { // 如果存在之前的链接 先断开 再链接新的
         this.terminalSocket.close()
       }
diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue
index c2a9ea7c7..6568ec9cc 100644
--- a/nezha-fronted/src/components/common/table/settings/mibTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue
@@ -61,7 +61,7 @@
                     </div>
                     <div>
                       <span>{{$t('asset.vendor')}}:</span>
-                      <span>{{n.vendor}}</span>
+                      <span>{{n.brand ? n.brand.name : ''}}</span>
                     </div>
                     <div>
                       <span>{{$t('overall.type')}}:</span>