Merge branch 'guangxi' of http://121.36.37.70:3000/shaojiahao/examSystem-Anxin into guangxi

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);
     })
   }
 

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
 

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>