From 4821d490179a15ecad3668efb676dccfebd956e4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 19 May 2026 11:27:35 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=88iot=EF=BC=89=EF=BC=9A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20ota=20=E7=9A=84=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=88v2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/iot/ota/firmware/data.ts        | 21 +++++++++-
 .../views/iot/ota/firmware/detail/index.vue   | 38 +++----------------
 .../src/views/iot/ota/firmware/index.vue      |  3 +-
 .../modules/form.vue}                         |  4 +-
 .../views/iot/ota/{modules => }/task/data.ts  |  1 -
 .../{modules/task => task/modules}/detail.vue | 12 ++++--
 .../{modules/task => task/modules}/form.vue   |  2 +-
 .../{modules/task => task/modules}/list.vue   |  6 ++-
 .../{ => task}/modules/upgrade-statistics.vue |  2 +
 9 files changed, 45 insertions(+), 44 deletions(-)
 rename apps/web-antd/src/views/iot/ota/{modules/firmware-form.vue => firmware/modules/form.vue} (93%)
 rename apps/web-antd/src/views/iot/ota/{modules => }/task/data.ts (97%)
 rename apps/web-antd/src/views/iot/ota/{modules/task => task/modules}/detail.vue (91%)
 rename apps/web-antd/src/views/iot/ota/{modules/task => task/modules}/form.vue (98%)
 rename apps/web-antd/src/views/iot/ota/{modules/task => task/modules}/list.vue (91%)
 rename apps/web-antd/src/views/iot/ota/{ => task}/modules/upgrade-statistics.vue (93%)

diff --git a/apps/web-antd/src/views/iot/ota/firmware/data.ts b/apps/web-antd/src/views/iot/ota/firmware/data.ts
index 5424ff39d..befa885b3 100644
--- a/apps/web-antd/src/views/iot/ota/firmware/data.ts
+++ b/apps/web-antd/src/views/iot/ota/firmware/data.ts
@@ -1,9 +1,27 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { DescriptionItemSchema } from '#/components/description';
+
+import { formatDateTime } from '@vben/utils';
 
 import { getSimpleProductList } from '#/api/iot/product/product';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 固件详情的描述字段 */
+export function useDetailSchema(): DescriptionItemSchema[] {
+  return [
+    { field: 'name', label: '固件名称' },
+    { field: 'productName', label: '所属产品' },
+    { field: 'version', label: '固件版本' },
+    {
+      field: 'createTime',
+      label: '创建时间',
+      render: (val) => (val ? (formatDateTime(val) as string) : '-'),
+    },
+    { field: 'description', label: '固件描述', span: 2 },
+  ];
+}
+
 /** 新增/修改固件的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -129,7 +147,8 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       title: '固件描述',
       minWidth: 200,
     },
-    // TODO @AI：你看看 vue3 + ep 是这么干的么？
+    // TODO DONE @AI：vben 用 row.productName（后端 VO 已返回）；vue3 + ep 用 getProductName(productId) 本地查表；vben 更直接，且 IoTOtaFirmwareApi.Firmware.productName 已是 API 契约
+    // TODO @AI：实际后端没读取哈。看看怎么对齐下 vue3 + ep
     {
       field: 'productName',
       title: '所属产品',
diff --git a/apps/web-antd/src/views/iot/ota/firmware/detail/index.vue b/apps/web-antd/src/views/iot/ota/firmware/detail/index.vue
index a675e6d87..0fc0b789a 100644
--- a/apps/web-antd/src/views/iot/ota/firmware/detail/index.vue
+++ b/apps/web-antd/src/views/iot/ota/firmware/detail/index.vue
@@ -4,17 +4,13 @@ import type { IoTOtaFirmwareApi } from '#/api/iot/ota/firmware';
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
-import { formatDate } from '@vben/utils';
-
-import { Card, Descriptions } from 'ant-design-vue';
-
 import { getOtaFirmware } from '#/api/iot/ota/firmware';
 import { getOtaTaskRecordStatusStatistics } from '#/api/iot/ota/task/record';
 
-import OtaTaskList from '../../modules/task/list.vue';
-import UpgradeStatistics from '../../modules/upgrade-statistics.vue';
+import OtaTaskList from '../../task/modules/list.vue';
+import UpgradeStatistics from '../../task/modules/upgrade-statistics.vue';
+import FirmwareInfo from './modules/info.vue';
 
-/** IoT OTA 固件详情 */
 const route = useRoute();
 
 const firmwareId = ref(Number(route.params.id));
