diff --git a/src/views/data/analysis/components/analysisDataDialog.vue b/src/views/data/analysis/components/analysisDataDialog.vue index 83e9ab98..c3949607 100644 --- a/src/views/data/analysis/components/analysisDataDialog.vue +++ b/src/views/data/analysis/components/analysisDataDialog.vue @@ -43,13 +43,13 @@ > @@ -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 { diff --git a/src/views/data/analysis/index.vue b/src/views/data/analysis/index.vue index 8eed0725..28f588a3 100644 --- a/src/views/data/analysis/index.vue +++ b/src/views/data/analysis/index.vue @@ -67,13 +67,13 @@ @@ -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';