From f37d45b8998ea08a42002579ecc103244bdac17b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 11:06:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/views/fysp/check/ProCheck.vue | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index cd3678f..f35f1e0 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -22,20 +22,20 @@
:loading="mainLoading"
></ToolBar>
<el-scrollbar
- v-if="curProList.length > 0"
- class="el-scrollbar"
- v-loading="mainLoading"
- >
- <CompProblemCard
- :key="i"
- v-for="(p, i) in curProList"
- :index="i + 1"
- :problem="p"
- :subtask="curSubtask.data"
- :topTask="topTask"
- @submit="updateSubtask"
- ></CompProblemCard>
- </el-scrollbar>
+ v-if="curProList.length > 0"
+ class="el-scrollbar"
+ v-loading="mainLoading"
+ >
+ <CompProblemCard
+ :key="i"
+ v-for="(p, i) in curProList"
+ :index="i + 1"
+ :problem="p"
+ :subtask="curSubtask.data"
+ :topTask="topTask"
+ @submit="updateSubtask"
+ ></CompProblemCard>
+ </el-scrollbar>
<el-empty v-else description="鏆傛棤璁板綍" v-loading="mainLoading" />
</template>
</BaseContentLayout>
@@ -46,6 +46,7 @@
:subtask="curSubtask.data"
:topTask="topTask"
ref="compProblemAddOrUpdRef"
+ @cancel="onAddProCanceled"
@submit="updateSubtask"
/>
<ArbitraryPhoto
@@ -252,14 +253,33 @@
//鑾峰彇浠诲姟闂鐨勫鏍告儏鍐�
getSubtaskType(s) {
let type = 0;
+ // 鏃犻棶棰�
if (s.proNum == 0) {
- type = 2;
- } else if (s.proCheckedNum == 0) {
type = 0;
- } else if (s.proCheckedNum < s.proNum) {
+ }
+ // 闂鏈鏍�
+ else if (s.proCheckedNum == 0) {
type = 1;
- } else {
+ }
+ // 闂閮ㄥ垎瀹℃牳
+ else if (s.proCheckedNum < s.proNum) {
type = 2;
+ }
+ // 鏈暣鏀�
+ else if (s.changeNum < s.proNum) {
+ type = 3;
+ }
+ // 鏁存敼鏈鏍�
+ else if (s.changeCheckedNum == 0) {
+ type = 4;
+ }
+ // 鏁存敼閮ㄥ垎瀹℃牳
+ else if (s.changeCheckedNum < s.changeNum) {
+ type = 5;
+ }
+ // 瀹屽叏瀹℃牳
+ else {
+ type = 6;
}
return type;
},
@@ -279,12 +299,15 @@
this.mainLoading = false;
});
},
+ onAddProCanceled() {
+ this.proAddOrUpdDialogVisible = false;
+ },
// 闂鍗＄墖缁勪欢涓诲姩鍙戣捣鍒锋柊鐖剁粍浠舵暟鎹�
updateSubtask(refresh = false) {
this.curSubtask.data.proCheckedNum++;
this.curSubtask.type = this.getSubtaskType(this.curSubtask.data);
if (this.proAddOrUpdDialogVisible) {
- this.proAddOrUpdDialogVisible = false
+ this.proAddOrUpdDialogVisible = false;
}
this.refreshCurrSubtask(refresh);
},
--
Gitblit v1.9.3