From 71030e1f80635b7332136a488bc2cc8bd36fc04c Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 19 十一月 2024 11:40:37 +0800
Subject: [PATCH] Merge branch 'hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/views/fysp/check/ProCheck.vue | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index 8ca7913..7dc97a6 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -26,17 +26,18 @@
class="el-scrollbar"
v-loading="mainLoading"
>
- <CompProblemCard
- v-if="compProblemCardVisible"
- :key="i"
- v-for="(p, i) in curProList"
- :index="i + 1"
- :problem="p"
- :subtask="curSubtask.data"
- :topTask="topTask"
- @updated="onProSubmited"
- @submit="updateSubtask"
- ></CompProblemCard>
+ <template v-if="compProblemCardVisible">
+ <CompProblemCard
+ :key="i"
+ v-for="(p, i) in curProList"
+ :index="i + 1"
+ :problem="p"
+ :subtask="curSubtask.data"
+ :topTask="topTask"
+ @updated="onProSubmited"
+ @submit="updateSubtask"
+ ></CompProblemCard>
+ </template>
</el-scrollbar>
<el-empty v-else description="鏆傛棤璁板綍" v-loading="mainLoading" />
</template>
@@ -44,7 +45,7 @@
<el-dialog
v-model="proAddOrUpdDialogVisible"
:before-close="proAddOrUpdDialogClose"
- width="80%"
+ width="50%"
title="鏂板闂"
>
<CompProblemAddOrUpd
@@ -58,7 +59,6 @@
<ArbitraryPhoto
v-if="anyPhotoDialog"
v-model:dialog-visible="anyPhotoDialog"
- title="鍦烘櫙鍥剧墖"
:readonly="true"
:subtask="curSubtask.data"
ref="arbitraryPhotoRef"
@@ -134,7 +134,7 @@
click: () => {
this.openDeviceShowDialog();
}
- },
+ }
// {
// name: '鎵归噺瀹℃牳',
// color: 'primary',
@@ -307,10 +307,12 @@
});
},
// 闂鍗＄墖缁勪欢涓诲姩鍙戣捣鍒锋柊鐖剁粍浠舵暟鎹�
- updateSubtask() {
+ updateSubtask(refresh = true) {
this.curSubtask.data.proCheckedNum++;
this.curSubtask.type = this.getSubtaskType(this.curSubtask.data);
- this.refreshCurrSubtask();
+ if (refresh) {
+ this.refreshCurrSubtask();
+ }
},
onProSubmited(isOk) {
this.proAddOrUpdDialogClose();
--
Gitblit v1.9.3