diff --git a/package.json b/package.json index fb4f8cba..a9623a75 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,8 @@ "dayjs": "^1.11.18", "echarts": "^6.0.0", "element-plus": "^2.10.7", + "html2canvas": "^1.4.1", + "jspdf": "^3.0.3", "lodash": "^4.17.21", "moment": "^2.30.1", "pinia": "^3.0.3", diff --git a/src/utils/file.ts b/src/utils/file.ts index e1e7a0a5..da4b59e6 100644 --- a/src/utils/file.ts +++ b/src/utils/file.ts @@ -22,8 +22,8 @@ export const formatFileSize = (sizeInBytes: number): string => { return `${size.toFixed(2)} ${units[unitIndex]}`; }; -export const openTabReviewFile = async(fileId: number) => { - const res:any = await getKKFileViewURLFromMinioApi({ fileId }); +export const openTabReviewFile = async (fileId: number) => { + const res: any = await getKKFileViewURLFromMinioApi({ fileId }); if (res.code === 200) { window.open(env.VITE_API_FILE_PREVIEW_URL + '?' + res.data.encodeKKFileViewURL, '_blank'); // return res.data.encodeKKFileViewURL; diff --git a/src/views/data/analysis/components/analysisDataDialog.vue b/src/views/data/analysis/components/analysisDataDialog.vue index 584393c4..f50d41f3 100644 --- a/src/views/data/analysis/components/analysisDataDialog.vue +++ b/src/views/data/analysis/components/analysisDataDialog.vue @@ -1,11 +1,11 @@ + + diff --git a/src/views/data/analysis/index.vue b/src/views/data/analysis/index.vue index 9ff1548c..8c79671e 100644 --- a/src/views/data/analysis/index.vue +++ b/src/views/data/analysis/index.vue @@ -627,13 +627,13 @@ const closePngFun = () => { diaPngVisible.value = false; }; -const displayComparePngFun = () => { - if (!compareList.value.length) { - ElMessage.warning('请先加入对比池'); - return; - } - diaPngVisible.value = true; -}; +// const displayComparePngFun = () => { +// if (!compareList.value.length) { +// ElMessage.warning('请先加入对比池'); +// return; +// } +// diaPngVisible.value = true; +// }; const renderPngFun = (data: any, render: (cbData: any) => void) => { render(compareList.value.map((item:any) => { return { @@ -679,25 +679,34 @@ const compareFn = (flag:any) => { openDataAnalysisFn( flag, 'SIMULATION_TASK_ANALYSIS'); } if (flag === '仿真算例') { + openDataAnalysisFn( flag, 'SIMULATION_RUN_ANALYSIS'); } if (flag === '数据指标') { + openDataAnalysisFn( flag, 'SIMULATION_PERFORMANCE_ANALYSIS'); } if (flag === '模型文件') { + openDataAnalysisFn( flag, 'RESULT_MODEL'); } if (flag === '仿真报告') { + openDataAnalysisFn( flag, 'RESULT_REPORT'); } if (flag === '计算文件') { + openDataAnalysisFn( flag, 'RESULT_FILE'); } if (flag === '结果曲线') { - displayCompareFun(); + openDataAnalysisFn( flag, 'RESULT_CURVE'); + + // displayCompareFun(); } if (flag === '结果云图') { - displayComparePngFun(); + openDataAnalysisFn( flag, 'RESULT_PNG'); + + // displayComparePngFun(); } };