From 9f6ec705aca4f181e2bf4d0335f93dad1a412300 Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Fri, 6 Mar 2026 16:04:00 +0800
Subject: [PATCH 01/15] =?UTF-8?q?update=20=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=9C=8B=E6=9D=BF=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=BB=9F=E8=AE=A1=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/systemLog.ts                   |   5 +
 src/utils/i18n/en.ts                          |   1 +
 src/utils/i18n/zh.ts                          |   1 +
 .../dashboard/components/dataStatistics.vue   |   6 +
 .../dataStatistics/fileOperateChart.vue       | 114 ++++++++++++++++++
 .../components/dataStatistics/settingDia.vue  |   1 +
 6 files changed, 128 insertions(+)
 create mode 100644 src/views/task/dashboard/components/dataStatistics/fileOperateChart.vue

diff --git a/src/api/system/systemLog.ts b/src/api/system/systemLog.ts
index 4d0f7a1d..b3a5ca32 100644
--- a/src/api/system/systemLog.ts
+++ b/src/api/system/systemLog.ts
@@ -16,3 +16,8 @@ export const getHourlyOnlineStatisticsApi = (params: any) => {
 export const getUserLoginStatisticsApi = (params: any) => {
   return post(`${PREFIX}systemLog/getUserLoginStatistics`, params);
 };
+
+// 统计某时间段(天)的文件下载数
+export const getDailyOperateStatisticsApi = (params: any) => {
+  return post(`${PREFIX}systemLog/getDailyOperateStatistics`, params);
+};
diff --git a/src/utils/i18n/en.ts b/src/utils/i18n/en.ts
index f608387d..28865bc7 100644
--- a/src/utils/i18n/en.ts
+++ b/src/utils/i18n/en.ts
@@ -329,6 +329,7 @@ const lang = {
     '指标完成统计（学科）': 'Performance Completion Statistics (Discipline)',
     工位评审通过统计: 'Workspace Review Statistics',
     项目任务完成情况统计: 'Project Task Completion Statistics',
+    文件操作统计: 'File Operate Statistics',
   },
   工位时间维护: {
     阶段: 'Phase',
diff --git a/src/utils/i18n/zh.ts b/src/utils/i18n/zh.ts
index f60b4902..99042eb6 100644
--- a/src/utils/i18n/zh.ts
+++ b/src/utils/i18n/zh.ts
@@ -324,6 +324,7 @@ const lang = {
     '指标完成统计（学科）': '指标完成统计（学科）',
     工位评审通过统计: '工位评审通过统计',
     项目任务完成情况统计: '项目任务完成情况统计',
+    文件操作统计: '文件操作统计',
   },
   工位时间维护: {
     阶段: '阶段',
diff --git a/src/views/task/dashboard/components/dataStatistics.vue b/src/views/task/dashboard/components/dataStatistics.vue
index b0eb5e6d..e79a1d37 100644
--- a/src/views/task/dashboard/components/dataStatistics.vue
+++ b/src/views/task/dashboard/components/dataStatistics.vue
@@ -28,6 +28,7 @@
 import { onMounted, ref, provide } from 'vue';
 import { getThemeColor } from '@/utils/theme';
 // 引入子组件
+import fileOperateChart from './dataStatistics/fileOperateChart.vue';
 import userGroupProjectChart from './dataStatistics/userGroupProjectChart.vue';
 import userTaskCompleteChart from './dataStatistics/userTaskCompleteChart.vue';
 import userDifficultyCoefficientChart from './dataStatistics/userDifficultyCoefficientChart.vue';
@@ -145,6 +146,11 @@ const baseList = ref([
       processNodeColorList,
     },
   },
+  {
+    id: 'fileOperate',
+    component: fileOperateChart,
+    props: {},
+  },
 ]);
 // 当前展示的图表
 const currentList = ref();
diff --git a/src/views/task/dashboard/components/dataStatistics/fileOperateChart.vue b/src/views/task/dashboard/components/dataStatistics/fileOperateChart.vue
new file mode 100644
index 00000000..1839cde5
--- /dev/null
+++ b/src/views/task/dashboard/components/dataStatistics/fileOperateChart.vue
@@ -0,0 +1,114 @@
+<template>
+  <commonFilterChart
+    :title="$t('数据统计.文件操作统计')"
+    :charts-id="'chart-1-fileOperate'"
+    :bar-type="'barChart'"
+    :option="chartOption"
+    :showChangeModel="true"
+    :filterItems="[]"
+    :extraFilters="extraFilters"
+    @update="initUserProjectStatistics"
+  >
+    <template #extraFilters="{ extraFilters }">
+      <el-form-item label="日期范围">
+        <el-date-picker
+          v-model="extraFilters.dateRange"
+          type="daterange"
+          value-format="YYYY-MM-DD"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :disabled-date="disabledDate"
+          :clearable="false"
+        />
+      </el-form-item>
+    </template>
+  </commonFilterChart>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue';
+import commonFilterChart from '@/components/common/echartCard/commonFilterChart.vue';
+import { getDailyOperateStatisticsApi } from '@/api/system/systemLog';
+import { getThemeColor } from '@/utils/theme';
+import dayjs from 'dayjs';
+
+const extraFilters = ref<any>({
+  // dateRange默认设置近30天
+  dateRange: [
+    dayjs(new Date()).subtract(30, 'day').format('YYYY-MM-DD'),
+    dayjs(new Date()).format('YYYY-MM-DD'),
+  ],
+});
+const disabledDate = (time: Date) => {
+  return time.getTime() > Date.now();
+};
+
+const getDailyOperate = async (date: any) => {
+  const xData: any = [];
+  const previewData: any = [];
+  const downloadData: any = [];
+  try {
+    const res: any = await getDailyOperateStatisticsApi({
+      createTimeArr: date.dateRange,
+    });
+    if (res.code === 200) {
+      const data = res.data.reverse();
+      data.forEach((item: any) => {
+        xData.push(item.date);
+        previewData.push(item.previewCount || 0);
+        downloadData.push(item.downloadCount || 0);
+      });
+    }
+  } catch {}
+
+  return {
+    xData,
+    previewData,
+    downloadData,
+  };
+};
+
+// 初始化用户组项目统计
+const chartOption = ref();
+const initUserProjectStatistics = async (data: any) => {
+  const { xData, previewData, downloadData } = await getDailyOperate(data);
+  chartOption.value = {
+    legend: {
+      data: ['预览', '下载'],
+    },
+    grid: {
+      bottom: '50',
+    },
+    xAxis: {
+      data: xData,
+    },
+    yAxis: {
+      minInterval: 1,
+    },
+    dataZoom: xData.length > 4,
+    series: [
+      {
+        type: 'bar',
+        name: '预览',
+        data: previewData,
+        itemStyle: {
+          color: getThemeColor('--el-color-primary'),
+        },
+      },
+      {
+        type: 'bar',
+        name: '下载',
+        data: downloadData,
+        itemStyle: {
+          color: getThemeColor('--el-color-success'),
+        },
+      },
+    ],
+  };
+};
+
+onMounted(() => {
+  // getDailyOperate();
+  // initUserProjectStatistics();
+});
+</script>
diff --git a/src/views/task/dashboard/components/dataStatistics/settingDia.vue b/src/views/task/dashboard/components/dataStatistics/settingDia.vue
index 067a1e07..ae6e2213 100644
--- a/src/views/task/dashboard/components/dataStatistics/settingDia.vue
+++ b/src/views/task/dashboard/components/dataStatistics/settingDia.vue
@@ -86,6 +86,7 @@ const baseTable = [
   { key: 'performanceCompletionMechine', title: '指标完成统计（机台）', inBoard: true },
   { key: 'performanceCompletionDiscipline', title: '指标完成统计（学科）', inBoard: true },
   { key: 'reviewPassed', title: '工位评审通过统计', inBoard: true },
+  { key: 'fileOperate', title: '文件下载统计', inBoard: true },
 ];
 const vxeTableRef = ref<any>();
 

From dba52cdfeac3cd44728d7092ff27d70c68622a5b Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Fri, 6 Mar 2026 16:13:58 +0800
Subject: [PATCH 02/15] =?UTF-8?q?update=20=E6=BC=94=E7=A4=BA=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/analysisDataDialog.vue         | 19 +------------------
 .../components/calculationFileResult.vue      |  3 +--
 .../analysis/components/modelFileResult.vue   |  3 +--
 src/views/data/analysis/index.vue             |  3 +--
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/views/data/analysis/components/analysisDataDialog.vue b/src/views/data/analysis/components/analysisDataDialog.vue
index 3af6c56d..265a3eb1 100644
--- a/src/views/data/analysis/components/analysisDataDialog.vue
+++ b/src/views/data/analysis/components/analysisDataDialog.vue
@@ -162,34 +162,17 @@ const { RESULT_ACHIEVE_STATUS, TASK_ACHIEVE_STATUS, PERFORMANCE_TYPE, PERFORMANC
   'PERFORMANCE_TYPE'
 );
 const props = defineProps({
-  // 演示使用 增加了modelValue
-  modelValue: {
-    type: Boolean,
-    default: false,
-  },
   analysisData: {
     type: Object,
     default: () => {},
   },
 });
-// 演示使用 增加了watch
-watch(
-  () => props.modelValue,
-  (val: boolean) => {
-    if (val) {
-      diaVisible.value = true;
-    } else {
-      diaVisible.value = false;
-    }
-  }
-);
 
 const cloumnWidth = ref('200');
 
 const checkTableRef = ref();
 
-// 演示使用 true改为了false
-const diaVisible = ref(false);
+const diaVisible = ref(true);
 
 const checkAnalysisList = ref<any>([]);
 const checktableData = ref<any>([]);
diff --git a/src/views/data/analysis/components/calculationFileResult.vue b/src/views/data/analysis/components/calculationFileResult.vue
index 6c8531bd..3cb09d50 100644
--- a/src/views/data/analysis/components/calculationFileResult.vue
+++ b/src/views/data/analysis/components/calculationFileResult.vue
@@ -27,8 +27,7 @@
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <!-- 演示使用 v-if改为了v-model -->
-    <compareTextFile v-model="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile>
   </div>
 </template>
 
diff --git a/src/views/data/analysis/components/modelFileResult.vue b/src/views/data/analysis/components/modelFileResult.vue
index 46164705..b09dab81 100644
--- a/src/views/data/analysis/components/modelFileResult.vue
+++ b/src/views/data/analysis/components/modelFileResult.vue
@@ -27,8 +27,7 @@
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <!-- 演示使用 v-if改为了v-model -->
-    <compareTextFile v-model="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile>
   </div>
 </template>
 
diff --git a/src/views/data/analysis/index.vue b/src/views/data/analysis/index.vue
index 684b36b9..d60d309f 100644
--- a/src/views/data/analysis/index.vue
+++ b/src/views/data/analysis/index.vue
@@ -266,9 +266,8 @@
       :run-info="currentRunInfo"
       @close="showRunDetailDialog = false"
     />
-    <!-- 演示使用 v-if改为了v-model -->
     <analysisDataDialog
-      v-model="loadcaseAnalysisVisable"
+      v-if="loadcaseAnalysisVisable"
       @close="closeAnalysisFun"
       :analysis-data="selectAnalysisData"
     />

From 9d593a7fb0c349bcb50ed08539f1e15d0e32d1c4 Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Fri, 6 Mar 2026 16:14:30 +0800
Subject: [PATCH 03/15] =?UTF-8?q?update=20=E6=96=87=E4=BB=B6=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/components/dataStatistics/fileOperateChart.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/task/dashboard/components/dataStatistics/fileOperateChart.vue b/src/views/task/dashboard/components/dataStatistics/fileOperateChart.vue
index 1839cde5..3acd97d0 100644
--- a/src/views/task/dashboard/components/dataStatistics/fileOperateChart.vue
+++ b/src/views/task/dashboard/components/dataStatistics/fileOperateChart.vue
@@ -83,6 +83,7 @@ const initUserProjectStatistics = async (data: any) => {
       data: xData,
     },
     yAxis: {
+      name: '次数',
       minInterval: 1,
     },
     dataZoom: xData.length > 4,

From 9c584fde02c117e1a9393cefc2388f02ad29cf83 Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Fri, 6 Mar 2026 16:16:25 +0800
Subject: [PATCH 04/15] =?UTF-8?q?update=20=E6=BC=94=E7=A4=BA=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/analysisDataDialog.vue         | 19 +------------------
 .../components/calculationFileResult.vue      |  3 +--
 .../analysis/components/modelFileResult.vue   |  3 +--
 src/views/data/analysis/index.vue             |  3 +--
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/views/data/analysis/components/analysisDataDialog.vue b/src/views/data/analysis/components/analysisDataDialog.vue
index 3af6c56d..265a3eb1 100644
--- a/src/views/data/analysis/components/analysisDataDialog.vue
+++ b/src/views/data/analysis/components/analysisDataDialog.vue
@@ -162,34 +162,17 @@ const { RESULT_ACHIEVE_STATUS, TASK_ACHIEVE_STATUS, PERFORMANCE_TYPE, PERFORMANC
   'PERFORMANCE_TYPE'
 );
 const props = defineProps({
-  // 演示使用 增加了modelValue
-  modelValue: {
-    type: Boolean,
-    default: false,
-  },
   analysisData: {
     type: Object,
     default: () => {},
   },
 });
-// 演示使用 增加了watch
-watch(
-  () => props.modelValue,
-  (val: boolean) => {
-    if (val) {
-      diaVisible.value = true;
-    } else {
-      diaVisible.value = false;
-    }
-  }
-);
 
 const cloumnWidth = ref('200');
 
 const checkTableRef = ref();
 
-// 演示使用 true改为了false
-const diaVisible = ref(false);
+const diaVisible = ref(true);
 
 const checkAnalysisList = ref<any>([]);
 const checktableData = ref<any>([]);
diff --git a/src/views/data/analysis/components/calculationFileResult.vue b/src/views/data/analysis/components/calculationFileResult.vue
index 6c8531bd..3cb09d50 100644
--- a/src/views/data/analysis/components/calculationFileResult.vue
+++ b/src/views/data/analysis/components/calculationFileResult.vue
@@ -27,8 +27,7 @@
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <!-- 演示使用 v-if改为了v-model -->
-    <compareTextFile v-model="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile>
   </div>
 </template>
 
diff --git a/src/views/data/analysis/components/modelFileResult.vue b/src/views/data/analysis/components/modelFileResult.vue
index 46164705..b09dab81 100644
--- a/src/views/data/analysis/components/modelFileResult.vue
+++ b/src/views/data/analysis/components/modelFileResult.vue
@@ -27,8 +27,7 @@
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <!-- 演示使用 v-if改为了v-model -->
-    <compareTextFile v-model="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile>
   </div>
 </template>
 
diff --git a/src/views/data/analysis/index.vue b/src/views/data/analysis/index.vue
index 684b36b9..d60d309f 100644
--- a/src/views/data/analysis/index.vue
+++ b/src/views/data/analysis/index.vue
@@ -266,9 +266,8 @@
       :run-info="currentRunInfo"
       @close="showRunDetailDialog = false"
     />
-    <!-- 演示使用 v-if改为了v-model -->
     <analysisDataDialog
-      v-model="loadcaseAnalysisVisable"
+      v-if="loadcaseAnalysisVisable"
       @close="closeAnalysisFun"
       :analysis-data="selectAnalysisData"
     />

From 342b493bee8a7207f19dad6c1e816d7cc32fa6f0 Mon Sep 17 00:00:00 2001
From: zhouyang <zhouyang@honeycombtech.com>
Date: Fri, 6 Mar 2026 16:24:30 +0800
Subject: [PATCH 05/15] =?UTF-8?q?update:=E6=BC=94=E7=A4=BA=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=81=A2=E5=A4=8D=EF=BC=8C=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/analysis/components/calculationFileResult.vue      | 6 +++---
 src/views/data/analysis/components/modelFileResult.vue      | 6 +++---
 src/views/task/execution/components/leftTaskTree/index.vue  | 4 ++--
 src/views/task/projectDetail/components/taskDetail.vue      | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/data/analysis/components/calculationFileResult.vue b/src/views/data/analysis/components/calculationFileResult.vue
index 3cb09d50..68e0e272 100644
--- a/src/views/data/analysis/components/calculationFileResult.vue
+++ b/src/views/data/analysis/components/calculationFileResult.vue
@@ -21,13 +21,13 @@
           <div v-else>
             <el-button type="primary" link @click="reviewFun(item)">预览</el-button>
             <el-button type="primary" link @click="downLoadFun(item)">下载</el-button>
-            <el-button type="primary" link @click="compareFun(item)">对比</el-button>
+            <!-- <el-button type="primary" link @click="compareFun(item)">对比</el-button> -->
           </div>
         </div>
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <!-- <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile> -->
   </div>
 </template>
 
@@ -37,7 +37,7 @@ import BaseTable from '@/components/common/table/baseTable.vue';
 import { objectTypeArrayRemovesDuplicates } from '@/utils/common';
 import FilePreview from '@/components/common/filePreview/index.vue';
 import { downloadFileByStream, fileUploadAllocationIconFun } from '@/utils/file';
-import compareTextFile from './compareTextFile.vue';
+// import compareTextFile from './compareTextFile.vue';
 
 const props = defineProps({
   checkTaskInfo: {
diff --git a/src/views/data/analysis/components/modelFileResult.vue b/src/views/data/analysis/components/modelFileResult.vue
index b09dab81..bfcb36e0 100644
--- a/src/views/data/analysis/components/modelFileResult.vue
+++ b/src/views/data/analysis/components/modelFileResult.vue
@@ -21,13 +21,13 @@
           <div v-else>
             <el-button type="primary" link @click="reviewFun(item)">预览</el-button>
             <el-button type="primary" link @click="downLoadFun(item)">下载</el-button>
-            <el-button type="primary" link @click="compareFun(item)">对比</el-button>
+            <!-- <el-button type="primary" link @click="compareFun(item)">对比</el-button> -->
           </div>
         </div>
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <!-- <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile> -->
   </div>
 </template>
 
@@ -37,7 +37,7 @@ import BaseTable from '@/components/common/table/baseTable.vue';
 import { objectTypeArrayRemovesDuplicates } from '@/utils/common';
 import FilePreview from '@/components/common/filePreview/index.vue';
 import { downloadFileByStream, fileUploadAllocationIconFun } from '@/utils/file';
-import compareTextFile from './compareTextFile.vue';
+// import compareTextFile from './compareTextFile.vue';
 
 const props = defineProps({
   checkTaskInfo: {
diff --git a/src/views/task/execution/components/leftTaskTree/index.vue b/src/views/task/execution/components/leftTaskTree/index.vue
index 486922f7..a01ade28 100644
--- a/src/views/task/execution/components/leftTaskTree/index.vue
+++ b/src/views/task/execution/components/leftTaskTree/index.vue
@@ -113,13 +113,13 @@
         >
           <el-icon> <CirclePlus /> </el-icon>新建算例
         </p>
-        <p
+        <!-- <p
           class="menuButton"
           v-if="rightClickNodeInfo?.nodeType === NODE_TYPE.TASK"
           @click="showDiaFun('updateTask')"
         >
           <el-icon> <Operation /> </el-icon>状态修改
-        </p>
+        </p> -->
         <!-- <p class="menuButton" v-if="rightClickNodeInfo?.nodeType === NODE_TYPE.TASK" @click="showDiaFun('inputParam')">
           <el-icon>
             <SetUp />
diff --git a/src/views/task/projectDetail/components/taskDetail.vue b/src/views/task/projectDetail/components/taskDetail.vue
index 890e2aae..dd3c34bb 100644
--- a/src/views/task/projectDetail/components/taskDetail.vue
+++ b/src/views/task/projectDetail/components/taskDetail.vue
@@ -9,7 +9,7 @@
       show-footer
     >
       <div class="page-inner">
-        <el-tabs v-model="activeTab" class="tabs-demo">
+        <el-tabs v-model="activeTab" class="tabs-demo" type="card">
           <!-- <el-tab-pane label="仿真报告" name="report">
             <div class="task-tab-content">
               <taskReport
@@ -23,8 +23,8 @@
           </el-tab-pane> -->
           <el-tab-pane label="任务详情" name="info">
             <el-radio-group v-model="activeRadio">
-              <el-radio-button label="仿真报告" value="report" />
               <el-radio-button label="任务详情" value="detail" v-if="showTaskInfo" />
+              <el-radio-button label="仿真报告" value="report" />
               <el-radio-button label="关联需求" value="demand" />
             </el-radio-group>
 
@@ -350,7 +350,7 @@ const reportInpDiaShow = ref(false);
 const dialogVisible = ref(true);
 // const activeTab = ref(props.showTaskInfo ? 'info' : 'model-3d');
 const activeTab = ref('info');
-const activeRadio = ref('report');
+const activeRadio = ref('detail');
 const keyResultType = ref('performance');
 const taskPerformanceRef = ref();
 const taskInfoRef = ref();

From 5b102c1d6a999acf561225070e8102e58a45e778 Mon Sep 17 00:00:00 2001
From: zhouyang <zhouyang@honeycombtech.com>
Date: Fri, 6 Mar 2026 16:29:25 +0800
Subject: [PATCH 06/15] =?UTF-8?q?update:=E6=BC=94=E7=A4=BA=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/analysis/components/calculationFileResult.vue      | 6 +++---
 src/views/data/analysis/components/modelFileResult.vue      | 6 +++---
 src/views/task/execution/components/leftTaskTree/index.vue  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/data/analysis/components/calculationFileResult.vue b/src/views/data/analysis/components/calculationFileResult.vue
index 3cb09d50..68e0e272 100644
--- a/src/views/data/analysis/components/calculationFileResult.vue
+++ b/src/views/data/analysis/components/calculationFileResult.vue
@@ -21,13 +21,13 @@
           <div v-else>
             <el-button type="primary" link @click="reviewFun(item)">预览</el-button>
             <el-button type="primary" link @click="downLoadFun(item)">下载</el-button>
-            <el-button type="primary" link @click="compareFun(item)">对比</el-button>
+            <!-- <el-button type="primary" link @click="compareFun(item)">对比</el-button> -->
           </div>
         </div>
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <!-- <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile> -->
   </div>
 </template>
 
@@ -37,7 +37,7 @@ import BaseTable from '@/components/common/table/baseTable.vue';
 import { objectTypeArrayRemovesDuplicates } from '@/utils/common';
 import FilePreview from '@/components/common/filePreview/index.vue';
 import { downloadFileByStream, fileUploadAllocationIconFun } from '@/utils/file';
-import compareTextFile from './compareTextFile.vue';
+// import compareTextFile from './compareTextFile.vue';
 
 const props = defineProps({
   checkTaskInfo: {
diff --git a/src/views/data/analysis/components/modelFileResult.vue b/src/views/data/analysis/components/modelFileResult.vue
index b09dab81..bfcb36e0 100644
--- a/src/views/data/analysis/components/modelFileResult.vue
+++ b/src/views/data/analysis/components/modelFileResult.vue
@@ -21,13 +21,13 @@
           <div v-else>
             <el-button type="primary" link @click="reviewFun(item)">预览</el-button>
             <el-button type="primary" link @click="downLoadFun(item)">下载</el-button>
-            <el-button type="primary" link @click="compareFun(item)">对比</el-button>
+            <!-- <el-button type="primary" link @click="compareFun(item)">对比</el-button> -->
           </div>
         </div>
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <!-- <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile> -->
   </div>
 </template>
 
@@ -37,7 +37,7 @@ import BaseTable from '@/components/common/table/baseTable.vue';
 import { objectTypeArrayRemovesDuplicates } from '@/utils/common';
 import FilePreview from '@/components/common/filePreview/index.vue';
 import { downloadFileByStream, fileUploadAllocationIconFun } from '@/utils/file';
-import compareTextFile from './compareTextFile.vue';
+// import compareTextFile from './compareTextFile.vue';
 
 const props = defineProps({
   checkTaskInfo: {
diff --git a/src/views/task/execution/components/leftTaskTree/index.vue b/src/views/task/execution/components/leftTaskTree/index.vue
index 486922f7..a01ade28 100644
--- a/src/views/task/execution/components/leftTaskTree/index.vue
+++ b/src/views/task/execution/components/leftTaskTree/index.vue
@@ -113,13 +113,13 @@
         >
           <el-icon> <CirclePlus /> </el-icon>新建算例
         </p>
-        <p
+        <!-- <p
           class="menuButton"
           v-if="rightClickNodeInfo?.nodeType === NODE_TYPE.TASK"
           @click="showDiaFun('updateTask')"
         >
           <el-icon> <Operation /> </el-icon>状态修改
-        </p>
+        </p> -->
         <!-- <p class="menuButton" v-if="rightClickNodeInfo?.nodeType === NODE_TYPE.TASK" @click="showDiaFun('inputParam')">
           <el-icon>
             <SetUp />

From 826af12c02c35706916a54bd1b020a9e76f3979a Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Fri, 6 Mar 2026 16:56:16 +0800
Subject: [PATCH 07/15] =?UTF-8?q?update=20=E5=9B=BE=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8Coption=E5=A2=9E=E5=8A=A0zoomShowNum=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=AE=9A=E4=B9=89=E7=BC=A9=E6=94=BE=E6=97=B6?=
 =?UTF-8?q?=E4=B8=80=E5=B1=8F=E5=B1=95=E7=A4=BA=E7=9A=84=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/echartCard/echartsOptions.ts       | 54 ++++++++++---------
 .../system/logs/components/lineChart.vue      |  4 +-
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/components/common/echartCard/echartsOptions.ts b/src/components/common/echartCard/echartsOptions.ts
index 209f5da1..979929e3 100644
--- a/src/components/common/echartCard/echartsOptions.ts
+++ b/src/components/common/echartCard/echartsOptions.ts
@@ -86,28 +86,32 @@ const onResize = (chart: any) => {
     chart.resize();
   }
 };
-// X轴缩放的规则
-const zoomRule = [
-  {
-    type: 'slider',
-    show: true,
-    xAxisIndex: [0],
-    start: 0,
-    end: 2,
-    textStyle: {
-      color: 'transparent',
+const getZoomRule = (num: number = 5) => {
+  // X轴缩放的规则
+  const zoomRule = [
+    {
+      type: 'slider',
+      show: true,
+      xAxisIndex: [0],
+      start: 0,
+      end: 2,
+      textStyle: {
+        color: 'transparent',
+      },
+      moveHandleSize: 10,
+      height: 15,
+      bottom: 10,
+      maxValueSpan: 14, // 窗口最多有15个柱子
+      minValueSpan: num - 1, // 窗口最少也要几个柱子
+      filterMode: 'empty',
+      realtime: true,
+      zoomLock: false, // 允许缩放
+      showDetail: false,
     },
-    moveHandleSize: 10,
-    height: 15,
-    bottom: 10,
-    maxValueSpan: 14, // 窗口最多有15个柱子
-    minValueSpan: 4, // 窗口最少也要有5个柱子
-    filterMode: 'empty',
-    realtime: true,
-    zoomLock: false, // 允许缩放
-    showDetail: false,
-  },
-];
+  ];
+  return zoomRule;
+};
+
 // 深层对象的合并
 const deepMerge = (target: any, source: any) => {
   for (const key in source) {
@@ -153,7 +157,7 @@ const mergeObjArrItem = (option: any, item: any, optionKey: string) => {
 
 const barChart = (
   id: string,
-  { series, yAxis, xAxis, grid, title, legend, tooltip, dataZoom, color }: any,
+  { series, yAxis, xAxis, grid, title, legend, tooltip, dataZoom, color, zoomShowNum = 5 }: any,
   isDark: any
 ) => {
   const option: any = {
@@ -231,7 +235,7 @@ const barChart = (
   mergeObjItem(option, title, 'title');
   mergeObjItem(option, legend, 'legend');
   mergeObjItem(option, tooltip, 'tooltip');
-  option.dataZoom = dataZoom ? zoomRule : [];
+  option.dataZoom = dataZoom ? getZoomRule(zoomShowNum) : [];
   if (color) {
     option.color = color;
   }
@@ -399,7 +403,7 @@ const pieChart = (
 };
 const lineChart = (
   id: string,
-  { title, tooltip, legend, grid, xAxis, yAxis, series, color, dataZoom }: any,
+  { title, tooltip, legend, grid, xAxis, yAxis, series, color, dataZoom, zoomShowNum = 5 }: any,
   isDark: any
 ) => {
   const option: any = {
@@ -478,7 +482,7 @@ const lineChart = (
   mergeObjItem(option, title, 'title');
   mergeObjItem(option, legend, 'legend');
   mergeObjItem(option, tooltip, 'tooltip');
-  option.dataZoom = dataZoom ? zoomRule : [];
+  option.dataZoom = dataZoom ? getZoomRule(zoomShowNum) : [];
   if (color) {
     option.color = color;
   }
diff --git a/src/views/system/logs/components/lineChart.vue b/src/views/system/logs/components/lineChart.vue
index 0e073d82..2724954f 100644
--- a/src/views/system/logs/components/lineChart.vue
+++ b/src/views/system/logs/components/lineChart.vue
@@ -122,6 +122,7 @@ const onlineUserStatistics = async () => {
         minInterval: 1,
       },
       dataZoom: xData.length > 10,
+      zoomShowNum: 13,
       series: [
         {
           name: '在线用户数',
@@ -176,7 +177,8 @@ const userLogintStatistics = async () => {
         },
       },
     ],
-    dataZoom: xData.length > 5,
+    dataZoom: xData.length > 7,
+    zoomShowNum: 7,
   };
   ouserLoginOptions.value = { ...optionsLine };
 };

From 3c1dd143c52a009ddbfe2e7752268186b186226e Mon Sep 17 00:00:00 2001
From: JiangSheng <jiangsheng@123.com>
Date: Fri, 6 Mar 2026 16:44:46 +0800
Subject: [PATCH 08/15] =?UTF-8?q?fix:=20=E8=B0=B1=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 4debada5ec43460bcd674353933137e71e9b3b4b)
---
 src/views/data/analysis/components/pedigree/pedigreeDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/data/analysis/components/pedigree/pedigreeDetail.vue b/src/views/data/analysis/components/pedigree/pedigreeDetail.vue
index b8519a14..6d647a35 100644
--- a/src/views/data/analysis/components/pedigree/pedigreeDetail.vue
+++ b/src/views/data/analysis/components/pedigree/pedigreeDetail.vue
@@ -144,7 +144,7 @@
         ref="testDataTableRef"
         tableName="RESULT_REPORT"
         :api="getFileListApiFun"
-        :params="getParamsByTypeFun(FILE_TYPE.TEST_CLOSURE_REPORT)"
+        :params="getParamsByTypeFun(FILE_TYPE.TEST_DOCUMENT_FILE)"
         showIndex
         :fullHeight="true"
         hideSearch

From b427715638acbf2566cf50941f29a5aa84e51f00 Mon Sep 17 00:00:00 2001
From: JiangSheng <jiangsheng@123.com>
Date: Mon, 9 Mar 2026 09:54:11 +0800
Subject: [PATCH 09/15] =?UTF-8?q?feat:=20=E6=8A=A5=E5=91=8A=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E5=B7=A5=E5=86=B5=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 9f2b8e6468ae4b4ef66f689f5be6773d7c0f925c)
---
 .../common/treeCaseTable/nodeDetailDialog.vue |  19 +-
 .../treeCaseTable/reportTemplateSelect.vue    | 210 ++++++++++++++++++
 .../common/treeCaseTable/treeTable.vue        |  19 ++
 src/stores/reportTemplate.ts                  |  57 +++++
 src/utils/enum/node.ts                        |   1 +
 src/utils/i18n/en.ts                          |   4 +
 src/utils/i18n/zh.ts                          |   4 +
 .../reportLib/components/addDialog.vue        |  68 ++++--
 8 files changed, 363 insertions(+), 19 deletions(-)
 create mode 100644 src/components/common/treeCaseTable/reportTemplateSelect.vue
 create mode 100644 src/stores/reportTemplate.ts

diff --git a/src/components/common/treeCaseTable/nodeDetailDialog.vue b/src/components/common/treeCaseTable/nodeDetailDialog.vue
index 9ae38cf0..a7b69259 100644
--- a/src/components/common/treeCaseTable/nodeDetailDialog.vue
+++ b/src/components/common/treeCaseTable/nodeDetailDialog.vue
@@ -26,17 +26,20 @@
           @change="onFormChangeFun"
         >
           <template #form-nodeName>
-            <nodeNameMixed
+            <NodeNameMixed
               v-model="formData.nodeName"
               :nodeType="formData.nodeType"
               :editable="true"
             />
           </template>
           <template #form-flowTemplate>
-            <flowTemplateSelect v-model="selectedFlowTemplate" />
+            <FlowTemplateSelect v-model="selectedFlowTemplate" />
+          </template>
+          <template #form-reportTemplate>
+            <ReportTemplateSelect v-model="formData.reportTemplate" />
           </template>
           <template #form-standard>
-            <knowledgeSelect v-model="standard" v-model:modelName="formData.standardName" />
+            <KnowledgeSelect v-model="standard" v-model:modelName="formData.standardName" />
           </template>
         </TableForm>
       </template>
@@ -58,15 +61,18 @@ import { getTagKeyMap, NODE_TYPE } from '@/utils/enum/node';
 import { disposeTaskMembers } from '@/utils/task';
 import { disposeTagKey } from '@/views/task/projectDetail/components/project';
 import { isCategoryType, isCategoryNodeType, validateCategoryLevel } from '@/utils/node';
-import flowTemplateSelect from './flowTemplateSelect.vue';
-import knowledgeSelect from './knowledgeSelect.vue';
-import nodeNameMixed from './nodeNameMixed.vue';
+import FlowTemplateSelect from './flowTemplateSelect.vue';
+import ReportTemplateSelect from './reportTemplateSelect.vue';
+import KnowledgeSelect from './knowledgeSelect.vue';
+import NodeNameMixed from './nodeNameMixed.vue';
 import { TABLE_NAME } from '@/utils/enum/tableName';
 import { useDict } from '@/utils/useDict';
 import { useI18n } from 'vue-i18n';
 import { useTaskStore } from '@/stores/taskPool';
+import { useReportStore } from '@/stores/reportTemplate';
 
 const taskStore = useTaskStore();
+const reportStore = useReportStore();
 enum OPERATION_TYPE {
   ADD = 'add',
   EDIT = 'edit',
@@ -138,6 +144,7 @@ watch(
         }
       });
       taskStore.fetchTemplates(true);
+      reportStore.fetchTemplates(true);
     }
   }
 );
diff --git a/src/components/common/treeCaseTable/reportTemplateSelect.vue b/src/components/common/treeCaseTable/reportTemplateSelect.vue
new file mode 100644
index 00000000..1a258cba
--- /dev/null
+++ b/src/components/common/treeCaseTable/reportTemplateSelect.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="full">
+    <el-select-v2
+      v-if="editable"
+      v-model="selected"
+      :options="options"
+      class="full"
+      :clearable="clearable"
+      :size="size"
+      :multiple="multiple"
+      :collapse-tags="multiple"
+      :collapse-tags-tooltip="multiple"
+      :fit-input-width="false"
+      @change="onChange"
+    />
+    <span v-else class="plain-label">
+      <template v-if="selectedTemplates.length === 1">
+        <el-icon
+          class="view"
+          @click="previewReport(selectedTemplates[0].uuid)"
+          :title="$t('通用.预览')"
+        >
+          <View />
+        </el-icon>
+        <OverflowTooltip :content="selectedTemplates[0].templateName" max-width="120px" />
+      </template>
+      <template v-else-if="selectedTemplates.length >= 2">
+        <el-popover
+          placement="bottom"
+          trigger="hover"
+          :width="400"
+          popper-class="report-template-select-popover"
+        >
+          <template #reference>
+            <span class="link-text">
+              {{ $t('工况库.关联N个报告模版', { count: selectedTemplates.length }) }}
+            </span>
+          </template>
+          <div class="template-list">
+            <div v-for="item in selectedTemplates" :key="item.uuid" class="template-item">
+              <el-icon class="view" :title="$t('通用.预览')" @click="previewReport(item.uuid)">
+                <View />
+              </el-icon>
+              <OverflowTooltip :content="item.templateName" class="item-name" />
+            </div>
+          </div>
+        </el-popover>
+      </template>
+    </span>
+    <ReportViewDialog
+      v-if="reportViewVisible"
+      v-model:showDialog="reportViewVisible"
+      :reportFileId="currentPreviewFileId"
+      :reportUuid="currentPreviewUuid"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, watch, computed } from 'vue';
+import { useReportStore } from '@/stores/reportTemplate';
+import ReportViewDialog from '@/components/common/report/reportViewDialog.vue';
+import OverflowTooltip from '@/components/common/text/overflowTooltip.vue';
+import { View } from '@element-plus/icons-vue';
+
+interface Props {
+  modelValue?: any;
+  clearable?: boolean;
+  editable?: boolean;
+  size?: '' | 'large' | 'default' | 'small';
+  multiple?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  modelValue: '',
+  clearable: false,
+  editable: true,
+  size: 'default',
+  multiple: true,
+});
+const emits = defineEmits(['update:modelValue', 'change']);
+
+const parseValue = (value: string): string[] | string => {
+  if (!value) return props.multiple ? [] : '';
+  if (props.multiple) {
+    return value.split(',').filter((v) => v.trim());
+  }
+  return value;
+};
+
+const stringifyValue = (value: string[] | string): string => {
+  if (props.multiple && Array.isArray(value)) {
+    return value.join(',');
+  }
+  return String(value || '');
+};
+
+const selected = ref<string[] | string>(parseValue(props.modelValue));
+
+watch(
+  () => props.modelValue,
+  (v) => {
+    selected.value = parseValue(v);
+  }
+);
+
+watch(selected, (v) => {
+  const stringValue = stringifyValue(v);
+  emits('update:modelValue', stringValue);
+});
+
+const reportStore = useReportStore();
+
+const options = computed(() => reportStore.options);
+
+const selectedCodes = computed(() => {
+  if (props.multiple && Array.isArray(selected.value)) {
+    return selected.value;
+  }
+  return selected.value ? [selected.value] : [];
+});
+
+const selectedTemplates = computed(() => {
+  return reportStore.templates.filter((t: any) => selectedCodes.value.includes(t.templateCode));
+});
+
+const onChange = (val: string[] | string) => {
+  emits('change', stringifyValue(val));
+};
+
+const reportViewVisible = ref(false);
+const currentPreviewUuid = ref('');
+const currentPreviewFileId = ref('');
+
+const previewReport = (uuid: string) => {
+  const template = reportStore.templates.find((t: any) => t.uuid === uuid);
+  if (template) {
+    currentPreviewUuid.value = uuid;
+    currentPreviewFileId.value = template.fileId || '';
+    reportViewVisible.value = true;
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.full {
+  width: 100%;
+}
+
+.plain-label {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  vertical-align: middle;
+  line-height: 1;
+  max-width: 100%;
+  .view {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 20px;
+    height: 20px;
+    cursor: pointer;
+    color: var(--el-color-primary);
+    flex-shrink: 0;
+  }
+  .link-text {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+}
+
+.template-list {
+  max-height: 400px;
+  overflow-y: auto;
+
+  .template-item {
+    display: flex;
+    align-items: center;
+    padding: 8px 0;
+    border-bottom: 1px solid var(--el-border-color-lighter);
+
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .item-name {
+      flex: 1;
+      min-width: 0;
+    }
+
+    .view {
+      flex-shrink: 0;
+      cursor: pointer;
+      color: var(--el-color-primary);
+      margin-right: 8px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.report-template-select-popover {
+  max-height: 450px;
+  overflow: hidden;
+}
+</style>
diff --git a/src/components/common/treeCaseTable/treeTable.vue b/src/components/common/treeCaseTable/treeTable.vue
index d434e7ac..11f20e01 100644
--- a/src/components/common/treeCaseTable/treeTable.vue
+++ b/src/components/common/treeCaseTable/treeTable.vue
@@ -322,6 +322,21 @@
       <template #flowTemplate-edit="{ row }">
         <flowTemplateSelect v-model="row.flowTemplate" size="small" />
       </template>
+      <!-- 报告模板 -->
+      <template #reportTemplate="{ row, icon }">
+        <TreeEditItem
+          v-if="[NODE_TYPE.TASK].includes(row.nodeType) || isMixedNodeType(row.nodeType)"
+          :data="row.reportTemplate"
+          :editMode="editMode"
+          :icon="icon"
+          hideTitle
+        >
+          <reportTemplateSelect v-model="row.reportTemplate" :editable="false" size="small" />
+        </TreeEditItem>
+      </template>
+      <template #reportTemplate-edit="{ row }">
+        <reportTemplateSelect v-model="row.reportTemplate" size="small" />
+      </template>
       <!-- 标准规范 -->
       <template #standard="{ row, icon }">
         <TreeEditItem
@@ -565,9 +580,11 @@ import dictLabel from './dictLabel.vue';
 import nodeNameMixed from './nodeNameMixed.vue';
 import { poolCategoryTypeOptions } from '@/utils/project';
 import flowTemplateSelect from './flowTemplateSelect.vue';
+import reportTemplateSelect from './reportTemplateSelect.vue';
 import knowledgeSelect from './knowledgeSelect.vue';
 import uploadImg from '@/components/common/table/uploadImg.vue';
 import { useTaskStore } from '@/stores/taskPool';
+import { useReportStore } from '@/stores/reportTemplate';
 import userSelect from '../userSelect/index.vue';
 import { disposeMemberList } from '@/views/task/projectDetail/components/project';
 import { getMemberListIds } from '@/utils/task';
@@ -614,6 +631,7 @@ const { TASK_ACHIEVE_STATUS, RESULT_ACHIEVE_STATUS, TASK_APPROVE_STATUS, TASK_PR
 
 const treeData = ref<any>([]);
 const taskStore = useTaskStore();
+const reportStore = useReportStore();
 
 const treeDataFormatFun = (data: any, build: any, pId: any) => {
   data.forEach((item: any) => {
@@ -721,6 +739,7 @@ const seeApproveDetailFun = async (row: any) => {
 onMounted(() => {
   initProjectDicts();
   taskStore.fetchTemplates();
+  reportStore.fetchTemplates();
 });
 
 defineExpose({
diff --git a/src/stores/reportTemplate.ts b/src/stores/reportTemplate.ts
new file mode 100644
index 00000000..3bfeeec2
--- /dev/null
+++ b/src/stores/reportTemplate.ts
@@ -0,0 +1,57 @@
+import { defineStore } from 'pinia';
+import { ref, computed } from 'vue';
+import { queryReportTemplateApi } from '@/api/capability/report';
+import { REPORT_TEMPLATE_PUBLIC_STATUS, FLOW_USE_STATUS } from '@/utils/enum/report';
+
+interface ReportTemplate {
+  templateName?: string;
+  templateCode?: string;
+  [k: string]: any;
+}
+
+export const useReportStore = defineStore('reportTemplate', () => {
+  const templates = ref<ReportTemplate[]>([]);
+  const loaded = ref(false);
+  let pendingPromise: Promise<ReportTemplate[]> | null = null;
+
+  const options = computed(() =>
+    templates.value.map((item) => ({
+      label: item.templateName || '',
+      value: item.templateCode || '',
+    }))
+  );
+
+  const fetchTemplates = async (force = false) => {
+    if (!force && loaded.value && templates.value.length) return templates.value;
+    if (pendingPromise) return pendingPromise;
+
+    pendingPromise = (async () => {
+      try {
+        const req = {
+          current: 1,
+          size: 99999,
+          type: REPORT_TEMPLATE_PUBLIC_STATUS.PUBLIC,
+          templateStatus: FLOW_USE_STATUS.USED,
+        };
+        const res: any = await queryReportTemplateApi(req);
+        if (res && res.code === 200) {
+          const list = res.data?.data || res.data || [];
+          templates.value = Array.isArray(list) ? list : [];
+        } else {
+          templates.value = [];
+        }
+        loaded.value = true;
+      } catch {
+        templates.value = [];
+        loaded.value = true;
+      } finally {
+        pendingPromise = null;
+      }
+      return templates.value;
+    })();
+
+    return pendingPromise;
+  };
+
+  return { templates, options, fetchTemplates, loaded };
+});
diff --git a/src/utils/enum/node.ts b/src/utils/enum/node.ts
index 9ae06daa..627564ad 100644
--- a/src/utils/enum/node.ts
+++ b/src/utils/enum/node.ts
@@ -108,6 +108,7 @@ export const poolNodePropPickMap = {
     'days',
     'flowTemplate',
     'standard',
+    'reportTemplate',
     'analyseTarget',
     'confidence',
     'analyseSoftware',
diff --git a/src/utils/i18n/en.ts b/src/utils/i18n/en.ts
index 28865bc7..fb2dc654 100644
--- a/src/utils/i18n/en.ts
+++ b/src/utils/i18n/en.ts
@@ -87,6 +87,9 @@ const lang = {
     项目详情: 'Project Detail',
     任务创建: 'Task Creation',
     仿真执行: 'Task Execution',
+    报工列表: 'Work Report List',
+    我确认的: 'I Confirmed',
+    我负责的: 'I Responsible',
     应用中心: 'Application Center',
     数据管理: 'Data Management',
     数据总览: 'Data Overview',
@@ -201,6 +204,7 @@ const lang = {
     没有修改的数据需要提交审批: 'No modified data to submit for approval',
     指标库列表: 'Performance Pool List',
     关联N个流程模版: 'Associated {count} Flow Templates',
+    关联N个报告模版: 'Associated {count} Report Templates',
     关联N个执行规范: 'Associated {count} Standards',
     关联N个工况: 'Associated {count} Tasks',
     请选择工况库: 'Please select task pool',
diff --git a/src/utils/i18n/zh.ts b/src/utils/i18n/zh.ts
index 99042eb6..b8fd02f2 100644
--- a/src/utils/i18n/zh.ts
+++ b/src/utils/i18n/zh.ts
@@ -86,6 +86,9 @@ const lang = {
     项目详情: '项目详情',
     任务创建: '任务创建',
     仿真执行: '仿真执行',
+    报工列表: '报工列表',
+    我确认的: '我确认的',
+    我负责的: '我负责的',
     应用中心: '应用中心',
     数据管理: '数据管理',
     数据总览: '数据总览',
@@ -197,6 +200,7 @@ const lang = {
     没有修改的数据需要提交审批: '没有修改的数据需要提交审批',
     指标库列表: '指标库列表',
     关联N个流程模版: '关联{count}个流程模版',
+    关联N个报告模版: '关联{count}个报告模版',
     关联N个执行规范: '关联{count}个执行规范',
     关联N个工况: '关联{count}个工况',
     请选择工况库: '请选择工况库',
diff --git a/src/views/simulation/reportLib/components/addDialog.vue b/src/views/simulation/reportLib/components/addDialog.vue
index 96e127c6..a9a8124c 100644
--- a/src/views/simulation/reportLib/components/addDialog.vue
+++ b/src/views/simulation/reportLib/components/addDialog.vue
@@ -45,7 +45,7 @@
           <el-button @click="closeFun">取消</el-button>
           <el-button
             type="primary"
-            v-if="dialogType !== REPORT_OPERATION_TYPE.UPGRADE"
+            v-if="!(dialogType === REPORT_OPERATION_TYPE.UPGRADE && hasChangeLoadcase)"
             @click="confirmFun('ok')"
             :loading="loadingInterface"
             >确定</el-button
@@ -99,12 +99,14 @@ const confirmFun = async (type: string) => {
   if (await tableFormRef.value.validateFun()) {
     loadingInterface.value = true;
     const flowForm = tableFormRef.value.getFormDataFun();
+    flowForm.simulationPoolInfoList = simulationPoolInfoList.value;
     if (
       props.dialogType === REPORT_OPERATION_TYPE.CREATE ||
       props.dialogType === REPORT_OPERATION_TYPE.COPY
     ) {
       const formData = new FormData();
       formData.append('templateVersion', 'V1.0');
+      formData.append('simulationPoolInfoListStr', JSON.stringify(simulationPoolInfoList.value));
       for (const key in flowForm) {
         if (key === 'file') {
           // 就算复制模板，如果上传了新的文件就不复制文件了
@@ -122,7 +124,8 @@ const confirmFun = async (type: string) => {
             key !== 'templateStatus' &&
             key !== 'creatorName' &&
             key !== 'createTime' &&
-            key !== 'approveType'
+            key !== 'approveType' &&
+            key !== 'simulationPoolInfoList'
           ) {
             formData.append(key, flowForm[key] ? flowForm[key] : '');
           }
@@ -130,17 +133,27 @@ const confirmFun = async (type: string) => {
       }
       const flowUuid = await createFlow(formData);
       emits('confirm', { type, uuid: flowUuid });
-    } else if (props.dialogType === REPORT_OPERATION_TYPE.UPGRADE) {
-      emits('confirm', {
-        type,
-        uuid: flowForm.uuid,
-        comment: flowForm.comment,
-        file: flowForm.file,
-        fileId: flowForm.file[0].id,
-      });
     } else {
-      await editReport(flowForm);
-      emits('confirm', { type, uuid: flowForm.uuid });
+      if (type === 'ok') {
+        await editReport(flowForm);
+        emits('confirm', { type, uuid: flowForm.uuid, tVersion: props.templateVersion });
+      }
+      if (type === 'next') {
+        if (oldComment.value !== flowForm.comment) {
+          // 升版时只更新描述，不更新工况，工况在提交审批时传递给接口
+          await editReport({ ...flowForm, simulationPoolInfoList: oldSimulationPoolInfoList.value });
+        }
+        emits('confirm', {
+          type,
+          uuid: flowForm.uuid,
+          comment: flowForm.comment,
+          file: flowForm.file,
+          fileId: flowForm.file[0].id,
+          tVersion: props.templateVersion,
+          // 不更新工况，工况在提交审批时传递给升版接口
+          simulationPoolInfoList: hasChangeLoadcase.value ? simulationPoolInfoList.value : null,
+        });
+      }
     }
     loadingInterface.value = false;
   }
@@ -188,6 +201,7 @@ const editReport = async (params: any) => {
     formData.append('extras', params.extras);
     formData.append('fileId', oldFormData.value.fileId);
     formData.append('templateContent', oldFormData.value.templateContent);
+    formData.append('simulationPoolInfoListStr', JSON.stringify(params.simulationPoolInfoList));
     if (params.file && params.file.length > 0) {
       if (params.file[0].raw) {
         formData.append('file', params.file[0].raw);
@@ -217,12 +231,17 @@ const closeFun = () => {
 
 const oldFormData = ref<any>({});
 
-const editRowInfo = ref<any>({});
+const editRowInfo = ref({});
+
+const oldSimulationPoolInfoList = ref<any[]>([]);
+const oldComment = ref('');
 
 const setEditForm = (val: any) => {
   oldFormData.value = val;
   // nextTick(() => {
   simulationPoolInfoList.value = val.simulationPoolInfoList || [];
+  oldSimulationPoolInfoList.value = val.simulationPoolInfoList || [];
+  oldComment.value = val.comment;
   // tableFormRef.value.setFormDataFun({ ...val });
   editRowInfo.value = { ...val };
   // });
@@ -245,6 +264,29 @@ const setOptionsFun = (key: string, options: any[]) => {
   tableFormRef.value.setOptionsFun(key, options);
 };
 
+const hasChangeLoadcase = ref(false);
+
+watch(
+  () => simulationPoolInfoList.value,
+  () => {
+    const oldIds: any[] = [];
+    oldSimulationPoolInfoList.value.forEach((item) => {
+      oldIds.push(...item.simulationPoolTaskIds);
+    });
+    const newIds: any[] = [];
+    simulationPoolInfoList.value.forEach((item) => {
+      newIds.push(...item.simulationPoolTaskIds);
+    });
+    oldIds.sort();
+    newIds.sort();
+    if (JSON.stringify(oldIds) !== JSON.stringify(newIds)) {
+      hasChangeLoadcase.value = true;
+    } else {
+      hasChangeLoadcase.value = false;
+    }
+  }
+);
+
 watch(
   () => props.showDialog,
   async () => {

From fc33e874c6827ba84642d22e23900c46c8ff7568 Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Mon, 9 Mar 2026 10:42:22 +0800
Subject: [PATCH 10/15] =?UTF-8?q?update=20bug1078=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/storage/components/storageSettings/index.vue  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/data/storage/components/storageSettings/index.vue b/src/views/data/storage/components/storageSettings/index.vue
index 099e8dbe..69333799 100644
--- a/src/views/data/storage/components/storageSettings/index.vue
+++ b/src/views/data/storage/components/storageSettings/index.vue
@@ -63,6 +63,7 @@
             v-model="editform.quotaValue"
             type="number"
             :min="0"
+            :max="999999"
             @keydown="handleKeydown"
           ></el-input>
           <el-select class="w80" v-model="editform.quotaUnit">
@@ -106,6 +107,15 @@ const handleKeydown = (e: KeyboardEvent) => {
   if (e.key === '.' || e.key === '-' || e.key === 'e' || e.key === 'E') {
     e.preventDefault();
   }
+  // 获取当前输入值
+  const currentValue = editform.value.quotaValue;
+  const nextValue = currentValue + e.key;
+
+  // 如果输入会导致数值超过999999，则阻止输入
+  if (nextValue && Number(nextValue) > 999999) {
+    e.preventDefault();
+    ElMessage.warning('输入值不能超过999999');
+  }
 };
 
 const baseTableRef = ref();

From bc44d81667d77b71a2662db703d565af9ec0da2d Mon Sep 17 00:00:00 2001
From: JiangSheng <jiangsheng@123.com>
Date: Mon, 9 Mar 2026 11:47:17 +0800
Subject: [PATCH 11/15] =?UTF-8?q?fix:=20=E5=88=B7=E6=96=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tenants/lyric/views/project/workspaceTime.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tenants/lyric/views/project/workspaceTime.vue b/src/tenants/lyric/views/project/workspaceTime.vue
index b7cdd8e7..86eccbf7 100644
--- a/src/tenants/lyric/views/project/workspaceTime.vue
+++ b/src/tenants/lyric/views/project/workspaceTime.vue
@@ -241,7 +241,7 @@ const updateSingleWorkspaceTimeFun = async (row: any, propertyName: string) => {
 
     if (res && res.code === 200) {
       ElMessage.success(t('通用.操作成功'));
-      baseTableRef.value?.resetFun();
+      // baseTableRef.value?.resetFun();
     }
   } catch (error) {
     console.error('更新失败', error);

From 2ec839def44fb58cd01fb393a75906e56c19d8ff Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Mon, 9 Mar 2026 13:51:24 +0800
Subject: [PATCH 12/15] =?UTF-8?q?update=20bug1063=20=E4=BB=BF=E7=9C=9F?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=BA=93=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameter/components/addParamObject.vue   | 18 +++++
 src/views/simulation/parameter/index.vue      | 76 +++++++++++--------
 2 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/src/views/simulation/parameter/components/addParamObject.vue b/src/views/simulation/parameter/components/addParamObject.vue
index c894ee49..f1d30cfe 100644
--- a/src/views/simulation/parameter/components/addParamObject.vue
+++ b/src/views/simulation/parameter/components/addParamObject.vue
@@ -7,13 +7,16 @@
         v-model:data="formData"
         showDisabled
         :itemNum="6"
+        :hideKeys="hideKeys"
         @change="changeFun"
+        @remove="removeFun"
         :formAttrs="{
           templateId: {
             moduleCode: 'PARAM_APPROVAL',
           },
           files: {
             accept: '.json',
+            multiple: false,
           },
         }"
       />
@@ -55,22 +58,37 @@ const closeFun = () => {
 };
 
 const onConfirmFun = async () => {
+  if (!formData.value.files.length) {
+    formData.value.templateId = '';
+    formData.value.templateName = '';
+  }
   const valid = await tableFormRef.value?.validateFun();
   if (valid) {
     emits('createFun', formData.value);
   }
 };
 
+const hideKeys = ref<any>(['templateId']);
+
 const changeFun = (data: any) => {
   const { key, val } = data;
   if (key === 'files') {
     formData.value.file = val.raw;
     formData.value.fileName = val.name;
+    hideKeys.value = [];
   }
   if (key === 'templateId') {
     formData.value.templateName = val.label;
   }
 };
+const removeFun = (data: any) => {
+  const { key } = data;
+  if (key === 'files') {
+    formData.value.file = '';
+    formData.value.fileName = '';
+    hideKeys.value = ['templateId'];
+  }
+};
 
 onMounted(() => {
   if (props.libTypeInfo) {
diff --git a/src/views/simulation/parameter/index.vue b/src/views/simulation/parameter/index.vue
index 24068ccc..cff845c5 100644
--- a/src/views/simulation/parameter/index.vue
+++ b/src/views/simulation/parameter/index.vue
@@ -434,6 +434,8 @@ const creatLibParamObjFun = async (data: any) => {
       return item.name === data.parameterLibraryCategoryObjectName;
     });
     libTreeRef.value.append(node, currentNode.value.nodeKey);
+  } else {
+    ElMessage.warning(res.message);
   }
   showParamObjVisible.value = false;
 };
@@ -454,15 +456,25 @@ const deleteConfirmFun = () => {
 
 const deleteParamFun = async (flag: any, row?: any) => {
   currentNode.value = { ...row };
-  // 如果删除的是参数，要走审批流程
+  // 如果删除的是参数对象，
   if (flag === 'param') {
-    delParams.value = {
-      // type: currentNode.value.type,
-      // id: currentNode.value.id,
-      type: row.type,
-      id: row.id,
-    };
-    approveDelShow.value = true;
+    // 有参数 要走审批流程，没参数可以直接删
+    const res: any = await getSimulationParameterLibraryCategoryObjectApi({
+      ObjectId: row.id,
+    });
+    if (res && res.code === 200) {
+      if (res.data && res.data.parameterJsonValue && res.data.parameterJsonValue.length) {
+        delParams.value = {
+          type: row.type,
+          id: row.id,
+        };
+        approveDelShow.value = true;
+      } else {
+        // 直接删除
+        deleteAction(flag, row);
+      }
+    }
+
     return;
   } else {
     // 0228需求 参数库、分类删除逻辑修改：下级有参数data=true，走审核流程；下级没有参数，直接删除
@@ -478,32 +490,36 @@ const deleteParamFun = async (flag: any, row?: any) => {
       };
       approveDelShow.value = true;
     } else {
-      // 走删除流程
-      ElMessageBox.confirm(
-        `确认要删除这个${flag === 'lib' ? '参数库' : flag === 'type' ? '参数库分类' : '参数对象'}吗?`,
-        '警告',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }
-      ).then(async () => {
-        const res: any = await deleteSimulationParameterApi({
-          type: row.type,
-          id: row.id,
-          isApprove: false,
-        });
-        if (res && res.code === 200) {
-          ElMessage.success('删除成功！');
-          libTreeRef.value.remove(currentNode.value.nodeKey);
-          currentNode.value = {};
-          paramObjInfo.value = '';
-        }
-      });
+      deleteAction(flag, row);
     }
   }
 };
 
+const deleteAction = (flag: any, row: any) => {
+  // 走删除流程
+  ElMessageBox.confirm(
+    `确认要删除这个${flag === 'lib' ? '参数库' : flag === 'type' ? '参数库分类' : '参数对象'}吗?`,
+    '警告',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  ).then(async () => {
+    const res: any = await deleteSimulationParameterApi({
+      type: row.type,
+      id: row.id,
+      isApprove: false,
+    });
+    if (res && res.code === 200) {
+      ElMessage.success('删除成功！');
+      libTreeRef.value.remove(currentNode.value.nodeKey);
+      currentNode.value = {};
+      paramObjInfo.value = '';
+    }
+  });
+};
+
 const updateParams = ref<any>({});
 const approveUpdateShow = ref(false);
 const updateParamFun = () => {

From 19ef1180cab7946a6d1f31233752d336860e235a Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Mon, 9 Mar 2026 14:25:02 +0800
Subject: [PATCH 13/15] =?UTF-8?q?update=20bug1063=20=E4=BB=BF=E7=9C=9F?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=BA=93=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/simulation/parameter/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/simulation/parameter/index.vue b/src/views/simulation/parameter/index.vue
index cff845c5..64e9fbda 100644
--- a/src/views/simulation/parameter/index.vue
+++ b/src/views/simulation/parameter/index.vue
@@ -421,10 +421,12 @@ const creatLibParamObjFun = async (data: any) => {
     parameterLibraryId: data.parameterLibraryId,
     parameterLibraryCategoryId: data.parameterLibraryCategoryId,
     parameterLibraryCategoryObjectName: data.parameterLibraryCategoryObjectName,
-    fileName: data.fileName,
-    file: data.file,
-    templateId: data.templateId,
-    templateName: data.templateName,
+    ...(data.file && {
+      fileName: data.fileName,
+      file: data.file,
+      templateId: data.templateId,
+      templateName: data.templateName,
+    }),
   });
 
   if (res && res.code === 200) {

From 1893f840c7c7cee476d7ea475b0966bc6d3fa1c0 Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Mon, 9 Mar 2026 15:02:49 +0800
Subject: [PATCH 14/15] =?UTF-8?q?update=20=E4=BB=BB=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=BC=B9=E7=AA=97=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/taskDetail/taskInfo.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/taskDetail/taskInfo.vue b/src/components/taskDetail/taskInfo.vue
index 03db009d..c2c325c1 100644
--- a/src/components/taskDetail/taskInfo.vue
+++ b/src/components/taskDetail/taskInfo.vue
@@ -15,13 +15,14 @@
         <knowledgeSelect v-model="standard" />
       </template>
     </TableForm>
-    <!-- 展示任务的操作日志  开发中 等后端接口 -->
-    <div class="oprate-log" v-if="false">
+    <!-- 展示任务的操作日志 -->
+    <div class="oprate-log">
       <BaseTable
-        listTitle="操作日志"
+        listTitle="任务操作日志"
         tableName="SYSTEM_LOGS"
         :api="pageApi"
         :actionList="[]"
+        :params="searchParams"
         fullHeight
         hideSearch
       >
@@ -68,6 +69,9 @@ const formAttrs = ref({
     step: 0.01,
   },
 });
+const searchParams = ref<any>({
+  businessId: props.taskInfo.uuid,
+});
 
 const localDetail = ref<any>({});
 
@@ -186,7 +190,8 @@ onMounted(() => {});
     }
   }
   .oprate-log {
-    flex: 1;
+    // flex: 1;
+    height: calc(100% - 210px);
   }
 }
 </style>

From d09a498332a0d243b289a33e1b61d7c56fdc9e23 Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Mon, 9 Mar 2026 15:05:44 +0800
Subject: [PATCH 15/15] =?UTF-8?q?update=20=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=9A=82=E4=B8=8D=E6=9B=B4=E6=96=B0=E5=88=B0=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=BA=EF=BC=8C=E5=85=88=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/taskDetail/taskInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/taskDetail/taskInfo.vue b/src/components/taskDetail/taskInfo.vue
index c2c325c1..e047f959 100644
--- a/src/components/taskDetail/taskInfo.vue
+++ b/src/components/taskDetail/taskInfo.vue
@@ -16,7 +16,7 @@
       </template>
     </TableForm>
     <!-- 展示任务的操作日志 -->
-    <div class="oprate-log">
+    <div class="oprate-log" v-if="false">
       <BaseTable
         listTitle="任务操作日志"
         tableName="SYSTEM_LOGS"