Front_Team/SPDM
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:bug修复，功能更新

Browse Source
This commit is contained in:
zhouyang
2026-03-03 15:00:46 +08:00
parent 243a056ca7
commit 3c40064b6c
2 changed files with 104 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/task/execution/components/leftTaskTree/operateComponent/createRunDiv.vue
View File

@@ -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;

117
src/views/task/projectDetail/components/taskDetail.vue
View File

@@ -10,7 +10,7 @@
>
<div class="page-inner">
<el-tabs v-model="activeTab" class="tabs-demo">
<el-tab-pane label="仿真报告" name="report">
<!-- <el-tab-pane label="仿真报告" name="report">
<div class="task-tab-content">
<taskReport
v-if="activeTab === 'report'"
@@ -19,12 +19,27 @@
:show-left-options="showLeftOptions"
></taskReport>
</div>
</el-tab-pane>
<el-tab-pane label="任务详情" name="info" v-if="showTaskInfo">
<div class="task-tab-content">
</el-tab-pane> -->
<el-tab-pane label="任务详情" name="info">
<el-radio-group v-model="activeRadio">
<el-radio-button label="仿真报告" value="report" />
<el-radio-button label="任务详情" value="detail" v-if="showTaskInfo" />
<el-radio-button label="关联需求" value="demand" />
</el-radio-group>
<div class="task-tab-content set-tab-content" v-if="activeRadio === 'report'">
<taskReport
v-if="activeRadio === 'report'"
:task-id="currentTaskInfo?.uuid"
:taskData="currentTaskInfo"
:show-left-options="showLeftOptions"
:canUpdate="isPMemberOrEMember"
></taskReport>
</div>
<div class="task-tab-content set-tab-content" v-if="activeRadio === 'detail'">
<taskInfo
ref="taskInfoRef"
v-if="activeTab === 'info'"
v-if="activeRadio === 'detail'"
:table-name="tableName"
:task-id="currentTaskInfo?.uuid"
:task-info="currentTaskInfo"
@@ -33,7 +48,22 @@
>
</taskInfo>
</div>
<div class="task-tab-content set-tab-content" v-if="activeRadio === 'demand'">
<taskDemand
v-if="activeRadio === 'demand'"
:demand-uid="currentTaskInfo?.demandId"
></taskDemand>
</div>
</el-tab-pane>
<!-- <el-tab-pane label="关联需求" name="demand">
<div class="task-tab-content">
<taskDemand
v-if="activeTab === 'demand'"
:demand-uid="currentTaskInfo?.demandId"
></taskDemand>
</div>
</el-tab-pane> -->
<el-tab-pane label="3D模型" name="model-3d">
<div class="task-tab-content">
@@ -56,7 +86,56 @@
></taskModel>
</div>
</el-tab-pane>
<el-tab-pane label="性能指标" name="performance">
<el-tab-pane label="关键结果" name="keyResult">
<el-radio-group v-model="keyResultType">
<el-radio-button label="性能指标" value="performance" />
<el-radio-button label="图片文件" value="resultImage" />
<el-radio-button label="曲线文件" value="curveView" />
<el-radio-button label="视频文件" value="video" />
</el-radio-group>
<div class="task-tab-content set-tab-content" v-if="keyResultType === 'performance'">
<taskPerformance
ref="taskPerformanceRef"
v-if="keyResultType === 'performance'"
:task-id="taskId"
:param-type="'task'"
:run-info="currentTaskInfo"
:task-info="currentTaskInfo"
:show-save-button="true"
:full-height="true"
:show-left-options="showLeftOptions"
>
</taskPerformance>
</div>
<div class="task-tab-content set-tab-content" v-if="keyResultType === 'resultImage'">
<resultImage
v-if="keyResultType === 'resultImage'"
:task-id="currentTaskInfo?.uuid"
:taskData="currentTaskInfo"
:show-left-options="showLeftOptions"
></resultImage>
</div>
<div class="task-tab-content set-tab-content" v-if="keyResultType === 'curveView'">
<taskCurve
v-if="keyResultType === 'curveView'"
:task-id="currentTaskInfo?.uuid"
:taskData="currentTaskInfo"
:show-left-options="showLeftOptions"
></taskCurve>
</div>
<div class="task-tab-content set-tab-content" v-if="keyResultType === 'video'">
<videoFile
v-if="keyResultType === 'video'"
:task-id="currentTaskInfo?.uuid"
:taskData="currentTaskInfo"
:show-left-options="showLeftOptions"
></videoFile>
</div>
</el-tab-pane>
<!-- <el-tab-pane label="性能指标" name="performance">
<div class="task-tab-content">
<taskPerformance
ref="taskPerformanceRef"
@@ -101,7 +180,7 @@
:show-left-options="showLeftOptions"
></videoFile>
</div>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="试验结果" name="experiment">
<experimentResult
@@ -116,14 +195,6 @@
:current-task-info="currentTaskInfo"
></runVersionTree>
</el-tab-pane>
<el-tab-pane label="关联需求" name="demand">
<div class="task-tab-content">
<taskDemand
v-if="activeTab === 'demand'"
:demand-uid="currentTaskInfo?.demandId"
></taskDemand>
</div>
</el-tab-pane>
<el-tab-pane label="复盘数据" name="review-data">
<div class="task-tab-content">
@@ -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;
}
}
</style>