merge

src/views/task/projectDetail/components/projectApi.ts

@@ -5,7 +5,11 @@ import { getIdMap } from './project';
 import { getTagMapList } from '@/utils/task';
 import { getSeeDisciplines } from '@/tenants/lyric/views/task/lyricTask';
 
-export const getTaskTreeFun = async (projectUuid: string, phaseUuid: string) => {
+export const getTaskTreeFun = async (
+  projectUuid: string,
+  phaseUuid: string,
+  queryTaskFlag: number = 0
+) => {
   const tagMapList = getTagMapList();
   const tagSort = getIdMap(projectUuid, phaseUuid);
   const filterDiscipline = getSeeDisciplines();
@@ -15,6 +19,7 @@ export const getTaskTreeFun = async (projectUuid: string, phaseUuid: string) =>
     idMap: tagSort,
     tagMap: tagMapList,
     filterDiscipline,
+    queryTaskFlag: queryTaskFlag, // 1 过滤掉任务和指标 ，其他数字不过滤
   });
   if (res.code === 200) {
     return translateLoadcaseTree(res.data);

src/views/task/simulationTask/mySend/sendTask.vue

@@ -452,7 +452,7 @@ const sendTaskFun = async (row: any) => {
     sendForm.discipline = row.simType;
   }
 
-  const taskTree = await getTaskTreeFun(row.newTag1, row.newTag2);
+  const taskTree = await getTaskTreeFun(row.newTag1, row.newTag2, 1);
   indexTreeData.value = filterTask(taskTree);
   sendForm.insertIndex = row.newTag5;
   taskTreeRef.value.setCurrentKey(row.newTag5, true);