From 65b74a0b7f2879ba7d3793313dac78963dc2dda2 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 17 May 2023 09:21:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=A4=84=E7=BD=AE?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/ui/collection-tools/examinationQuestions.ts  | 8 +++++++-
 src/app/ui/collection-tools/uploadDisposalNodes.html | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts
index 17c0ffc..9307fa3 100644
--- a/src/app/ui/collection-tools/examinationQuestions.ts
+++ b/src/app/ui/collection-tools/examinationQuestions.ts
@@ -392,9 +392,15 @@ export class uploadDisposalNodes {
   ) {}
   @ViewChild("nzTreeComponent", { static: false })
   nzTreeComponent!: NzTreeComponent;
-
+  defaultCheckedKeys = [];
   ngOnInit(): void {
     this.treeData = [...this.data.treeData];
+    let checkedArr = [];
+    // console.log(666, JSON.parse(sessionStorage.getItem("examNodeList")));
+    JSON.parse(sessionStorage.getItem("examNodeList")).forEach((element) => {
+      checkedArr.push(element.id);
+    });
+    this.defaultCheckedKeys = [...checkedArr];
   }
   treeData: any = []; //tree
 
diff --git a/src/app/ui/collection-tools/uploadDisposalNodes.html b/src/app/ui/collection-tools/uploadDisposalNodes.html
index 5b2939a..1a6715e 100644
--- a/src/app/ui/collection-tools/uploadDisposalNodes.html
+++ b/src/app/ui/collection-tools/uploadDisposalNodes.html
@@ -1,7 +1,8 @@
 <div id="disposalNodeTree">
   <div
     style="max-height: 500px;overflow-x: hidden;overflow-y: auto;margin-bottom: 25px;width: 330px;padding-right: 10px;">
-    <nz-tree #nzTreeComponent [nzData]="treeData" nzCheckable nzMultiple [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
+    <nz-tree #nzTreeComponent [nzData]="treeData" nzCheckable nzMultiple [nzTreeTemplate]="nzTreeTemplate"
+      [nzCheckedKeys]="defaultCheckedKeys"></nz-tree>
     <ng-template #nzTreeTemplate let-node let-origin="origin">
       <div id="terrNodePublic">
         <label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label>

From 1e8b63785f1429f650d2d73655929e8c1281ec12 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 17 May 2023 09:26:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=98=85=E5=8D=B7?=
 =?UTF-8?q?=E5=90=8E=E9=A1=B5=E9=9D=A2=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/examiner/review-files/review-files.component.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/examiner/review-files/review-files.component.ts b/src/app/examiner/review-files/review-files.component.ts
index 89f5e72..8a6c3fc 100644
--- a/src/app/examiner/review-files/review-files.component.ts
+++ b/src/app/examiner/review-files/review-files.component.ts
@@ -89,7 +89,7 @@ export class ReviewFilesComponent implements OnInit {
             const config = new MatSnackBarConfig();
             config.verticalPosition = 'top';
             config.duration = 5000
-            this.snackBar.open('刷新成功','确定',config);
+            // this.snackBar.open('刷新成功','确定',config);
           }
           resolve(1)
         })
@@ -290,7 +290,10 @@ export class ReviewFilesComponent implements OnInit {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 5000
-      this.snackBar.open('阅卷结果提交成功','确定',config);
+      this.snackBar.open('阅卷结果提交成功，页面将于一秒后关闭!','确定',config);
+      setTimeout(() => {
+        window.close()
+      }, 1000);
     })
   }