diff --git a/src/views/task/execution/components/taskDetailPage/components/experimentResult.vue b/src/views/task/execution/components/taskDetailPage/components/experimentResult.vue index ded8287..6a4a749 100644 --- a/src/views/task/execution/components/taskDetailPage/components/experimentResult.vue +++ b/src/views/task/execution/components/taskDetailPage/components/experimentResult.vue @@ -61,11 +61,25 @@ + + - {{ item.originalName }} + + {{ item.originalName }} + @@ -74,7 +88,7 @@ - + + - + @@ -144,9 +159,10 @@ import { ElMessage, ElMessageBox } from 'element-plus'; import FilePreview from '@/components/common/filePreview/index.vue'; import { getFileBaseInfoApi } from '@/api/data/data'; import Dialog from '@/components/common/dialog/index.vue'; -import { downloadFileById, fileUploadAllocationTypeFun, formatFileSize } from '@/utils/file'; +import { downloadFileById, fileUploadAllocationIconFun, formatFileSize } from '@/utils/file'; import { useI18n } from 'vue-i18n'; import { updateTaskStatusApi } from '@/api/project/task'; +import { FILE_TYPE } from '@/utils/enum/file'; const env = import.meta.env; @@ -172,6 +188,12 @@ const baseFileTableRef = ref(); const tableParams = ref({ taskId: props.taskInfo.uuid, }); + +const formData = ref({ + files: [], + fileTypeDictValue: FILE_TYPE.TEST_DOCUMENT_FILE, + disciplineDictValue: '', +}); const uploadImgRef = ref(); const { t } = useI18n(); @@ -250,6 +272,10 @@ const actionList = ref([ } } } + + formData.value.files = []; + formData.value.fileTypeDictValue = FILE_TYPE.TEST_DOCUMENT_FILE; + formData.value.disciplineDictValue = ''; nextTick(() => { tableFormRef.value.setFormDataFun(resultInfo.value); }); @@ -330,6 +356,11 @@ const apiParams = ref([ 'addImageInfo', 'deleteFileIds', 'deleteImageId', + 'fileTypeDictValue', + 'disciplineDictValue', + 'fileTypeDictClass', + 'disciplineTypeDictClass', + 'dictTags', ]); const submitFun = async () => { @@ -337,9 +368,20 @@ const submitFun = async () => { if (valid) { const fromData = tableFormRef.value.getFormDataFun(); + fileList.value = formData.value.files; const files = fileList.value.concat(imageFileList.value); const obj: any = cloneDeep(fromData); + obj.fileTypeDictValue = formData.value.fileTypeDictValue || ''; + obj.disciplineDictValue = formData.value.disciplineDictValue || ''; + obj.fileTypeDictClass = 'ALL_FILE_TYPE'; + obj.disciplineTypeDictClass = 'DISCIPLINE_TYPE'; + obj.dictTags = [ + 'fileTypeDictClass', + 'fileTypeDictValue', + 'disciplineTypeDictClass', + 'disciplineDictValue', + ]; if (fileList.value.length) { if (obj?.id) { @@ -347,7 +389,8 @@ const submitFun = async () => { return { fileName: item.name, fileSize: item.size, - fileType: fileUploadAllocationTypeFun(item.name), + // fileType: fileUploadAllocationTypeFun(item.name), + fileType: formData.value.fileTypeDictValue, }; }); } else { @@ -355,7 +398,8 @@ const submitFun = async () => { return { fileName: item.name, fileSize: item.size, - fileType: fileUploadAllocationTypeFun(item.name), + // fileType: fileUploadAllocationTypeFun(item.name), + fileType: formData.value.fileTypeDictValue, }; }); } @@ -366,13 +410,15 @@ const submitFun = async () => { obj.addImageInfo = { fileName: imageFileList.value[0].name, fileSize: imageFileList.value[0].size, - fileType: fileUploadAllocationTypeFun(imageFileList.value[0].name), + // fileType: fileUploadAllocationTypeFun(imageFileList.value[0].name), + fileType: formData.value.fileTypeDictValue, }; } else { obj.imageFileInfo = { fileName: imageFileList.value[0].name, fileSize: imageFileList.value[0].size, - fileType: fileUploadAllocationTypeFun(imageFileList.value[0].name), + // fileType: fileUploadAllocationTypeFun(imageFileList.value[0].name), + fileType: formData.value.fileTypeDictValue, }; } } @@ -394,6 +440,7 @@ const submitFun = async () => { } } + console.log(obj, 'objobjobjobjobj'); const res: any = obj?.id ? await editExperimentResultApi(obj) : await batchAddExperimentResultApi(obj); @@ -605,4 +652,8 @@ onMounted(() => {}); } } } + +.mr5 { + margin-right: 5px; +}