merge

.env.development

@@ -37,4 +37,5 @@ VITE_API_PREFIX_PROJECT=/local7101/
 VITE_API_PREFIX_SYSTEM=/local7103/
 VITE_API_PREFIX_TASK=/local7102/
 VITE_API_PREFIX_APPLICATION=/local18888/
-VITE_API_PREFIX_FLOWABLE=/local7108/
+VITE_API_PREFIX_FLOWABLE=/local7108/
+VITE_API_PREFIX_JOB=/local7109/

.env.eontec

@@ -37,4 +37,5 @@ VITE_API_PREFIX_PROJECT=/project/
 VITE_API_PREFIX_SYSTEM=/system/
 VITE_API_PREFIX_TASK=/task/
 VITE_API_PREFIX_APPLICATION=/application/
-VITE_API_PREFIX_FLOWABLE=/flowable/
+VITE_API_PREFIX_FLOWABLE=/flowable/
+VITE_API_PREFIX_JOB=/downBigFile/

.env.lyric

@@ -37,4 +37,5 @@ VITE_API_PREFIX_PROJECT=/project/
 VITE_API_PREFIX_SYSTEM=/system/
 VITE_API_PREFIX_TASK=/task/
 VITE_API_PREFIX_APPLICATION=/application/
-VITE_API_PREFIX_FLOWABLE=/flowable/
+VITE_API_PREFIX_FLOWABLE=/flowable/
+VITE_API_PREFIX_JOB=/downBigFile/

.env.production

@@ -37,4 +37,5 @@ VITE_API_PREFIX_PROJECT=/project/
 VITE_API_PREFIX_SYSTEM=/system/
 VITE_API_PREFIX_TASK=/task/
 VITE_API_PREFIX_APPLICATION=/application/
-VITE_API_PREFIX_FLOWABLE=/flowable/
+VITE_API_PREFIX_FLOWABLE=/flowable/
+VITE_API_PREFIX_JOB=/downBigFile/

.env.test

@@ -37,4 +37,5 @@ VITE_API_PREFIX_PROJECT=/project/
 VITE_API_PREFIX_SYSTEM=/system/
 VITE_API_PREFIX_TASK=/task/
 VITE_API_PREFIX_APPLICATION=/application/
-VITE_API_PREFIX_FLOWABLE=/flowable/
+VITE_API_PREFIX_FLOWABLE=/flowable/
+VITE_API_PREFIX_JOB=/downBigFile/

src/api/pbs/job.ts

@@ -0,0 +1,13 @@
+import { download } from '@/api/request';
+
+const env = import.meta.env;
+const PREFIX = env.VITE_API_PREFIX_JOB;
+
+/**
+ * 计算作业下载
+ * @param params
+ * @returns
+ */
+export const hpcDownloadFileApi = (params: any) => {
+  return download(`${PREFIX}pbs/hpcDownloadFile`, params, params.name);
+};

src/api/pbs/pbs.ts

@@ -36,14 +36,6 @@ export const getJobResultFilesApi = (params: any) => {
   return post(`${PREFIX}pbs/getJobResultFiles`, params);
 };
 
-/**
- * 计算作业下载
- * @param params
- * @returns
- */
-export const hpcDownloadFileApi = (params: any) => {
-  return download(`${PREFIX}pbs/hpcDownloadFile`, params, params.name);
-};
 
 /**
  * hpc文本在线预览关闭

src/components/taskDetail/taskReport.vue

@@ -216,6 +216,10 @@ const beforeUploadFun = (file: any) => {
   AddFileRef.value.addFileFun(file);
 };
 
+defineExpose({
+  baseTableRef,
+});
+
 onMounted(async () => {
   getTaskRunInfoFun();
 

src/views/simulation/process/detail.vue

@@ -31,7 +31,10 @@ watch(
   (val: any) => {
     currentFlowData.value = null;
     nextTick(() => {
-      currentFlowData.value = val;
+      currentFlowData.value = {
+        ...val,
+        updateSimulationPoolInfoList: JSON.parse(val.updateSimulationPoolInfoList),
+      };
     });
   },
   {

src/views/simulation/process/index.vue

@@ -477,7 +477,7 @@ const goFlowDetailFun = (uuid: string) => {
       flowUuid: flowUuid.value,
       dialogType: dialogType.value,
       templateVersion: templateVersion.value,
-      updateSimulationPoolInfoList: updateSimulationPoolInfoList.value,
+      updateSimulationPoolInfoList: JSON.stringify(updateSimulationPoolInfoList.value),
     },
   });
 };

src/views/task/execution/components/runDetailPage/runPagecomponent/jobFile.vue

@@ -75,7 +75,7 @@
 <script setup lang="ts">
 import { nextTick, ref, watch } from 'vue';
 import Dialog from '@/components/common/dialog/index.vue';
-import { getJobResultFilesApi, hpcDownloadFileApi, streamLogEndApi } from '@/api/pbs/pbs';
+import { getJobResultFilesApi, streamLogEndApi } from '@/api/pbs/pbs';
 import BaseTable from '@/components/common/table/baseTable.vue';
 import { fileUploadAllocationIconFun, formatFileSize } from '@/utils/file';
 import TableForm from '@/components/common/table/tableForm.vue';
@@ -83,6 +83,7 @@ import { EventSourcePolyfill } from 'event-source-polyfill';
 import { ElMessage } from 'element-plus';
 import { getUserData } from '@/utils/user';
 import MonacoEditor from '@/components/common/fileEdit/monacoEditor/index.vue';
+import { hpcDownloadFileApi } from '@/api/pbs/job';
 
 const props = defineProps({
   jobInfo: {
@@ -198,7 +199,6 @@ const fileLogConnectFun = () => {
   // });
 
   SEE.value.addEventListener('message', (e: any) => {
-
     if (e?.data) {
       logContent.value.content = logContent.value.content + e?.data + '\n';
     }

src/views/task/execution/components/taskDetailPage/index.vue

@@ -66,6 +66,7 @@
 
         <div class="report-table">
           <taskReport
+            ref="taskReportRef"
             :task-id="currentTaskInfo?.uuid"
             :show-left-options="showLeftOptions"
             :canUpdate="isPMemberOrEMember"
@@ -216,7 +217,11 @@
       </template>
     </Dialog>
 
-    <ReportInputDialog v-model="reportInpDiaShow" :taskId="currentTaskInfo?.uuid" />
+    <ReportInputDialog
+      v-model="reportInpDiaShow"
+      :taskId="currentTaskInfo?.uuid"
+      @update:model-value="reportChangeFun"
+    />
   </div>
 </template>
 
@@ -287,7 +292,7 @@ const activeName = ref('taskDetail');
 const keyResultType = ref('performance');
 const approvaVisable = ref(false);
 const reportInpDiaShow = ref(false);
-
+const taskReportRef = ref();
 const handleClickFun = () => {};
 
 const currentTaskInfo = ref<any>(null);
@@ -392,6 +397,13 @@ const getTaskImportLevelFun = () => {
   }
 };
 
+// 刷新报告列表
+const reportChangeFun = () => {
+  if (taskReportRef.value) {
+    taskReportRef.value?.baseTableRef?.resetFun();
+  }
+};
+
 // 监控传入的任务信息
 watch(
   () => props.taskInfo,

src/views/task/projectDetail/components/taskDetail.vue

@@ -625,5 +625,11 @@ onMounted(async () => {
     height: calc(100% - 60px);
     margin-top: 10px;
   }
+
+
+
+  .task-demand-content{
+    padding: 0px !important;
+  }
 }
 </style>