merge

2026-01-28 09:53:27 +08:00
parent bc87829a7a 39518b1eb8
commit 050d0b0d48
6 changed files with 70 additions and 50 deletions
--- a/src/components/project/projectInfoDialog.vue
+++ b/src/components/project/projectInfoDialog.vue
@@ -200,6 +200,8 @@ const epProjectSelectFun = (row: any) => {
      projectId: row.id,
      // EP的项目主体字段 放到拓展字段
      projectUndertaker: row.projectUndertaker,
+      // EP的参考项目字段
+      referenceItem: row.referenceItem,
    };

    // EP的项目主体字段 放到拓展字段
--- a/src/views/simulation/creation/components/stencil.ts
+++ b/src/views/simulation/creation/components/stencil.ts
@@ -159,8 +159,11 @@ export const getNodeList = async (noload?: any) => {
        // if (!noload) {
        //   apps[i].nodeParamConfigName = await getAppConfigListFun(apps[i].uuid);
        // }
-        typeKeyArray[apps[i].appType]?.nodes?.push(apps[i]);
-        appList.push(apps[i]);
+        console.log('typeKeyArray[apps[i].appType]', typeKeyArray[apps[i].appType]);
+        if (typeKeyArray[apps[i].appType]) {
+          typeKeyArray[apps[i].appType].nodes.push(apps[i]);
+          appList.push(apps[i]);
+        }
      }
    }

--- a/src/views/task/execution/components/leftTaskTree/index.vue
+++ b/src/views/task/execution/components/leftTaskTree/index.vue
@@ -63,6 +63,8 @@
        v-if="showRunCreateOrEditWindow"
        :operate-flag="windowFlag"
        :div-info="rightClickNode"
+        :page-info="filterParam"
+        :work-space-info="workspaceNodeInfo"
        @close="showRunCreateOrEditWindow = false"
        @comfirm="createRunFun"
        @update="updateRunInfoFun"
