From 4e75bf94c6a2711ec5b666176081fbe5cd172857 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 1 Mar 2023 17:08:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=9C=E7=A8=8B=E5=8D=87=E7=BA=A7=20?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/Firmware/Task/Detail/index.vue     | 81 +++++++++----------
 src/views/device/Firmware/Task/index.vue      |  9 ++-
 src/views/device/Firmware/index.vue           | 58 ++++++-------
 3 files changed, 70 insertions(+), 78 deletions(-)

diff --git a/src/views/device/Firmware/Task/Detail/index.vue b/src/views/device/Firmware/Task/Detail/index.vue
index dc4f4d29..ef8d17e4 100644
--- a/src/views/device/Firmware/Task/Detail/index.vue
+++ b/src/views/device/Firmware/Task/Detail/index.vue
@@ -17,19 +17,21 @@
                             </div>
 
                             <div class="state-title-right">
-                                <div>
-                                    <a-popconfirm
-                                        title="确定批量重试?"
-                                        ok-text="确定"
-                                        cancel-text="取消"
-                                        @confirm="confirm"
+                                <div class="state-button">
+                                    <PermissionButton
+                                        type="link"
                                         v-if="
                                             item.key === 'failed' &&
                                             stateInfo?.mode?.value === 'push'
                                         "
+                                        hasPermission="device/Firmware:update"
+                                        :popConfirm="{
+                                            title: `确定批量重试`,
+                                            onConfirm: confirm,
+                                        }"
                                     >
-                                        <a href="#">批量重试</a>
-                                    </a-popconfirm>
+                                        批量重试
+                                    </PermissionButton>
                                 </div>
 
                                 <div class="img">
@@ -85,37 +87,27 @@
                     <span>{{ slotProps.progress }}%</span>
                 </template>
                 <template #action="slotProps">
-                    <a-space :size="16">
-                        <a-tooltip
+                    <a-space>
+                        <template
                             v-for="i in getActions(slotProps)"
                             :key="i.key"
-                            v-bind="i.tooltip"
                         >
-                            <a-popconfirm
-                                v-if="i.popConfirm"
-                                v-bind="i.popConfirm"
-                            >
-                                <a-button
-                                    :disabled="i.disabled"
-                                    style="padding: 0"
-                                    type="link"
-                                    ><AIcon :type="i.icon"
-                                /></a-button>
-                            </a-popconfirm>
-                            <a-button
-                                style="padding: 0"
+                            <PermissionButton
+                                :disabled="i.disabled"
+                                :popConfirm="i.popConfirm"
+                                :tooltip="{
+                                    ...i.tooltip,
+                                }"
+                                style="padding: 0px"
+                                @click="i.onClick"
                                 type="link"
-                                v-else
-                                @click="i.onClick && i.onClick(slotProps)"
+                                :hasPermission="'device/Firmware:' + i.key"
                             >
-                                <a-button
-                                    :disabled="i.disabled"
-                                    style="padding: 0"
-                                    type="link"
+                                <template #icon
                                     ><AIcon :type="i.icon"
-                                /></a-button>
-                            </a-button>
-                        </a-tooltip>
+                                /></template>
+                            </PermissionButton>
+                        </template>
                     </a-space>
                 </template>
             </JTable>
@@ -129,7 +121,6 @@ import {
     taskById,
     history,
     historyCount,
-    queryProduct,
     startTask,
     startOneTask,
 } from '@/api/device/firmware';
@@ -138,8 +129,8 @@ import { getImage } from '@/utils/comm';
 import moment from 'moment';
 import { cloneDeep } from 'lodash-es';
 import Save from './Save.vue';
+
 const tableRef = ref<Record<string, any>>({});
-const router = useRouter();
 const route = useRoute();
 const params = ref<Record<string, any>>({});
 const taskId = route.params?.id as string;
@@ -286,7 +277,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
     }
     const Actions = [
         {
-            key: 'eye',
+            key: 'view',
             text: '查看',
             tooltip: {
                 title: '查看',
@@ -297,25 +288,23 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             },
         },
         {
-            key: 'try',
+            key: 'update',
             text: '重试',
             tooltip: {
                 title: '重试',
             },
             icon: 'RedoOutlined',
-            onClick: async () => {
-                handlTry(data.id);
+            popConfirm: {
+                title: `确认重试?`,
+                onConfirm: async () => {
+                    handlTry(data.id);
+                },
             },
         },
     ];
     return Actions;
 };
 
