Front_Team/SPDM
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
lijing1
2026-02-26 09:32:12 +08:00
parent 36a1b7cc8a 879de20679
commit 9fe208de14
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/data/analysis/components/analysisDataDialog.vue
View File

@@ -43,13 +43,13 @@
>
<template #achieveStatus="{ row }">
<StatusDot
:status="statusMapFun5(row.achieveStatus)"
:status="getTaskAchieveStyleClass(row.achieveStatus)"
:title="RESULT_ACHIEVE_STATUS.O[row.achieveStatus]"
/>
</template>
<template #exeStatus="{ row }">
<StatusDot
:status="statusMapFun6(row.exeStatus)"
:status="getTaskExeStyleClass(row.exeStatus)"
:title="TASK_ACHIEVE_STATUS.O[row.exeStatus]"
/>
</template>
@@ -141,11 +141,14 @@ import curveResult from './curveResult.vue';
import reportComparison from './reportComparison.vue';
import dayjs from 'dayjs';
import { ElMessage } from 'element-plus';
import { getAllRunResultByTaskIdApi } from '@/api/project/analysis';
// import { getAllRunResultByTaskIdApi } from '@/api/project/analysis';
import { getSimulationTaskFileApi } from '@/api/data/dataAnalysis';
import { getRunPerformanceApi, getTaskPerformanceApi } from '@/api/task/taskpool';
import { exportToPdf } from '@/utils/exportPdf';
import { statusMapFun5, statusMapFun6 } from '@/components/common/statusDot/statusMap';
import {
getTaskAchieveStyleClass,
getTaskExeStyleClass,
} from '@/components/common/statusDot/statusMap';
import { useDict } from '@/utils/useDict';
import StatusDot from '@/components/common/statusDot/index.vue';
import { FILE_TYPE } from '@/utils/enum/file';
@@ -241,7 +244,11 @@ const getConvertData = async (flag: any, type: any) => {
if (type === '仿真任务' || type === '仿真算例') {
if (type === '仿真任务') {
for (let i = 0; i < tasklist.length; i++) {
const datas = await getSimulationTaskFileFun(tasklist[i], 'task', FILE_TYPE.MODEL_3D_FILE);
const datas = await getSimulationTaskFileFun(
tasklist[i],
'task',
FILE_TYPE.MODEL_3D_FILE
);
modelData.value = modelData.value.concat(datas);
}
} else {

9
src/views/data/analysis/index.vue
View File

@@ -67,13 +67,13 @@
</template>
<template #achieveStatus="{ row }">
<StatusDot
:status="statusMapFun5(row.achieveStatus)"
:status="getTaskAchieveStyleClass(row.achieveStatus)"
:title="RESULT_ACHIEVE_STATUS.O[row.achieveStatus]"
/>
</template>
<template #exeStatus="{ row }">
<StatusDot
:status="statusMapFun6(row.exeStatus)"
:status="getTaskExeStyleClass(row.exeStatus)"
:title="TASK_ACHIEVE_STATUS.O[row.exeStatus]"
/>
</template>
@@ -318,7 +318,10 @@ import { useDict } from '@/utils/useDict';
import editPerformancePage from '@/components/taskDetail/editPerformancePage.vue';
import { editPerformanceApi } from '@/api/task/taskPerformance';
import StatusDot from '@/components/common/statusDot/index.vue';
import { statusMapFun5, statusMapFun6 } from '@/components/common/statusDot/statusMap';
import {
getTaskAchieveStyleClass,
getTaskExeStyleClass,
} from '@/components/common/statusDot/statusMap';
import AnalysisDia from './components/analysisDia.vue';
import PedigreeDialog from './components/pedigree/pedigreeDialog.vue';
import { downloadFileById } from '@/utils/file';