From d1cbda51972d523d3ae1546e86d1830019345972 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 3 Jul 2025 19:12:45 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90IoT=20=E7=89=A9=E8=81=94?=
 =?UTF-8?q?=E7=BD=91=E3=80=91=E5=88=9D=E5=A7=8B=E5=8C=96=20IoT=20=E5=9B=BA?=
 =?UTF-8?q?=E4=BB=B6=E8=AF=A6=E6=83=85=E9=A1=B5=20100%=EF=BC=88=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AE=B0=E5=BD=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/ota/task/record/index.ts     |  7 +------
 src/views/iot/ota/task/OtaTaskDetail.vue | 15 ++++++++++++---
 src/views/iot/ota/task/OtaTaskList.vue   | 14 ++++++++------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/api/iot/ota/task/record/index.ts b/src/api/iot/ota/task/record/index.ts
index 447f0e76..aedc0b93 100644
--- a/src/api/iot/ota/task/record/index.ts
+++ b/src/api/iot/ota/task/record/index.ts
@@ -31,13 +31,8 @@ export const IoTOtaTaskRecordApi = {
     return await request.get({ url: `/iot/ota/task/record/page`, params })
   },
 
-  // 查询 OTA 任务记录详情
-  getOtaTaskRecord: async (id: number) => {
-    return await request.get({ url: `/iot/ota/task/record/get?id=` + id })
-  },
-
   // 取消 OTA 任务记录
   cancelOtaTaskRecord: async (id: number) => {
-    return await request.post({ url: `/iot/ota/task/record/cancel?id=` + id })
+    return await request.put({ url: `/iot/ota/task/record/cancel?id=` + id })
   }
 }
diff --git a/src/views/iot/ota/task/OtaTaskDetail.vue b/src/views/iot/ota/task/OtaTaskDetail.vue
index 2e19b39e..a70f618f 100644
--- a/src/views/iot/ota/task/OtaTaskDetail.vue
+++ b/src/views/iot/ota/task/OtaTaskDetail.vue
@@ -116,10 +116,17 @@
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button
-                v-if="scope.row.status === IoTOtaTaskRecordStatusEnum.UPGRADING.value"
+                v-if="
+                  [
+                    IoTOtaTaskRecordStatusEnum.PENDING.value,
+                    IoTOtaTaskRecordStatusEnum.PUSHED.value,
+                    IoTOtaTaskRecordStatusEnum.UPGRADING.value
+                  ].includes(scope.row.status)
+                "
                 link
                 type="danger"
                 @click="handleCancelUpgrade(scope.row)"
+                v-hasPermi="['iot:ota-task-record:cancel']"
               >
                 取消
               </el-button>
@@ -154,7 +161,6 @@ import { formatDate } from '@/utils/formatTime'
 defineOptions({ name: 'OtaTaskDetail' })
 
 const message = useMessage() // 消息弹窗
-
 const dialogVisible = ref(false) // 弹窗的是否展示
 
 const taskId = ref<number>() // 任务编号
@@ -242,6 +248,7 @@ const handleTabClick = (tab: TabsPaneContext) => {
 }
 
 /** 取消升级 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const handleCancelUpgrade = async (record: OtaTaskRecord) => {
   try {
     await message.confirm('确认要取消该设备的升级任务吗？')
@@ -250,7 +257,9 @@ const handleCancelUpgrade = async (record: OtaTaskRecord) => {
     // 刷新数据
     await getRecordList()
     await getStatistics()
-    // TODO @AI：需要 succes 不断刷新出去
+    await getTaskInfo()
+    // 通知父组件刷新数据
+    emit('success')
   } catch (error) {
     console.error('取消升级失败', error)
   }
diff --git a/src/views/iot/ota/task/OtaTaskList.vue b/src/views/iot/ota/task/OtaTaskList.vue
index 1d37713e..ee374829 100644
--- a/src/views/iot/ota/task/OtaTaskList.vue
+++ b/src/views/iot/ota/task/OtaTaskList.vue
@@ -91,7 +91,7 @@
     />
 
     <!-- 任务详情弹窗 -->
-    <OtaTaskDetail ref="taskDetailRef" />
+    <OtaTaskDetail ref="taskDetailRef" @success="refresh" />
   </ContentWrap>
 </template>
 
@@ -169,18 +169,20 @@ const handleCancelTask = async (id: number) => {
     await IoTOtaTaskApi.cancelOtaTask(id)
     message.success('取消成功')
     // 刷新数据
-    await getTaskList()
-    emit('success')
+    await refresh()
   } catch (error) {
     console.error('取消任务失败', error)
   }
 }
 
+/** 刷新数据 */
+const refresh = async () => {
+  await getTaskList()
+  emit('success')
+}
+
 /** 初始化 */
 onMounted(() => {
   getTaskList()
 })
-
-/** 暴露方法供父组件调用 */
-defineExpose({ getTaskList })
 </script>