From 20337c378dc883c77b41ceb6201c635bd1a9a779 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Sat, 15 Jul 2023 13:51:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Player/ScreenPlayer.vue          | 8 +++++++-
 src/views/device/Firmware/Task/Detail/index.vue | 6 +++---
 src/views/device/Firmware/index.vue             | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/Player/ScreenPlayer.vue b/src/components/Player/ScreenPlayer.vue
index 3e41e401..b1dbf270 100644
--- a/src/components/Player/ScreenPlayer.vue
+++ b/src/components/Player/ScreenPlayer.vue
@@ -123,7 +123,7 @@
                             @click="playerActive = index"
                         >
                             <div
-                                class="media-btn-refresh"
+                                class="media-btn-refresh refreshBtn"
                                 :style="{
                                     display: item.url ? 'block' : 'none',
                                 }"
@@ -464,4 +464,10 @@ defineExpose({
 :deep(.vjs-icon-spinner){
   display: none;
 }
+.refreshBtn{
+   opacity: 0;
+}
+.refreshBtn:hover{
+    opacity: 1;
+}
 </style>
diff --git a/src/views/device/Firmware/Task/Detail/index.vue b/src/views/device/Firmware/Task/Detail/index.vue
index ae3a3e07..7f5389e9 100644
--- a/src/views/device/Firmware/Task/Detail/index.vue
+++ b/src/views/device/Firmware/Task/Detail/index.vue
@@ -66,6 +66,7 @@
                     model="TABLE"
                     :columns="columns"
                     :request="history"
+                    :scroll="{ x: 1500 }"
                     :defaultParams="{
                         sorts: [{ name: 'createTime', order: 'desc' }],
                         terms: defaultParams,
@@ -74,9 +75,8 @@
                 >
                   <template #completeTime="slotProps">
                         <span>{{
-                            moment(slotProps.completeTime).format(
-                              'YYYY-MM-DD HH:mm:ss',
-                            )
+                           slotProps?.completeTime ? moment(slotProps.completeTime).format(
+                              'YYYY-MM-DD HH:mm:ss') : ""
                           }}</span>
                   </template>
                     <template #createTime="slotProps">
diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue
index 92407bb6..1f283482 100644
--- a/src/views/device/Firmware/index.vue
+++ b/src/views/device/Firmware/index.vue
@@ -207,6 +207,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             popConfirm: {
                 title: '确认删除?',
                 okText: ' 确定',
+                placement: 'topLeft',
                 cancelText: '取消',
                 onConfirm: async () => {
                     handlDelete(data.id);

From 108eb5f9b74a817abb3a6f2fe4ab0e984196765d Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Sat, 15 Jul 2023 14:05:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/media/Cascade/index.vue | 4 ++--
 src/views/media/Device/index.vue  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/media/Cascade/index.vue b/src/views/media/Cascade/index.vue
index 0a3a0695..f90515d2 100644
--- a/src/views/media/Cascade/index.vue
+++ b/src/views/media/Cascade/index.vue
@@ -53,9 +53,9 @@
                         </template>
                         <template #content>
                             <Ellipsis style="width: calc(100% - 100px);">
-                            <h3 style="font-size: 16px;font-weight: 700;color: #315efb;">
+                            <span style="font-size: 16px;font-weight: 700">
                                 {{ slotProps.name }}
-                            </h3>
+                            </span>
                             </Ellipsis>
                             <p>通道数量：{{ slotProps.count || 0 }}</p>
                             <j-badge
diff --git a/src/views/media/Device/index.vue b/src/views/media/Device/index.vue
index 98bf1ae6..3c827097 100644
--- a/src/views/media/Device/index.vue
+++ b/src/views/media/Device/index.vue
@@ -47,9 +47,9 @@
                         </template>
                         <template #content>
                             <Ellipsis style="width: calc(100% - 100px);">
-                            <h3 style="font-size: 16px;font-weight: 700;color: #315efb;">
+                            <span style="font-size: 16px;font-weight: 700">
                                 {{ slotProps.name }}
-                            </h3>
+                            </span>
                             </Ellipsis>
                             <j-row>
                                 <j-col :span="12">