-const handlAdd = () => {
-    current.value = {};
-    visible.value = true;
-};
-
 const handlEye = (data: string) => {
     current.value = data || '';
     visible.value = true;
@@ -434,4 +423,8 @@ const handleSearch = (e: any) => {
         }
     }
 }
+.state-button {
+    margin-top: -5px;
+    margin-right: -12px;
+}
 </style>
diff --git a/src/views/device/Firmware/Task/index.vue b/src/views/device/Firmware/Task/index.vue
index b9cff6fc..5c60d08d 100644
--- a/src/views/device/Firmware/Task/index.vue
+++ b/src/views/device/Firmware/Task/index.vue
@@ -13,9 +13,14 @@
             :params="params"
         >
             <template #headerTitle>
-                <a-button type="primary" @click="handlAdd"
-                    ><AIcon type="PlusOutlined" />新增</a-button
+                <PermissionButton
+                    type="primary"
+                    @click="handlAdd"
+                    hasPermission="device/Firmware:add"
                 >
+                    <template #icon><AIcon type="PlusOutlined" /></template>
+                    新增
+                </PermissionButton>
             </template>
             <template #mode="slotProps">
                 <span>{{ slotProps.mode.text }}</span>
diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue
index 520ad2d4..b6f869d1 100644
--- a/src/views/device/Firmware/index.vue
+++ b/src/views/device/Firmware/index.vue
@@ -13,9 +13,14 @@
                 :params="params"
             >
                 <template #headerTitle>
-                    <a-button type="primary" @click="handlAdd"
-                        ><plus-outlined />新增</a-button
+                    <PermissionButton
+                        type="primary"
+                        @click="handlAdd"
+                        hasPermission="device/Firmware:add"
                     >
+                        <template #icon><AIcon type="PlusOutlined" /></template>
+                        新增
+                    </PermissionButton>
                 </template>
                 <template #productId="slotProps">
                     <span>{{ slotProps.productName }}</span>
@@ -28,37 +33,27 @@
                     }}</span>
                 </template>
                 <template #action="slotProps">
-                    <a-space :size="16">
-                        <a-tooltip
+                    <a-space>
+                        <template
                             v-for="i in getActions(slotProps)"
                             :key="i.key"
-                            v-bind="i.tooltip"
                         >
-                            <a-popconfirm
-                                v-if="i.popConfirm"
-                                v-bind="i.popConfirm"
-                            >
-                                <a-button
-                                    :disabled="i.disabled"
-                                    style="padding: 0"
-                                    type="link"
-                                    ><AIcon :type="i.icon"
-                                /></a-button>
-                            </a-popconfirm>
-                            <a-button
-                                style="padding: 0"
+                            <PermissionButton
+                                :disabled="i.disabled"
+                                :popConfirm="i.popConfirm"
+                                :tooltip="{
+                                    ...i.tooltip,
+                                }"
+                                style="padding: 0px"
+                                @click="i.onClick"
                                 type="link"
-                                v-else
-                                @click="i.onClick && i.onClick(slotProps)"
+                                :hasPermission="'device/Firmware:' + i.key"
                             >
-                                <a-button
-                                    :disabled="i.disabled"
-                                    style="padding: 0"
-                                    type="link"
+                                <template #icon
                                     ><AIcon :type="i.icon"
-                                /></a-button>
-                            </a-button>
-                        </a-tooltip>
+                                /></template>
+                            </PermissionButton>
+                        </template>
                     </a-space>
                 </template>
             </JTable>
@@ -79,7 +74,6 @@ import type { FormDataType } from './type';
 const menuStory = useMenuStore();
 
 const tableRef = ref<Record<string, any>>({});
-const router = useRouter();
 const params = ref<Record<string, any>>({});
 
 const productOptions = ref([]);
@@ -174,7 +168,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
     }
     return [
         {
-            key: 'FileTextOutlined',
+            key: 'view',
             text: '升级任务',
             tooltip: {
                 title: '升级任务',
@@ -185,7 +179,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             },
         },
         {
-            key: 'edit',
+            key: 'update',
             text: '编辑',
             tooltip: {
                 title: '编辑',
@@ -211,7 +205,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
     ];
 };
 
-const handlUpdate = (data: FormDataType) => {
+const handlUpdate = (data: Partial<Record<string, any>>) => {
     menuStory.jumpPage(
         'device/Firmware/Task',
         {},
@@ -226,7 +220,7 @@ const handlAdd = () => {
     current.value = {};
     visible.value = true;
 };
-const handlEdit = (data: FormDataType) => {
+const handlEdit = (data: Partial<Record<string, any>>) => {
     current.value = _.cloneDeep(data);
     visible.value = true;
 };