From d28223384922de5fb08c20516eb3f99981c8136a Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 22 十一月 2024 17:37:34 +0800
Subject: [PATCH] 1. 修复上传问题或整改图片后，界面更新错误问题； 2. 优化问题整改界面展示效果； 3. 场景图片对话框添加查看状态下可以点击图片放大功能

---
 src/views/fysp/check/ProCheck.vue |   48 +++++++++++++++++++++++-------------------------
 1 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index 30bfb48..411065c 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -9,6 +9,7 @@
     </template>
     <template #aside>
       <SideList
+        legend
         :items="subtasks"
         :loading="sideLoading"
         @item-click="chooseSubtask"
@@ -34,9 +35,10 @@
           :subtask="curSubtask.data"
           :topTask="topTask"
           @submit="updateSubtask"
+          @check="handleProblemCheck"
         ></CompProblemCard>
       </el-scrollbar>
-      <el-empty v-else description="鏆傛棤璁板綍" v-loading="mainLoading" />
+      <el-empty v-else description="鏆傛棤闂" v-loading="mainLoading" />
     </template>
   </BaseContentLayout>
   <CompProblemAddOrUpd
@@ -105,21 +107,23 @@
       buttons: [
         {
           name: '鏂板闂',
-          color: 'success',
+          // color: 'success',
+          color: 'primary',
           click: () => {
             this.proAddOrUpdDialogVisible = true;
           }
         },
         {
           name: '鍦烘櫙鍥剧墖',
-          color: 'warning',
+          // color: 'warning',
+          color: 'primary',
           click: () => {
             this.anyPhotoDialog = true;
           }
         },
         {
           name: '璁炬柦璁惧',
-          color: 'info',
+          color: 'primary',
           click: () => {
             this.openDeviceShowDialog();
           }
@@ -235,8 +239,9 @@
       taskApi.getSubtaskSummary(param).then((res) => {
         const list = [];
         res.forEach((s) => {
-          const t = this.getSubtaskType(s);
+          const t = ProCheckProxy.getSubtaskType(s);
           list.push({
+            status: s.subtask.status,
             type: t,
             title: s.stName,
             categoly: s.stPlanTime.split('T')[0],
@@ -249,20 +254,6 @@
           this.mainLoading = false;
         }
       });
-    },
-    //鑾峰彇浠诲姟闂鐨勫鏍告儏鍐�
-    getSubtaskType(s) {
-      let type = 0;
-      if (s.proNum == 0) {
-        type = 2;
-      } else if (s.proCheckedNum == 0) {
-        type = 0;
-      } else if (s.proCheckedNum < s.proNum) {
-        type = 1;
-      } else {
-        type = 2;
-      }
-      return type;
     },
     //鐐瑰嚮宸︿晶鑿滃崟浠诲姟浜嬩欢
     chooseSubtask(s) {
@@ -280,13 +271,11 @@
           this.mainLoading = false;
         });
     },
-    onAddProCanceled() {
-      this.proAddOrUpdDialogVisible = false;
-    },
+    onAddProCanceled() {},
     // 闂鍗＄墖缁勪欢涓诲姩鍙戣捣鍒锋柊鐖剁粍浠舵暟鎹�
     updateSubtask(refresh = false) {
       this.curSubtask.data.proCheckedNum++;
-      this.curSubtask.type = this.getSubtaskType(this.curSubtask.data);
+      this.curSubtask.type = ProCheckProxy.getSubtaskType(this.curSubtask.data);
       if (this.proAddOrUpdDialogVisible) {
         this.proAddOrUpdDialogVisible = false;
       }
@@ -295,8 +284,8 @@
     // 鍒锋柊褰撳墠閫変腑瀛愪换鍔�
     refreshCurrSubtask(refresh) {
       this.sideLoading = false;
-      this.mainLoading = true;
       setTimeout(() => {
+        this.mainLoading = true;
         taskApi
           .getProBySubtask(this.curSubtask.data.stGuid)
           .then((res) => {
@@ -319,7 +308,16 @@
           .finally(() => {
             this.mainLoading = false;
           });
-      }, 150);
+      }, 500);
+    },
+    // 闂瀹℃牳瀹屾垚鍚庯紝鏇存柊宸︿晶鍒楄〃瀵瑰簲瀛愪换鍔＄姸鎬�
+    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 = ProCheckProxy.getSubtaskType(this.curSubtask.data);
     }
   },
   mounted() {}

--
Gitblit v1.9.3