diff --git a/src/views/task/execution/components/leftTaskTree/operateComponent/createRunDiv.vue b/src/views/task/execution/components/leftTaskTree/operateComponent/createRunDiv.vue index c9b7da96..284b12e3 100644 --- a/src/views/task/execution/components/leftTaskTree/operateComponent/createRunDiv.vue +++ b/src/views/task/execution/components/leftTaskTree/operateComponent/createRunDiv.vue @@ -167,11 +167,11 @@ const createSuccessFun = () => { const changeJoinFun = async () => { const version = await getRunDetailInfoFun(props.divInfo.uuid, operateType.value); if (runInfoFormData.isJointProjectInfo) { - runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.nodeName || props.divInfo.runName}_V${version}`; + runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.nodeName || props.divInfo.runName}_A${version}`; // (props.divInfo.nodeName || props.divInfo.runName) } else { - runInfoFormData.runNames = '算例_' + 'V' + version; + runInfoFormData.runNames = '算例_' + 'A' + version; } }; @@ -275,7 +275,7 @@ watch( // 如果是新增算例 if (props.divInfo && props.divInfo?.nodeType === NODE_TYPE.TASK) { if (runInfoFormData.isJointProjectInfo) { - runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.nodeName || props.divInfo.runName}_V${version}`; + runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.nodeName || props.divInfo.runName}_A${version}`; // runInfoFormData.runNames = props.divInfo.nodeName + '_V' + version; } @@ -295,9 +295,9 @@ watch( if (props.divInfo && props.divInfo?.nodeType === NODE_TYPE.RUN) { if (runInfoFormData.isJointProjectInfo) { if (newVal === 'copyRun') { - runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.parentName}_V${version}`; + runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.parentName}_A${version}`; } else { - runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.runName}_V${version}`; + runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.runName}_A${version}`; } } runInfoFormData.templateName = props.divInfo.flowTemplateName; diff --git a/src/views/task/projectDetail/components/taskDetail.vue b/src/views/task/projectDetail/components/taskDetail.vue index 68cd411c..bdc872f7 100644 --- a/src/views/task/projectDetail/components/taskDetail.vue +++ b/src/views/task/projectDetail/components/taskDetail.vue @@ -10,7 +10,7 @@ >
- + + + + + + + + +
+ +
+
+ +
+ +
+
@@ -56,7 +86,56 @@ >
- + + + + + + + + + +
+ + +
+
+ +
+
+ +
+
+ +
+
+ + - -
- -
-
@@ -242,7 +313,9 @@ const props = defineProps({ const dialogVisible = ref(true); // const activeTab = ref(props.showTaskInfo ? 'info' : 'model-3d'); -const activeTab = ref('report'); +const activeTab = ref('info'); +const activeRadio = ref('report'); +const keyResultType = ref('performance'); const taskPerformanceRef = ref(); const taskInfoRef = ref(); const approvaVisable = ref(false); @@ -334,13 +407,15 @@ const submitApprovalFun = async () => { }; const updateFun = async () => { - let data: any; + let data: any = null; if (activeTab.value === 'performance') { await taskPerformanceRef.value.saveFun(); } if (activeTab.value === 'info') { - data = await taskInfoRef.value.getFormData(); + if ((activeRadio.value = 'detail')) { + data = await taskInfoRef.value.getFormData(); + } } emits('updateFn', { @@ -402,5 +477,11 @@ onMounted(async () => { height: 100%; min-height: 500px; } + + .set-tab-content { + width: 100%; + height: calc(100% - 60px); + margin-top: 10px; + } }