update:数据分析指标对比修改,数据查询传参修改

This commit is contained in:
2026-03-03 16:23:41 +08:00
parent 3c40064b6c
commit 13f226bd6a
2 changed files with 29 additions and 13 deletions

View File

@@ -439,16 +439,27 @@ const checkTableName = ref<any>('');
const getFileInfo = async (data: any, fileType: any) => { const getFileInfo = async (data: any, fileType: any) => {
const res: any = await getSimulationTaskFileApi({ const res: any = await getSimulationTaskFileApi({
taskId: '', // taskId: '',
uuid: data.uuid, // uuid: data.uuid,
fileBizType: fileType, // fileBizType: fileType,
fileName: '', // fileName: '',
startTime: '', // startTime: '',
endTime: '', // endTime: '',
// current: 1,
// size: 1000,
current: 1, current: 1,
size: 1000, size: 1000,
fileTypeDictValue: fileType,
fileTypeDictClass: 'ALL_FILE_TYPE',
dictTags: ['fileTypeDictClass', 'fileTypeDictValue'],
uuid: data.uuid,
// fileTypeDictValue: fileType,
}); });
{
}
if (res && res.code === 200) { if (res && res.code === 200) {
let list = []; let list = [];
if (res?.data?.data?.length) { if (res?.data?.data?.length) {
@@ -516,7 +527,10 @@ const getTaskPerformanceFun = async (data: any) => {
}); });
if (res && res.code === 200) { 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; return list;
} }

View File

@@ -1161,12 +1161,7 @@ const beforeUploadFun = async (file: any) => {
disciplineDictValue: '', disciplineDictValue: '',
fileTypeDictClass: 'ALL_FILE_TYPE', fileTypeDictClass: 'ALL_FILE_TYPE',
disciplineTypeDictClass: 'DISCIPLINE_TYPE', disciplineTypeDictClass: 'DISCIPLINE_TYPE',
dictTags: [ dictTags: ['fileTypeDictClass', 'fileTypeDictValue'],
'fileTypeDictClass',
'fileTypeDictValue',
'disciplineTypeDictClass',
'disciplineDictValue',
],
}; };
if (getdirNameFun() === '曲线结果') { if (getdirNameFun() === '曲线结果') {
@@ -1219,6 +1214,13 @@ const submitFun2 = async () => {
tableData.value[i].fileTypeDictValue = formData.fileType.join(','); tableData.value[i].fileTypeDictValue = formData.fileType.join(',');
tableData.value[i].disciplineDictValue = formData.discipline; 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]) { for (const key in tableData.value[i]) {
if (key != '_X_ROW_KEY' && key != 'unitsList') { if (key != '_X_ROW_KEY' && key != 'unitsList') {
paramData[key] = tableData.value[i][key]; paramData[key] = tableData.value[i][key];