From c4bcc6e78ecaec6e9ea68802be7c1d3a7b063512 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 13:08:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-dataproduct-v1112' into lsf-dataproduct-1024

---
 src/views/fysp/check/ProCheck.vue |   74 ++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index cd3678f..0e1c719 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -22,20 +22,21 @@
         :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"
+          @check="handleProblemCheck"
+        ></CompProblemCard>
+      </el-scrollbar>
       <el-empty v-else description="鏆傛棤璁板綍" v-loading="mainLoading" />
     </template>
   </BaseContentLayout>
@@ -46,6 +47,7 @@
     :subtask="curSubtask.data"
     :topTask="topTask"
     ref="compProblemAddOrUpdRef"
+    @cancel="onAddProCanceled"
     @submit="updateSubtask"
   />
   <ArbitraryPhoto
@@ -252,14 +254,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,19 +300,21 @@
           this.mainLoading = false;
         });
     },
+    onAddProCanceled() {
+    },
     // 闂鍗＄墖缁勪欢涓诲姩鍙戣捣鍒锋柊鐖剁粍浠舵暟鎹�
     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);
     },
     // 鍒锋柊褰撳墠閫変腑瀛愪换鍔�
     refreshCurrSubtask(refresh) {
       this.sideLoading = false;
-      this.mainLoading = true;
+      // this.mainLoading = true;
       setTimeout(() => {
         taskApi
           .getProBySubtask(this.curSubtask.data.stGuid)
@@ -313,9 +336,18 @@
             // this.curSubtask = s;
           })
           .finally(() => {
-            this.mainLoading = false;
+            // this.mainLoading = false;
           });
       }, 150);
+    },
+    // 闂瀹℃牳瀹屾垚鍚庯紝鏇存柊宸︿晶鍒楄〃瀵瑰簲瀛愪换鍔＄姸鎬�
+    handleProblemCheck(){
+      const status = ProCheckProxy.calProStatus(this.curProList)
+      this.curSubtask.data.proNum = status.proNum
+      this.curSubtask.data.proCheckedNum = status.proCheckedNum
+      this.curSubtask.data.changeNum = status.changeNum
+      this.curSubtask.data.changeCheckedNum = status.changeCheckedNum
+      this.curSubtask.type = this.getSubtaskType(this.curSubtask.data)
     }
   },
   mounted() {}

--
Gitblit v1.9.3