From 546d0771b90a399347d886c13e314bb6e5f76938 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期三, 20 十一月 2024 14:58:13 +0800
Subject: [PATCH] 多写了一个emits选项

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

diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index 8ca7913..cd3678f 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -22,57 +22,46 @@
         :loading="mainLoading"
       ></ToolBar>
       <el-scrollbar
-        v-if="curProList.length > 0"
-        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>
-      </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>
-  <el-dialog
-    v-model="proAddOrUpdDialogVisible"
-    :before-close="proAddOrUpdDialogClose"
-    width="80%"
+  <CompProblemAddOrUpd
     title="鏂板闂"
-  >
-    <CompProblemAddOrUpd
-      v-if="proAddOrUpdDialogVisible"
-      :subtask="curSubtask.data"
-      :topTask="topTask"
-      ref="compProblemAddOrUpdRef"
-      @submited="newProSubmit"
-    />
-  </el-dialog>
+    v-if="proAddOrUpdDialogVisible"
+    v-model:visible="proAddOrUpdDialogVisible"
+    :subtask="curSubtask.data"
+    :topTask="topTask"
+    ref="compProblemAddOrUpdRef"
+    @submit="updateSubtask"
+  />
   <ArbitraryPhoto
     v-if="anyPhotoDialog"
     v-model:dialog-visible="anyPhotoDialog"
-    title="鍦烘櫙鍥剧墖"
     :readonly="true"
     :subtask="curSubtask.data"
     ref="arbitraryPhotoRef"
   ></ArbitraryPhoto>
-  <el-drawer
-    direction="ltr"
-    v-model="deviceShowDialog"
-    :before-close="beforeDeviceShowDialogclose"
+  <CompDeviceShowTest
     title="璁炬柦璁惧"
-    size="45%"
+    v-model:visible="deviceShowDialog"
+    v-if="deviceShowDialog"
+    ref="deviceShowRef"
   >
-    <CompDeviceShowTest v-if="deviceShowDialog" ref="deviceShowRef">
-    </CompDeviceShowTest>
-  </el-drawer>
+  </CompDeviceShowTest>
 </template>
 
 <script>
@@ -93,7 +82,6 @@
   },
   data() {
     return {
-      compProblemCardVisible: true,
       // 璁惧鍥�
       deviceShowDialog: false,
       // 浠绘剰鍥�
@@ -134,7 +122,7 @@
           click: () => {
             this.openDeviceShowDialog();
           }
-        },
+        }
         // {
         //   name: '鎵归噺瀹℃牳',
         //   color: 'primary',
@@ -232,21 +220,6 @@
         this.$refs.deviceShowRef.init(this.curSubtask.data.scene);
       });
     },
-    // 鍏抽棴璁惧鍥惧脊绐�
-    beforeDeviceShowDialogclose(done) {
-      // this.deviceShowDialog = false;
-      done();
-    },
-    // 鍏抽棴浠绘剰鍥剧墖寮圭獥
-    beforeAnyPhotoDialogclose() {
-      this.anyPhotoDialog = false;
-    },
-    handleCloseCheckAnyPhono() {
-      this.beforeAnyPhotoDialogclose();
-    },
-    proAddOrUpdDialogClose() {
-      this.proAddOrUpdDialogVisible = false;
-    },
     //鏌ヨ瀛愪换鍔＄粺璁′俊鎭�
     search(formSearch) {
       this.topTask = formSearch.topTask;
@@ -307,40 +280,40 @@
         });
     },
     // 闂鍗＄墖缁勪欢涓诲姩鍙戣捣鍒锋柊鐖剁粍浠舵暟鎹�
-    updateSubtask() {
+    updateSubtask(refresh = false) {
       this.curSubtask.data.proCheckedNum++;
       this.curSubtask.type = this.getSubtaskType(this.curSubtask.data);
-      this.refreshCurrSubtask();
-    },
-    onProSubmited(isOk) {
-      this.proAddOrUpdDialogClose();
-      if (!isOk) {
-        return;
+      if (this.proAddOrUpdDialogVisible) {
+        this.proAddOrUpdDialogVisible = false
       }
-      this.updateSubtask();
-    },
-    newProSubmit(isOk) {
-      this.proAddOrUpdDialogVisible = false;
-      if (!isOk) {
-        return;
-      }
-      this.refreshCurrSubtask();
+      this.refreshCurrSubtask(refresh);
     },
     // 鍒锋柊褰撳墠閫変腑瀛愪换鍔�
-    refreshCurrSubtask() {
-      this.compProblemCardVisible = false;
+    refreshCurrSubtask(refresh) {
       this.sideLoading = false;
       this.mainLoading = true;
       setTimeout(() => {
         taskApi
           .getProBySubtask(this.curSubtask.data.stGuid)
           .then((res) => {
-            this.curProList = res;
+            if (refresh) {
+              this.curProList = res;
+              return;
+            }
+            const currProLen = this.curProList.length;
+            // 涓嶆敼鍙樻暟缁勫鍍忓紩鐢ㄧ殑鍓嶆彁涓嬮噸鏂拌祴鍊�
+            for (let index = 0; index < res.length; index++) {
+              const element = res[index];
+              if (currProLen < index + 1) {
+                this.curProList.push(element);
+              } else {
+                this.curProList[index] = element;
+              }
+            }
             // this.curSubtask = s;
           })
           .finally(() => {
             this.mainLoading = false;
-            this.compProblemCardVisible = true;
           });
       }, 150);
     }

--
Gitblit v1.9.3