From 5e54f0c6520501ce3b6a89df52b50494c5e1e683 Mon Sep 17 00:00:00 2001
From: weibl <weibaolin@chinasae.com>
Date: Thu, 26 Feb 2026 14:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=A8=E7=BA=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=96=B0=E5=A2=9EgetFileStream=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/fileEdit/monacoEditor/index.vue    | 13 +++++++------
 src/components/taskDetail/taskPerformance.vue |  4 ++--
 .../projectDetail/components/taskDetail.vue   |  4 ++--
 .../simulationTask/components/demandTable.vue | 10 +++++++---
 .../components/taskListDialog.vue             | 19 +++++++++++++++++++
 .../simulationTask/components/taskTable.vue   |  5 +++++
 6 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/components/common/fileEdit/monacoEditor/index.vue b/src/components/common/fileEdit/monacoEditor/index.vue
index 93b21791..fa9d6e2b 100644
--- a/src/components/common/fileEdit/monacoEditor/index.vue
+++ b/src/components/common/fileEdit/monacoEditor/index.vue
@@ -17,11 +17,12 @@
 import { ref, onMounted, toRaw, watchEffect, onBeforeUnmount } from 'vue';
 import * as monaco from 'monaco-editor';
 import { ElMessage } from 'element-plus';
-import { dataDownloadFileApi, dataUpdateFileApi, getFileBaseInfoApi } from '@/api/data/data';
+import { dataUpdateFileApi, getFileBaseInfoApi } from '@/api/data/data';
+import { getFileSteam } from '@/api/request';
 // import { upload } from '@/api/request';
 
-// const env = import.meta.env;
-// const PREFIX = env.VITE_API_PREFIX_DATA;
+const env = import.meta.env;
+const PREFIX = env.VITE_API_PREFIX_DATA;
 
 const props = withDefaults(
   defineProps<{
@@ -126,8 +127,8 @@ const getFile = async () => {
   if (baseRes.code === 200) {
     fileTitle.value = baseRes.data.originalName;
   }
-  const res: any = await dataDownloadFileApi({ fileId: props.fileId });
-  if (res) {
+  const resText: any = await getFileSteam(`${PREFIX}data/downloadFile`, { fileId: props.fileId });
+  if (resText) {
     // 设置语言
     let fileSuffix = '';
     if (fileTitle.value.lastIndexOf('.') != -1) {
@@ -151,7 +152,7 @@ const getFile = async () => {
     //   // 设置内容
     //   text.value = res;
     // }
-    text.value = res.request.response;
+    text.value = resText;
     toRaw(editor.value).setValue(text.value);
     // 设置光标位置为第一行第一列
     toRaw(editor.value).setPosition({ lineNumber: 1, column: 1 });
diff --git a/src/components/taskDetail/taskPerformance.vue b/src/components/taskDetail/taskPerformance.vue
index c702bf91..21731c68 100644
--- a/src/components/taskDetail/taskPerformance.vue
+++ b/src/components/taskDetail/taskPerformance.vue
@@ -130,8 +130,8 @@ import { syncKeyResultToTaskApi } from '@/api/project/run';
 
 const props = defineProps({
   taskId: {
-    type: String,
-    default: '',
+    type: Number,
+    default: 0,
   },
   runInfo: {
     type: Object,
diff --git a/src/views/task/projectDetail/components/taskDetail.vue b/src/views/task/projectDetail/components/taskDetail.vue
index 99eaa1f0..cc8649e3 100644
--- a/src/views/task/projectDetail/components/taskDetail.vue
+++ b/src/views/task/projectDetail/components/taskDetail.vue
@@ -211,8 +211,8 @@ import reviewData from '@/components/taskDetail/reviewData.vue';
 const emits = defineEmits(['closeFn', 'updateFn']);
 const props = defineProps({
   taskId: {
-    type: String,
-    default: '',
+    type: Number,
+    default: 0,
   },
   currentTaskInfo: {
     type: Object,
diff --git a/src/views/task/simulationTask/components/demandTable.vue b/src/views/task/simulationTask/components/demandTable.vue
index 43e7d4be..a5e0176f 100644
--- a/src/views/task/simulationTask/components/demandTable.vue
+++ b/src/views/task/simulationTask/components/demandTable.vue
@@ -3,7 +3,7 @@
     ref="tableRef"
     showIndex
     :tableName="tableName"
-    :params="{ ...params, sortOrder: 1 }"
+    :params="apiParams"
     :api="api"
     :searchLimitNum="3"
     @searchChange="changeFun($event, 'search')"
@@ -102,7 +102,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref, type PropType } from 'vue';
+import { computed, onMounted, reactive, ref, type PropType } from 'vue';
 import BaseTable from '@/components/common/table/baseTable.vue';
 import { getChildrenNodeList } from '../../projectDetail/components/projectApi';
 import { NODE_TYPE } from '@/utils/enum/node';
@@ -118,7 +118,7 @@ import StatusDot from '@/components/common/statusDot/index.vue';
 import { demandStatus, getTaskAchieveStyleClass } from '@/components/common/statusDot/statusMap';
 import TaskListDialog from './taskListDialog.vue';
 
-defineProps({
+const props = defineProps({
   params: {
     type: Object,
     default: () => ({}),
@@ -150,6 +150,10 @@ const commonStore = CommonStore();
 const { SIMULATION_TYPE, IS_MOLD_MARKING } = useDict('SIMULATION_TYPE', 'IS_MOLD_MARKING');
 const emits = defineEmits(['show']);
 
+const apiParams = computed(() => {
+  return { ...props.params, sortOrder: 1 };
+});
+
 const attachmentsVisible = ref(false);
 
 const tableRef = ref();
diff --git a/src/views/task/simulationTask/components/taskListDialog.vue b/src/views/task/simulationTask/components/taskListDialog.vue
index e49a18a0..460197d2 100644
--- a/src/views/task/simulationTask/components/taskListDialog.vue
+++ b/src/views/task/simulationTask/components/taskListDialog.vue
@@ -19,6 +19,25 @@
           :api="getTaskListByDemandIdApi"
           hideSpecialSearch
           @show="showTaskDetailFun"
+          :hideSearchKeys="[
+            'tag10',
+            'exeStatus',
+            'achieveStatus',
+            'tag1Code',
+            'project',
+            'nodeCode',
+            'tag5',
+            'submitterName',
+            'pMemberList',
+            'eMemberList',
+            'approvalStatus',
+            'phase',
+            'discipline',
+            'beginTime',
+            'endTime',
+            'finishTime',
+            'confidence',
+          ]"
         ></TaskTable>
       </div>
       <template #footer>
diff --git a/src/views/task/simulationTask/components/taskTable.vue b/src/views/task/simulationTask/components/taskTable.vue
index 53094290..469348a4 100644
--- a/src/views/task/simulationTask/components/taskTable.vue
+++ b/src/views/task/simulationTask/components/taskTable.vue
@@ -10,6 +10,7 @@
     :searchLimitNum="searchLimitNum"
     @searchChange="changeFun($event, 'search')"
     @load="tableOnLoadFun"
+    :hideSearchKeys="hideSearchKeys"
     v-bind="$attrs"
     :exportApi="exportTaskApi"
     :exportFileName="exportFileName"
@@ -209,6 +210,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  hideSearchKeys: {
+    type: Array,
+    default: () => [],
+  },
 });
 
 const emits = defineEmits(['show']);