diff --git a/src/views/data/analysis/components/analysisDataDialog.vue b/src/views/data/analysis/components/analysisDataDialog.vue index b3234d33..ed88d101 100644 --- a/src/views/data/analysis/components/analysisDataDialog.vue +++ b/src/views/data/analysis/components/analysisDataDialog.vue @@ -439,16 +439,27 @@ const checkTableName = ref(''); const getFileInfo = async (data: any, fileType: any) => { const res: any = await getSimulationTaskFileApi({ - taskId: '', - uuid: data.uuid, - fileBizType: fileType, - fileName: '', - startTime: '', - endTime: '', + // taskId: '', + // uuid: data.uuid, + // fileBizType: fileType, + // fileName: '', + // startTime: '', + // endTime: '', + // current: 1, + // size: 1000, + current: 1, size: 1000, + fileTypeDictValue: fileType, + fileTypeDictClass: 'ALL_FILE_TYPE', + dictTags: ['fileTypeDictClass', 'fileTypeDictValue'], + uuid: data.uuid, + // fileTypeDictValue: fileType, }); + { + } + if (res && res.code === 200) { let list = []; if (res?.data?.data?.length) { @@ -516,7 +527,10 @@ const getTaskPerformanceFun = async (data: any) => { }); if (res && res.code === 200) { - const list = res.data; + // const list = res.data; + const list = res.data.map((item: any) => { + return { ...item, taskName: data.taskName }; + }); return list; } diff --git a/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue b/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue index f71e7641..31762935 100644 --- a/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue +++ b/src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue @@ -1161,12 +1161,7 @@ const beforeUploadFun = async (file: any) => { disciplineDictValue: '', fileTypeDictClass: 'ALL_FILE_TYPE', disciplineTypeDictClass: 'DISCIPLINE_TYPE', - dictTags: [ - 'fileTypeDictClass', - 'fileTypeDictValue', - 'disciplineTypeDictClass', - 'disciplineDictValue', - ], + dictTags: ['fileTypeDictClass', 'fileTypeDictValue'], }; if (getdirNameFun() === '曲线结果') { @@ -1219,6 +1214,13 @@ const submitFun2 = async () => { tableData.value[i].fileTypeDictValue = formData.fileType.join(','); tableData.value[i].disciplineDictValue = formData.discipline; + if (tableData.value[i].disciplineDictValue) { + tableData.value[i].dictTags.push('disciplineTypeDictClass'); + tableData.value[i].dictTags.push('disciplineDictValue'); + } + + tableData.value[i].dictTags = tableData.value[i].dictTags.join(','); + for (const key in tableData.value[i]) { if (key != '_X_ROW_KEY' && key != 'unitsList') { paramData[key] = tableData.value[i][key];