优化命名的不正确

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

@@ -69,7 +69,7 @@
     </el-card>
   </div>
 </template>
-  
+
 <script lang="ts">
 import api from '/@/api/ota';
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
@@ -98,7 +98,7 @@ interface TableDataState {
       pageSize: number;
       keyWord: string;
       dateRange: string[];
-      devOtaFirewareId: number;
+      devOtaFirmwareId: number;
     };
   };
 }
@@ -126,7 +126,7 @@ export default defineComponent({
           pageNum: 1,
           pageSize: 10,
           keyWord: '',
-          devOtaFirewareId: 0,
+          devOtaFirmwareId: 0,
         },
       },
     });
@@ -141,7 +141,7 @@ export default defineComponent({
     const getList = (pageNum?: number) => {
       typeof pageNum === 'number' && (state.tableData.param.pageNum = pageNum)
       state.tableData.loading = true;
-      state.tableData.param.devOtaFirewareId = props.detail.id;
+      state.tableData.param.devOtaFirmwareId = props.detail.id;
       api.batch
         .getList(state.tableData.param)
         .then((res: any) => {
@@ -208,53 +208,5 @@ export default defineComponent({
     };
   },
 });
-// import api from '/@/api/ota';
-// import { useSearch } from '/@/hooks/useCommon';
-// import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
-// // import CheckForm from '../check.vue';
-// import CheckForm from '/@/views/iot/ota-update/update/component/check.vue';
-//
-// import { ref } from 'vue';
-// import { useRouter } from 'vue-router';
-// const props = defineProps({
-// 	detail: {
-// 		type: Object,
-// 		default: () => { }
-// 	},
-// })
-// const queryRef = ref();
-// const router = useRouter();
-//
-// const checkFormRef = ref();
-//
-// const { params, tableData, getList, loading } = useSearch<any[]>(api.batch.getList, 'Data', { devOtaFirewareId: props.detail.id });
-//
-// getList();
-//
-// const CheckUpdate = async (row?: any) => {
-// 	if (row) {
-// 		checkFormRef.value.open(row);
-// 		return;
-// 	} else {
-// 		let array = {
-// 			productId: props.detail.productId,
-// 			devOtaFirewareId: props.detail.id
-// 		}
-// 		checkFormRef.value.open(array);
-// 	}
-// };
-//
-//
-// const del = (row: any) => {
-// 	ElMessageBox.confirm(`此操作将删除图形：“${row.name}”，是否继续?`, '提示', {
-// 		confirmButtonText: '确认',
-// 		cancelButtonText: '取消',
-// 		type: 'warning',
-// 	}).then(async () => {
-// 		await api.manage.del(row.id);
-// 		ElMessage.success('删除成功');
-// 		getList();
-// 	});
-// };
+
 </script>
-  

src/views/iot/ota-update/update/component/check.vue

@@ -68,7 +68,7 @@ interface RuleFormState {
   method: string;
   devices: string;
   stratege: string;
-  devOtaFirewareId: number;
+  devOtaFirmwareId: number;
   push: string;
 }
 interface UpdateState {
@@ -91,7 +91,7 @@ export default defineComponent({
 			method: '',
 			devices: '',
 			stratege: '',
-      devOtaFirewareId: 0,
+      devOtaFirmwareId: 0,
 			push: '',
 		},
 	  	productData: [],
@@ -109,7 +109,7 @@ export default defineComponent({
       resetForm();
       if (row) {
         // api.manage.detail(row.id).then((res: any) => {
-          state.ruleForm.devOtaFirewareId = row.id;
+          state.ruleForm.devOtaFirmwareId = row.id;
         // });
       }
       state.isShowDialog = true;
@@ -122,7 +122,7 @@ export default defineComponent({
           method: '',
           devices: '',
           stratege: '',
-          devOtaFirewareId: 0,
+          devOtaFirmwareId: 0,
           push: '',
       	};
     };
@@ -169,82 +169,4 @@ export default defineComponent({
   },
 });
 
-
-// import { ref, reactive, nextTick } from 'vue'
-// import api from '/@/api/ota'
-// import { ruleRequired } from '/@/utils/validator'
-// import { ElMessage } from 'element-plus'
-
-
-// const emit = defineEmits(['getList'])
-
-// const showDialog = ref(false)
-// const formRef = ref()
-
-// const productData = ref([
-// 	{
-// 		id: '',
-// 		name: '',
-// 	},
-// ])
-// const baseForm = {
-// 	id: undefined,
-// 	method: '1',
-// 	push: '1',
-// 	name: '',
-// 	devices: '',
-// 	stratege: '1',
-// 	waitVersion: '',
-// 	devOtaFirewareId: '',
-// 	productId:'',
-// }
-
-// const formData = reactive({
-// 	...baseForm,
-// })
-
-// const ruleForm = {
-// 	method: [ruleRequired('请选择批次类型')],
-// 	name: [ruleRequired('批次名称不能为空')],
-// 	productId: [ruleRequired('请选择所属产品')],
-// 	devices: [ruleRequired('请选择批次模块')],
-// 	stratege: [ruleRequired('批次版本号不能为空')],
-// 	waitVersion: [ruleRequired('升级后版本号不能为空')],
-// }
-
-
-// const onSubmit = async () => {
-// 	await formRef.value.validate()
-
-// 	const theApi = formData.id ? api.batch.edit : api.batch.add
-// 	await theApi(formData)
-// 	ElMessage.success('操作成功')
-// 	resetForm()
-// 	showDialog.value = false
-// 	emit('getList')
-// }
-
-// const getProductList = () => {
-// 	api.batch.getDeviceList({productId:formData.productId}).then((res: any) => {
-// 		let productDataList = res.device
-// 		productData.value = productDataList
-// 	})
-// }
-
-// const resetForm = async () => {
-// 	Object.assign(formData, { ...baseForm })
-// 	formRef.value && formRef.value.resetFields()
-// }
-
-// const open = async (row: any) => {
-// 	resetForm()
-// 	showDialog.value = true
-// 	nextTick(() => {
-// 		Object.assign(formData, { ...row })
-// 		getProductList()
-
-// 	})
-// }
-
-// defineExpose({ open })
-</script>
+</script>

src/views/iot/ota-update/update/component/device.vue

@@ -54,13 +54,12 @@
 
 	</el-card>
 </template>
-  
+
 <script lang="ts" setup>
 import api from '/@/api/ota';
 import { useSearch } from '/@/hooks/useCommon';
-import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
+import { ElMessageBox, ElMessage } from 'element-plus';
 import { ref } from 'vue';
-import { useRouter } from 'vue-router';
 const props = defineProps({
 	detail: {
 		type: Object,
@@ -70,7 +69,7 @@ const props = defineProps({
 const queryRef = ref();
 
 
-const { params, tableData, getList, loading } = useSearch<any[]>(api.device.getList, 'fireware', { devOtaFirewareId: props.detail.id });
+const { params, tableData, getList, loading } = useSearch<any[]>(api.device.getList, 'firmware', { devOtaFirmwareId: props.detail.id });
 
 getList();
 
@@ -87,4 +86,3 @@ const del = (row: any) => {
 	});
 };
 </script>
-  

src/views/iot/ota-update/update/index.vue

@@ -58,19 +58,19 @@
 						<el-button size="small" text type="primary" v-if="!scope.row.folderName" @click="toDetail(scope.row.id)">查看</el-button>
 						<el-button size="small" text type="warning" v-auth="'edit'" @click="onOpenEdit(scope.row)">编辑</el-button>
 						<el-button size="small" text type="success" v-auth="'check'" @click="onOpenCheck(scope.row)">验证</el-button>
-					
+
 						<el-button size="small" text type="info" v-auth="'del'" @click="onRowDel(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
 			<pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="getList" />
 			<EditConfig ref="editRef" @getList="getList(1)" />
-    
+
       <CheckConfig ref="checkRef" @getList="getList(1)" />
 		</el-card>
 	</div>
 </template>
-  
+
 <script lang="ts">
 import api from '/@/api/ota';
 import { toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance } from 'vue';
@@ -142,7 +142,7 @@ export default defineComponent({
       api.manage
         .getList(state.tableData.param)
         .then((res: any) => {
-          state.tableData.data = res.fireware;
+          state.tableData.data = res.firmware;
           state.tableData.total = res.Total;
         })
         .finally(() => (state.tableData.loading = false));
@@ -224,4 +224,3 @@ export default defineComponent({
   },
 });
 </script>
-