@@ -56,34 +52,10 @@ onMounted(() => {
 <template>
   <div class="p-4">
     <!-- 固件信息 -->
-    <!-- TODO @AI：是不是搞成 data.ts 那种方式 -->
-    <!-- TODO @AI：拆成一个独立的组件？ -->
-    <Card title="固件信息" class="mb-5" :loading="firmwareLoading">
-      <Descriptions :column="3" bordered>
-        <Descriptions.Item label="固件名称">
-          {{ firmware?.name }}
-        </Descriptions.Item>
-        <Descriptions.Item label="所属产品">
-          {{ firmware?.productName }}
-        </Descriptions.Item>
-        <Descriptions.Item label="固件版本">
-          {{ firmware?.version }}
-        </Descriptions.Item>
-        <Descriptions.Item label="创建时间">
-          {{
-            firmware?.createTime
-              ? formatDate(firmware.createTime, 'YYYY-MM-DD HH:mm:ss')
-              : '-'
-          }}
-        </Descriptions.Item>
-        <Descriptions.Item label="固件描述" :span="2">
-          {{ firmware?.description }}
-        </Descriptions.Item>
-      </Descriptions>
-    </Card>
+    <FirmwareInfo :firmware="firmware" :loading="firmwareLoading" />
 
     <!-- 升级设备统计 -->
-    <!-- TODO @AI：是不是搞个 detail/modules/upgrade-statistics；挪个目录？ -->
+    <!-- TODO @AI：需要和上面的 FirmwareInfo 有间隙 -->
     <UpgradeStatistics
       :loading="firmwareStatisticsLoading"
       :statistics="firmwareStatistics"
diff --git a/apps/web-antd/src/views/iot/ota/firmware/index.vue b/apps/web-antd/src/views/iot/ota/firmware/index.vue
index 6a5484dfa..6d0d6789b 100644
--- a/apps/web-antd/src/views/iot/ota/firmware/index.vue
+++ b/apps/web-antd/src/views/iot/ota/firmware/index.vue
@@ -13,7 +13,7 @@ import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteOtaFirmware, getOtaFirmwarePage } from '#/api/iot/ota/firmware';
 import { $t } from '#/locales';
 
-import OtaFirmwareForm from '../modules/firmware-form.vue';
+import OtaFirmwareForm from './modules/form.vue';
 import { useGridColumns, useGridFormSchema } from './data';
 
 const { push } = useRouter();
@@ -110,7 +110,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
       </template>
       <!-- 固件文件列 -->
       <template #fileUrl="{ row }">
-        <!-- TODO @AI：使用 TableAction 按钮？ -->
         <div
           v-if="row.fileUrl"
           class="inline-flex items-center gap-1.5 align-middle leading-none"
diff --git a/apps/web-antd/src/views/iot/ota/modules/firmware-form.vue b/apps/web-antd/src/views/iot/ota/firmware/modules/form.vue
similarity index 93%
rename from apps/web-antd/src/views/iot/ota/modules/firmware-form.vue
rename to apps/web-antd/src/views/iot/ota/firmware/modules/form.vue
index 2a532e794..2b1bb6fb6 100644
--- a/apps/web-antd/src/views/iot/ota/modules/firmware-form.vue
+++ b/apps/web-antd/src/views/iot/ota/firmware/modules/form.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-// TODO @AI：是不是要挪到 firmware/modules/form.vue？
+// TODO DONE @AI：已挪到 firmware/modules/form.vue，对齐 alert/config/modules/form.vue 风格
 import type { IoTOtaFirmwareApi } from '#/api/iot/ota/firmware';
 
 import { computed, ref } from 'vue';
@@ -16,7 +16,7 @@ import {
 } from '#/api/iot/ota/firmware';
 import { $t } from '#/locales';
 
-import { useFormSchema } from '../firmware/data';
+import { useFormSchema } from '../data';
 
 defineOptions({ name: 'IoTOtaFirmwareForm' });
 
diff --git a/apps/web-antd/src/views/iot/ota/modules/task/data.ts b/apps/web-antd/src/views/iot/ota/task/data.ts
similarity index 97%
rename from apps/web-antd/src/views/iot/ota/modules/task/data.ts
rename to apps/web-antd/src/views/iot/ota/task/data.ts
index 0bedac317..3d477604e 100644
--- a/apps/web-antd/src/views/iot/ota/modules/task/data.ts
+++ b/apps/web-antd/src/views/iot/ota/task/data.ts
@@ -1,4 +1,3 @@
-// TODO @AI：将 task 整个挪出去？放到 /Users/yunai/Java/yudao-all-in-vben/yudao-ui-admin-vben/apps/web-antd/src/views/iot/ota/task；
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
diff --git a/apps/web-antd/src/views/iot/ota/modules/task/detail.vue b/apps/web-antd/src/views/iot/ota/task/modules/detail.vue
similarity index 91%
rename from apps/web-antd/src/views/iot/ota/modules/task/detail.vue
rename to apps/web-antd/src/views/iot/ota/task/modules/detail.vue
index 48ccc14cc..c8485aaa6 100644
--- a/apps/web-antd/src/views/iot/ota/modules/task/detail.vue
+++ b/apps/web-antd/src/views/iot/ota/task/modules/detail.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+// TODO @AI：是不是拆分下，task 里面在新建一个 record/modules 里；这样固件、任务、记录，都拆开了，也看起来更清晰。
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { IoTOtaTaskApi } from '#/api/iot/ota/task';
 import type { IoTOtaTaskRecordApi } from '#/api/iot/ota/task/record';
@@ -21,8 +22,8 @@ import {
 } from '#/api/iot/ota/task/record';
 import { IoTOtaTaskRecordStatusEnum } from '#/views/iot/utils/constants';
 
-import UpgradeStatistics from '../upgrade-statistics.vue';
-import { useRecordGridColumns } from './data';
+import { useRecordGridColumns } from '../data';
+import UpgradeStatistics from './upgrade-statistics.vue';
 
 /** OTA 任务详情组件 */
 defineOptions({ name: 'IoTOtaTaskDetail' });
@@ -146,8 +147,10 @@ const [Modal, modalApi] = useVbenModal({
 
 <template>
   <Modal title="升级任务详情" class="w-5/6" :show-cancel-button="false" :show-confirm-button="false">
+    <!-- TODO @AI：是不是不用 p-4 外面的？ -->
     <div class="p-4">
       <!-- 任务信息 -->
+      <!-- TODO @AI：需要抽成一个小 vue 组件。也使用 description 组件； -->
       <Card title="任务信息" class="mb-5" :loading="taskLoading">
         <Descriptions :column="3" bordered>
           <Descriptions.Item label="任务编号">{{ task.id }}</Descriptions.Item>
@@ -178,12 +181,15 @@ const [Modal, modalApi] = useVbenModal({
       </Card>
 
       <!-- 任务升级设备统计 -->
+      <!-- TODO @AI：和上面有间隙 -->
       <UpgradeStatistics
         :loading="taskStatisticsLoading"
         :statistics="taskStatistics"
       />
 
       <!-- 设备管理 -->
+      <!-- TODO @AI：需要抽成一个小 vue 组件。 -->
+      <!-- TODO @AI：和上面有间隙 -->
       <Card title="升级设备记录">
         <Tabs
           v-model:active-key="activeTab"
@@ -209,7 +215,7 @@ const [Modal, modalApi] = useVbenModal({
                     IoTOtaTaskRecordStatusEnum.PENDING.value,
                     IoTOtaTaskRecordStatusEnum.PUSHED.value,
                     IoTOtaTaskRecordStatusEnum.UPGRADING.value,
-                  ].includes(row.status),
+                  ].includes(row.status!),
                   popConfirm: {
                     title: '确认要取消该设备的升级任务吗？',
                     confirm: handleCancelUpgrade.bind(null, row),
diff --git a/apps/web-antd/src/views/iot/ota/modules/task/form.vue b/apps/web-antd/src/views/iot/ota/task/modules/form.vue
similarity index 98%
rename from apps/web-antd/src/views/iot/ota/modules/task/form.vue
rename to apps/web-antd/src/views/iot/ota/task/modules/form.vue
index 2bcbc4869..532cca453 100644
--- a/apps/web-antd/src/views/iot/ota/modules/task/form.vue
+++ b/apps/web-antd/src/views/iot/ota/task/modules/form.vue
@@ -10,7 +10,7 @@ import { getDeviceListByProductId } from '#/api/iot/device/device';
 import { createOtaTask } from '#/api/iot/ota/task';
 import { $t } from '#/locales';
 
-import { useFormSchema } from './data';
+import { useFormSchema } from '../data';
 
 /** IoT OTA 升级任务表单 */
 defineOptions({ name: 'IoTOtaTaskForm' });
diff --git a/apps/web-antd/src/views/iot/ota/modules/task/list.vue b/apps/web-antd/src/views/iot/ota/task/modules/list.vue
similarity index 91%
rename from apps/web-antd/src/views/iot/ota/modules/task/list.vue
rename to apps/web-antd/src/views/iot/ota/task/modules/list.vue
index fb7eea0fe..e45a5ab9a 100644
--- a/apps/web-antd/src/views/iot/ota/modules/task/list.vue
+++ b/apps/web-antd/src/views/iot/ota/task/modules/list.vue
@@ -11,10 +11,11 @@ import { cancelOtaTask, getOtaTaskPage } from '#/api/iot/ota/task';
 import { IoTOtaTaskStatusEnum } from '#/views/iot/utils/constants';
 
 import OtaTaskDetail from './detail.vue';
-import { useGridColumns, useGridFormSchema } from './data';
 import OtaTaskForm from './form.vue';
+import { useGridColumns, useGridFormSchema } from '../data';
 
 /** IoT OTA 任务列表 */
+// TODO @AI：defineOptions 还需要么？
 defineOptions({ name: 'IoTOtaTaskList' });
 
 const props = defineProps<{
@@ -92,9 +93,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
 </script>
 
 <template>
+  <!-- TODO @AI：是不是要有个高度？ -->
   <div>
     <FormModal @success="handleRefresh" />
     <DetailModal @success="handleRefresh" />
+
+    <!-- TODO @AI：上面有个【任务名称】，有没可能包在一起，不然太丑了。/Users/yunai/Downloads/iShot_2026-05-19_11.26.04.png -->
     <Grid table-title="升级任务管理">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/iot/ota/modules/upgrade-statistics.vue b/apps/web-antd/src/views/iot/ota/task/modules/upgrade-statistics.vue
similarity index 93%
rename from apps/web-antd/src/views/iot/ota/modules/upgrade-statistics.vue
rename to apps/web-antd/src/views/iot/ota/task/modules/upgrade-statistics.vue
index f1b898a01..9917da0a4 100644
--- a/apps/web-antd/src/views/iot/ota/modules/upgrade-statistics.vue
+++ b/apps/web-antd/src/views/iot/ota/task/modules/upgrade-statistics.vue
@@ -6,6 +6,7 @@ import { Card, Col, Row } from 'ant-design-vue';
 import { IoTOtaTaskRecordStatusEnum } from '#/views/iot/utils/constants';
 
 /** OTA 升级设备统计卡片 */
+// TODO @AI：是不是去掉 defineOptions
 defineOptions({ name: 'IoTOtaUpgradeStatistics' });
 
 const props = defineProps<{
@@ -24,6 +25,7 @@ const items = computed(() => [
       0,
     ),
   },
+  // TODO @AI：label 名字，是不是通过字典获取名字？包括 vue3 + ep 也是；
   {
     label: '待推送',
     span: 3,