From 1e80c57181b1393c96d269e90cc84061da57bccd Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Sun, 8 Oct 2023 18:31:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#18961=E3=80=8118962=E3=80=8118872?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: bug#18772

* fix: bug#16958

* fix: bug#18961、18962、18872
---
 .../device/Instance/Detail/Diagnose/Status/index.tsx      | 8 ++++----
 src/views/device/Instance/Detail/Diagnose/Status/util.ts  | 2 ++
 src/views/media/Device/Channel/Live/index.vue             | 8 +++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
index 46dd955c..48707fe8 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
+++ b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
@@ -63,7 +63,7 @@ const Status = defineComponent({
         }
 
         const jumpAccessConfig = () => {
-            menuStory.jumpPage('device/Product/Detail', { id: unref(device).productId, tab: 'access' });
+            menuStory.jumpPage('device/Product/Detail', { id: unref(device).productId, tab: 'Device' });
         };
 
         const jumpDeviceConfig = () => {
@@ -1380,7 +1380,7 @@ const Status = defineComponent({
                                                 >
                                                     设备接入配置
                                                 </Button>
-                                                中${urlMap.get(unref(device)?.accessProvider) || ''}信息，任意上报一条数据
+                                                中{urlMap.get(unref(device)?.accessProvider) || ''}信息，任意上报一条数据 
                                             </span>
                                         }
                                     />,
@@ -1391,8 +1391,8 @@ const Status = defineComponent({
                                         status="default"
                                         text={
                                             <span>
-                                                请联系管理员提供${urlMap.get(unref(device)?.accessProvider) || ''}
-                                                信息，并根据URL信息任意上报一条数据
+                                                请联系管理员提供{urlMap.get(unref(device)?.accessProvider) || ''}
+                                                信息，并根据URL信息任意上报一条数据 
                                             </span>
                                         }
                                     />,
diff --git a/src/views/device/Instance/Detail/Diagnose/Status/util.ts b/src/views/device/Instance/Detail/Diagnose/Status/util.ts
index 11811906..758a12bb 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/util.ts
+++ b/src/views/device/Instance/Detail/Diagnose/Status/util.ts
@@ -259,4 +259,6 @@ urlMap.set('mqtt-client-gateway', 'topic');
 urlMap.set('http-server-gateway', 'url');
 urlMap.set('websocket-server', 'url');
 urlMap.set('coap-server-gateway', 'url');
+urlMap.set('udp-device-gateway', 'url');
+urlMap.set('tcp-server-gateway', 'url');
 
diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue
index 91a2d394..66688ebe 100644
--- a/src/views/media/Device/Channel/Live/index.vue
+++ b/src/views/media/Device/Channel/Live/index.vue
@@ -29,18 +29,16 @@
                 >
             </div>
         </div>
-        <div class="media-live">
+        <div class="media-live" @mouseenter="visibleChange"  @mouseleave="mouseleave">
             <div class="media-live-video">
                 <div
                     :class="mediaToolClass"
-                    @mouseleave="mouseleave"
                     @mouseenter="showTool = true"
                 >
                     <div class="tool-item" v-if="type !== 'share'">
                         <template v-if="isRecord === 0">
                             <j-dropdown
                                 trigger="click"
-                                @visibleChange="visibleChange"
                                 @click="showToolLock = true"
                             >
                                 <div>开始录像</div>
@@ -212,8 +210,8 @@ const mouseleave = () => {
     }
 };
 
-const visibleChange = (v: boolean) => {
-    showTool.value = v;
+const visibleChange = () => {
+    showTool.value = true;
 };
 
 const getPopupContainer = (trigger: HTMLElement) => {