From cde14681e72270573ffa8681a6cfd4d106780edf Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 22 Mar 2023 20:39:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#10729=E3=80=8110738=E3=80=8110745?=
 =?UTF-8?q?=E3=80=8110734=E4=BF=AE=E5=A4=8D=E8=BF=9C=E7=A8=8B=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Firmware/Save/index.vue       | 18 ++++++++++++------
 .../device/Firmware/Task/Detail/index.vue      | 13 +++++++++----
 src/views/device/Firmware/Task/Save/index.vue  |  8 +-------
 src/views/device/Firmware/index.vue            |  5 ++++-
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/views/device/Firmware/Save/index.vue b/src/views/device/Firmware/Save/index.vue
index c7209f7f..331bba0e 100644
--- a/src/views/device/Firmware/Save/index.vue
+++ b/src/views/device/Firmware/Save/index.vue
@@ -237,6 +237,8 @@ const emit = defineEmits(['change']);
 
 const id = props.data.id;
 const VersionOrder = props.data.versionOrder;
+const VersionSign = props.data.sign;
+const VersionUrl = props.data.url;
 
 const formData: any = ref({
     name: '',
@@ -254,12 +256,14 @@ const extraValue: any = ref({});
 
 const validatorSign = async (_: Record<string, any>, value: string) => {
     const { signMethod, url } = formData.value;
-    if (value && !!signMethod && !!url && !extraValue.value) {
-        return extraValue.value[signMethod] !== value
-            ? Promise.reject('签名不一致，请检查文件是否上传正确')
-            : Promise.resolve();
-    } else {
+    if (id && VersionSign === value && VersionUrl === url) {
         return Promise.resolve();
+    } else {
+        if (value && !!signMethod && !!url && !!extraValue.value) {
+            return extraValue.value[signMethod] !== value
+                ? Promise.reject('签名不一致，请检查文件是否上传正确')
+                : Promise.resolve();
+        }
     }
 };
 const validatorVersionOrder = async (_: Record<string, any>, value: string) => {
@@ -270,7 +274,9 @@ const validatorVersionOrder = async (_: Record<string, any>, value: string) => {
         if (value && !!signMethod && productId) {
             const res = await validateVersion(productId, value);
             if (res.status === 200) {
-                return Promise.reject(res.result ? '版本序号已存在' : '');
+                return res.result
+                    ? Promise.reject('版本序号已存在')
+                    : Promise.resolve();
             }
         }
     }
diff --git a/src/views/device/Firmware/Task/Detail/index.vue b/src/views/device/Firmware/Task/Detail/index.vue
index 7eec3d8e..e677650a 100644
--- a/src/views/device/Firmware/Task/Detail/index.vue
+++ b/src/views/device/Firmware/Task/Detail/index.vue
@@ -280,7 +280,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
     if (!data) {
         return [];
     }
-    const Actions = [
+    const Actions: any = [
         {
             key: 'view',
             text: '查看',
@@ -292,7 +292,11 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                 handlEye(data.errorReason);
             },
         },
-        {
+    ];
+
+    const { state, mode } = data;
+    if (mode.value === 'push' && state.value === 'failed') {
+        Actions.push({
             key: 'update',
             text: '重试',
             tooltip: {
@@ -305,8 +309,9 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                     handlTry(data.id);
                 },
             },
-        },
-    ];
+        });
+    }
+
     return Actions;
 };
 
diff --git a/src/views/device/Firmware/Task/Save/index.vue b/src/views/device/Firmware/Task/Save/index.vue
index 89bdb16b..b4658025 100644
--- a/src/views/device/Firmware/Task/Save/index.vue
+++ b/src/views/device/Firmware/Task/Save/index.vue
@@ -208,10 +208,4 @@ watch(
 );
 </script>
 
-<style lang="less" scoped>
-.form {
-    .form-submit {
-        background-color: @primary-color !important;
-    }
-}
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue
index 8d2f406d..7260fe16 100644
--- a/src/views/device/Firmware/index.vue
+++ b/src/views/device/Firmware/index.vue
@@ -143,7 +143,7 @@ const columns = [
         key: 'createTime',
         dataIndex: 'createTime',
         search: {
-            type: 'time',
+            type: 'date',
         },
         width: 200,
         scopedSlots: true,
@@ -197,6 +197,9 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
         {
             key: 'delete',
             text: '删除',
+            tooltip: {
+                title: '删除',
+            },
             popConfirm: {
                 title: '确认删除?',
                 okText: ' 确定',