From b843832990587a15a479c1bc21f47c667ce8a13e Mon Sep 17 00:00:00 2001 From: dongzhihuan Date: Fri, 23 Jan 2026 14:16:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E8=B4=9F=E8=BD=BD=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/workLoad/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/task/workLoad/index.vue b/src/views/task/workLoad/index.vue index 73500380..da9bfe2c 100644 --- a/src/views/task/workLoad/index.vue +++ b/src/views/task/workLoad/index.vue @@ -148,7 +148,7 @@ dayjs.extend(isoWeek); let Gantt: any = gantt; const ganttEvents = ref([]); -const colorList: string[] = ['#ffffff', '#d9ecff', '#c6e2ff', '#c6e2ff', '#79bbff', '#409eff']; // 格子颜色 +const colorList: string[] = ['#ffffff', '#e9f4ff', '#c6e2ff', '#acd3ff', '#79bbff', '#409eff']; // 格子颜色 const taskOriginData = ref([]); // 所有用户的任务数据 const loading = ref(false); // const workDaysRange = ref(0); From 682a50c7995e5b61673358589826daa0f1f51c49 Mon Sep 17 00:00:00 2001 From: lijing1 Date: Fri, 23 Jan 2026 14:38:11 +0800 Subject: [PATCH 2/3] update --- src/api/project/run.ts | 9 ++++++-- .../common/report/reportEdit/index.vue | 4 ++-- .../common/report/reportInputDialog.vue | 22 ++++++++++++------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/api/project/run.ts b/src/api/project/run.ts index 6f48e10f..35d5d316 100644 --- a/src/api/project/run.ts +++ b/src/api/project/run.ts @@ -235,9 +235,14 @@ export const editExperimentResultApi = (params: any) => { return post(`${PREFIX}run/editExperimentResult`, params); }; -// 算例下编辑报告 +// 保存算例编辑报告 export const editReportApi = (params: any) => { - return download(`${PREFIX}run/editReport`, params, params.fileName); + return post(`${PREFIX}run/editReport`, params); +}; + +// 保存并下载算例编辑报告 +export const editReportAndDownloadApi = (params: any) => { + return download(`${PREFIX}run/editReportAndDownload`, params, params.fileName); }; // 算例下编辑报告 diff --git a/src/components/common/report/reportEdit/index.vue b/src/components/common/report/reportEdit/index.vue index c6ca27d3..966314e1 100644 --- a/src/components/common/report/reportEdit/index.vue +++ b/src/components/common/report/reportEdit/index.vue @@ -58,7 +58,7 @@
-
+
@@ -310,7 +310,7 @@ const getFormatDataFun = () => { }); grid.children.forEach((unit: any) => { if (unit.type === 'form') { - unit.value.forEach((item: any) => { + unit.children.forEach((item: any) => { build.push({ type: 'text', key: item.key, diff --git a/src/components/common/report/reportInputDialog.vue b/src/components/common/report/reportInputDialog.vue index f97e6278..1d1919d6 100644 --- a/src/components/common/report/reportInputDialog.vue +++ b/src/components/common/report/reportInputDialog.vue @@ -1,7 +1,8 @@