@@ -392,6 +394,10 @@ const nodeChangeClickFun = (data: any, node: any) => {
  currentNodeInfo.value.projectUuid = filterParam.value?.projectName;
  currentNodeInfo.value.phaseUuid = filterParam.value?.phaseName;

+  if (node.data.nodeType === NODE_TYPE.TASK) {
+    getSpecifyLevelNodeData(node, NODE_TYPE.WORKSPACE);
+  }
+
  if (node.data.nodeType === NODE_TYPE.RUN) {
    currentNodeInfo.value.runTaskId = node.parent.data.id;
    currentNodeInfo.value.parentName = node.parent.data.nodeName;
--- a/src/views/task/execution/components/leftTaskTree/operateComponent/createRunDiv.vue
+++ b/src/views/task/execution/components/leftTaskTree/operateComponent/createRunDiv.vue
@@ -21,7 +21,7 @@
      :model="runInfoFormData"
      @submit.prevent=""
    >
-      <el-form-item label="拼接工况信息：" v-if="operateType != 'editRun'">
+      <el-form-item label="拼接项目信息：" v-if="operateType != 'editRun'">
        <el-radio-group v-model="runInfoFormData.isJointProjectInfo" @change="changeJoinFun">
          <el-radio :value="true">是</el-radio>
          <el-radio :value="false">否</el-radio>
@@ -99,10 +99,18 @@ const props = defineProps({
    type: Object,
    default: () => {},
  },
+  pageInfo: {
+    type: Object,
+    default: () => {},
+  },
  operateFlag: {
    type: String,
    default: 'createRun',
  },
+  workSpaceInfo: {
+    type: Object,
+    default: () => {},
+  },
 });

 const visible = ref(true);
@@ -156,7 +164,9 @@ const createSuccessFun = () => {
 const changeJoinFun = async () => {
  const version = await getRunDetailInfoFun(props.divInfo.uuid, operateType.value);
  if (runInfoFormData.isJointProjectInfo) {
-    runInfoFormData.runNames = (props.divInfo.nodeName || props.divInfo.runName) + '_V' + version;
+    runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.nodeName || props.divInfo.runName}_V${version}`;
+
+    // (props.divInfo.nodeName || props.divInfo.runName)
  } else {
    runInfoFormData.runNames = '算例_' + 'V' + version;
  }
@@ -262,7 +272,9 @@ watch(
        // 如果是新增算例
        if (props.divInfo && props.divInfo?.nodeType === NODE_TYPE.TASK) {
          if (runInfoFormData.isJointProjectInfo) {
-            runInfoFormData.runNames = props.divInfo.nodeName + '_V' + version;
+            runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.nodeName || props.divInfo.runName}_V${version}`;
+
+            // runInfoFormData.runNames = props.divInfo.nodeName + '_V' + version;
          }

          const list: any = props.divInfo.flowTemplate ? props.divInfo.flowTemplate.split(',') : [];
@@ -280,9 +292,9 @@ watch(
        if (props.divInfo && props.divInfo?.nodeType === NODE_TYPE.RUN) {
          if (runInfoFormData.isJointProjectInfo) {
            if (newVal === 'copyRun') {
-              runInfoFormData.runNames = props.divInfo.parentName + '_V' + version;
+              runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.parentName}_V${version}`;
            } else {
-              runInfoFormData.runNames = props.divInfo.runName + '_V' + version;
+              runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.runName}_V${version}`;
            }
          }
          runInfoFormData.templateName = props.divInfo.flowTemplateName;
--- a/src/views/task/projectList/index.vue
+++ b/src/views/task/projectList/index.vue
@@ -34,51 +34,38 @@
                  </template>
                </el-dropdown>

-                <div class="img-box">
-                  <template v-if="enableConfigByTenant([TENANT_ENUM.LYRIC])">
-                    <div
-                      class="gl-pointer-class pure-bg"
-                      @click="goProjectDetailFun(project.uuid, project.nodeName)"
-                    >
-                      <span
-                        class="node-code"
-                        @click="goProjectDetailFun(project.uuid, project.nodeName)"
-                      >
-                        {{ project.nodeCode }}
-                      </span>
-                    </div>
-                  </template>
-                  <template v-else>
-                    <img
-                      class="gl-pointer-class"
-                      v-if="project.detailImgUrl"
-                      @click="goProjectDetailFun(project.uuid, project.nodeName)"
-                      :src="getImgPathFun(project.detailImgUrl)"
-                      alt=""
-                    />
-                    <img
-                      class="gl-pointer-class"
-                      v-else-if="(index as number) % 2 !== 0"
-                      @click="goProjectDetailFun(project.uuid, project.nodeName)"
-                      src="@/assets/imgs/projectList/project-blue.png"
-                      alt=""
-                    />
-                    <img
-                      class="gl-pointer-class"
-                      v-else
-                      @click="goProjectDetailFun(project.uuid, project.nodeName)"
-                      src="@/assets/imgs/projectList/project-green.png"
-                      alt=""
-                    />
-                  </template>
-                </div>
+                <img
+                  class="gl-pointer-class cover-img"
+                  v-if="project.detailImgUrl"
+                  @click="goProjectDetailFun(project.uuid, project.nodeName)"
+                  :src="getImgPathFun(project.detailImgUrl)"
+                  alt=""
+                />
+                <img
+                  class="gl-pointer-class"
+                  v-else-if="(index as number) % 2 !== 0"
+                  @click="goProjectDetailFun(project.uuid, project.nodeName)"
+                  src="@/assets/imgs/projectList/project-blue.png"
+                  alt=""
+                />
+                <img
+                  class="gl-pointer-class"
+                  v-else
+                  @click="goProjectDetailFun(project.uuid, project.nodeName)"
+                  src="@/assets/imgs/projectList/project-green.png"
+                  alt=""
+                />

                <div class="bottom-box">
                  <span
                    :title="project.nodeName"
                    @click="goProjectDetailFun(project.uuid, project.nodeName)"
                    class="gl-text-ellipsis gl-pointer-class"
-                    >{{ project.nodeName }}</span
+                    >{{
+                      enableConfigByTenant([TENANT_ENUM.LYRIC])
+                        ? project.nodeCode
+                        : project.nodeName
+                    }}</span
                  >
                  <!-- <OverflowTooltip
                    class="gl-pointer-class"
@@ -97,7 +84,7 @@
                              ? 'status car-postponed'
                              : 'status car-info-status'
                    "
-                    >{{ PROJECT_EXE_STATUS.O[project.exeStatus] }}</span
+                    >{{ PROJECT_EXE_STATUS.O[project.exeStatus] || '未开始' }}</span
                  >
                </div>
              </div>
@@ -538,6 +525,11 @@ const shwoProjectsFun = () => {
      opacity: 1;
    }
  }
+  .cover-img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
  .options-dropdown {
    opacity: 0;
    position: absolute;
@@ -571,7 +563,7 @@ const shwoProjectsFun = () => {
    .pure-bg {
      width: 100%;
      height: 100%;
-      background: rgba(216, 210, 210, 0.2);
+      // background: rgba(216, 210, 210, 0.2);
      display: flex;
      align-items: center;
      justify-content: center;
--- a/src/views/task/simulationTask/components/taskTable.vue
+++ b/src/views/task/simulationTask/components/taskTable.vue
@@ -224,9 +224,14 @@ const approveId = ref('');

 const searchParams = computed(() => {
  if (filterTaskParams.exeStatus.length > 0) {
-    return { ...props.params, ...filterTaskParams, sortOrder: 1 };
+    return { ...props.params, ...filterTaskParams, sortOrder: 1, nodeTypeMap: getTagMapList() };
  } else {
-    return { ...props.params, todayTmrTasks: filterTaskParams.todayTmrTasks, sortOrder: 1 };
+    return {
+      ...props.params,
+      todayTmrTasks: filterTaskParams.todayTmrTasks,
+      sortOrder: 1,
+      nodeTypeMap: getTagMapList(),
+    };
  }
 });