Browse Source

fix: 优化 ota 升级的编辑操作

yanglzh 7 months ago
parent
commit
f63f448c99

+ 7 - 6
src/api/ota/index.ts

@@ -3,31 +3,32 @@ import { get, post, del, put } from '/@/utils/request';
 export default {
   manage: {
     getList: (data: any) => get('/operate/ota_firmware/list', data),
-    del: (ids: number) => del('/operate/ota_firmware/delete', {ids}),
+    del: (ids: number) => del('/operate/ota_firmware/delete', { ids }),
     add: (data: any) => post('/operate/ota_firmware/add', data),
     edit: (data: any) => put('/operate/ota_firmware/edit', data),
-    detail: (id: number) => get('/operate/ota_firmware/get', {id}),
+    detail: (id: number) => get('/operate/ota_firmware/get', { id }),
 
   },
   module: {
     getSubList: () => get('/product/list'),
     getList: (data: any) => get('/operate/ota_module/list', data),
-    del: (ids: number[]) => del('/operate/ota_module/delete', {ids}),
+    del: (ids: number[]) => del('/operate/ota_module/delete', { ids }),
     add: (data: any) => post('/operate/ota_module/add', data),
     edit: (data: any) => put('/operate/ota_module/edit', data),
-    detail: (id: number) => get('/operate/ota_module/get', {id}),
+    detail: (id: number) => get('/operate/ota_module/get', { id }),
   },
   batch: {
     getList: (data: any) => get('/operate/ota_strategy/list', data),
     getDeviceList: (data: any) => get('/product/device/list', data),
-    del: (ids: number) => del('/operate/ota_strategy/delete', {ids}),
+    del: (ids: number) => del('/operate/ota_strategy/delete', { ids }),
     add: (data: any) => post('/operate/ota_strategy/add', data),
     edit: (data: any) => put('/operate/ota_strategy/edit', data),
     distribute: (data: any) => post('/operate/ota_strategy/distribute', data)
   },
   device: {
     getList: (data: any) => get('/operate/ota_detail/list', data),
-    del: (ids: number) => del('/operate/ota_detail/delete', {ids}),
+    getInfoByStrategyId: (strategyId: string) => get('/operate/ota_detail/getInfoByStrategyId', { strategyId }),
+    del: (ids: number) => del('/operate/ota_detail/delete', { ids }),
     add: (data: any) => post('/operate/ota_detail/add', data),
     edit: (data: any) => post('/operate/ota_detail/edit', data),
   }

+ 1 - 1
src/views/iot/ota-update/update/component/batch.vue

@@ -67,7 +67,7 @@
       <el-table-column label="操作" width="120" align="center">
         <template #default="scope">
           <el-button size="small" text type="primary" @click="getDeviceList(scope.row)">查看</el-button>
-          <!-- <el-button size="small" text type="warning" :disabled="!scope.row.isOperation" @click="edit(scope.row)">编辑</el-button> -->
+          <el-button size="small" text type="warning" :disabled="!scope.row.isOperation" @click="edit(scope.row)">编辑</el-button>
           <el-button size="small" text type="danger" :disabled="!scope.row.isOperation" @click="onRowDel(scope.row)">删除</el-button>
         </template>
       </el-table-column>

+ 6 - 2
src/views/iot/ota-update/update/component/check.vue

@@ -171,10 +171,14 @@ export default defineComponent({
         state.ruleForm.waitVersion = editData.waitVersion;
         state.ruleForm.method = editData.method;
         state.ruleForm.stratege = editData.stratege;
-        state.ruleForm.devOtaFirmwareId = editData.devOtaFirmwareId;
         state.ruleForm.push = editData.push;
         state.ruleForm.types = editData.types;
-        state.ruleForm.productKey = editData.productKey;
+
+        api.device.getInfoByStrategyId(editData.id).then((res: any) => {
+          state.ruleForm.devices = res.map((item: any) => item.deviceKey);
+          state.deviceNameList = res.map((item: any) => item.deviceName);
+          state.deviceNameShow = true;
+        });
       }
       // 升级包状态是已验证才能选择升级类型,否则不可以
       // 如果升级包是不需要验证类型的,则可以选择升级类型