From 0bc7b61d3cdcbf1fc19883e32171cfdf603ed2a5 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Fri, 24 May 2024 22:54:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../examManagement/examManagement.vue         |  6 +--
 .../examSystem2/trainRecord/trainPlan.vue     | 42 ++++++-------------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/views/projectFront/examSystem2/examManagement/examManagement.vue b/src/views/projectFront/examSystem2/examManagement/examManagement.vue
index dd51a7f6..b62d1510 100644
--- a/src/views/projectFront/examSystem2/examManagement/examManagement.vue
+++ b/src/views/projectFront/examSystem2/examManagement/examManagement.vue
@@ -859,15 +859,15 @@ export default {
             })
           } else {
             // this.examForm.questions = this.$refs.questionListTable.selection;
-            console.log(this.examForm.questions,886633)
             if(this.$refs.questionListTable){
               this.examForm.questions = this.$refs.questionListTable.selection;
             } else {
               let arr = [];
               this.questionList.map(item => {
                 this.examForm.questions.split(',').map(item2 => {
-                  if(item.id === item){
-                    arr.push({id: item,type: item2.type})
+                  if(item.id === item2){
+                    // arr.push({id: item.id,type: item.type})
+                    arr.push(item)
                   }
                 })
               })
diff --git a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
index 94020052..40733994 100644
--- a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
+++ b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
@@ -387,6 +387,7 @@ export default {
                     this.$refs.examForm.resetFields()
                 }
                 this.selectWorkerList = []
+                this.selectedWorkerList = []
             }
         },
         // subjectId(newV,oldV){
@@ -443,42 +444,24 @@ export default {
                 this.$message.success('删除成功!');
             }
         },
-        addlocal(){
-            this.getWorkerInfoList();
+        async addlocal(){
+            await this.getWorkerInfoList();
             
             
             setTimeout(() => {
                 this.$nextTick(() => {
-    
-                    // for(let i=0;i<this.workerList.length;i++ ){
-                    //     for(let j=0;i<this.selectedWorkerList.length;j++){
-                    //         if(this.workerList[i].id == this.selectedWorkerList[j].id){
-                    //             console.log(this.workerList[i])
-                    //             console.log(this.selectedWorkerList[j])
-                    //             this.$refs.multipleTable.toggleRowSelection(this.workerList[i],true)
-                    //         }
-                    //     }
-                    // }
-    
-                    // this.workerList.map((item,index) => {
-                    //     this.selectedWorkerList.map((item2,index2) => {
-                    //         if(item.id === item2.id){
-                    //             this.$refs.multipleTable.toggleRowSelection(this.workerList[index],true)
-                    //         }
-                    //     })
-                    // })
+                    for(let i=0;i<this.workerList.length;i++ ){
+                        for(let j=0;j<this.selectedWorkerList.length;j++){
+                            if(this.workerList[i].id == this.selectedWorkerList[j].id){
+                                console.log(this.workerList[i])
+                                console.log(this.selectedWorkerList[j])
+                                this.$refs.multipleTable.toggleRowSelection(this.workerList[i],true)
+                            }
+                        }
+                    }
                 })
             },10)
             this.dialogVisible3 = true;
-            // this.$nextTick(() => {
-            //     for(let i=0;i<this.questionList.length;i++){
-            //         for(let j = 0;j<tempStr.length;j++){
-            //             if(tempStr[j] == this.questionList[i].id){
-            //                 this.$refs.questionListTable.toggleRowSelection(this.questionList[i],true)
-            //             }
-            //         }
-            //     }
-            // })
         },
         localSubmitBtn(){
             this.selectedWorkerList = this.$refs.multipleTable.selection
@@ -801,6 +784,7 @@ export default {
                             this.dialogVisible = false
                             this.getRecordList()
                             this.selectWorkerList = []
+                            this.selectedWorkerList = []
                         })
                     } else {
                         // upSubdivisionProjectApi(this.workerInfo).then((res) => {

From 638884e85dd40ac9670ef8260e8ea92d2970084b Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Fri, 24 May 2024 23:10:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../examSystem2/trainRecord/trainPlan.vue     | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
index 40733994..7ed64d4f 100644
--- a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
+++ b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
@@ -481,7 +481,7 @@ export default {
             this.dialogVisible3= false;
            
         },
-        inquire(flag){
+        async inquire(flag){
             this.worker.pageNo = 1;
 
             if(flag == 2) {
@@ -493,7 +493,22 @@ export default {
                 // this.workerInfo.teamId = "";
                 // this.$refs.searchRef.resetFields
             }
-            this.getWorkerInfoList();
+            await this.getWorkerInfoList();
+
+            setTimeout(() => {
+                this.$nextTick(() => {
+                    for(let i=0;i<this.workerList.length;i++ ){
+                        for(let j=0;j<this.selectedWorkerList.length;j++){
+                            if(this.workerList[i].id == this.selectedWorkerList[j].id){
+                                console.log(this.workerList[i])
+                                console.log(this.selectedWorkerList[j])
+                                this.$refs.multipleTable.toggleRowSelection(this.workerList[i],true)
+                            }
+                        }
+                    }
+                })
+            },10)
+
         },
         async getWorkerInfoList (){
             // this.workerInfo.departmentAndTeam.gtMaterialDepartmentTeamId = ''