diff --git a/frontend/src/components/ImportExcel/index.vue b/frontend/src/components/ImportExcel/index.vue index ab1a1d1..2ed414e 100644 --- a/frontend/src/components/ImportExcel/index.vue +++ b/frontend/src/components/ImportExcel/index.vue @@ -82,7 +82,6 @@ const downloadTemp = () => { // 文件上传 const uploadExcel = async (param: UploadRequestOptions) => { - debugger let excelFormData = new FormData(); excelFormData.append("file", param.file); isCover.value && excelFormData.append("isCover", isCover.value as unknown as Blob); diff --git a/frontend/src/views/machine/testSource/components/parameterTable.vue b/frontend/src/views/machine/testSource/components/parameterTable.vue index 6c05f74..21ce3f7 100644 --- a/frontend/src/views/machine/testSource/components/parameterTable.vue +++ b/frontend/src/views/machine/testSource/components/parameterTable.vue @@ -177,31 +177,31 @@ const copyRow = (row) => { let parentIds = originalParameterArr.map(item => item.pId) if (parentIds.includes(row.id)) { - let newParameterId = generateUUID() + let newParameterId = generateUUID().replaceAll("-","") let children = originalParameterArr.filter(item => item.pId == row.id).map(item => ({ ...item, - id: generateUUID(), + id: generateUUID().replaceAll("-",""), pId: newParameterId })) originalParameterArr.push({...row, id: newParameterId}) originalParameterArr.push(...children) } else { - originalParameterArr.push({...row, id: generateUUID(), pId: row.pId}) + originalParameterArr.push({...row, id: generateUUID().replaceAll("-",""), pId: row.pId}) } emit('change-parameter', originalParameterArr) tableData.value = getTreeData(originalParameterArr) } const getParameter = (data: TestSource.ParameterType) => { - if (originalParameterArr.some(item => item.type == data.type)) { - ElMessage.error({message: '参数类型已存在!'}) - return; - } + // if (originalParameterArr.some(item => item.type == data.type)) { + // ElMessage.error({message: '参数类型已存在!'}) + // return; + // } let index = originalParameterArr.findIndex(item => item.id === data.id) if (index === -1) { - data.id = generateUUID() + data.id = generateUUID().replaceAll("-","") // 新增 originalParameterArr.push(data) ElMessage.success({message: '新增成功!'})