From be7945b0f6d6a08a396172009a2455cab9065768 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Mon, 18 Jan 2021 11:04:29 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E8=80=83=E5=AE=98?=
 =?UTF-8?q?=E9=98=85=E5=8D=B7=E6=8F=90=E4=BA=A4=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../review-files/review-files.component.ts         |  4 ++--
 .../collection-tools/collection-tools.component.ts | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/app/examiner/review-files/review-files.component.ts b/src/app/examiner/review-files/review-files.component.ts
index b202af7..60084e4 100644
--- a/src/app/examiner/review-files/review-files.component.ts
+++ b/src/app/examiner/review-files/review-files.component.ts
@@ -228,7 +228,8 @@ export class ReviewFilesComponent implements OnInit {
 
   //提交阅卷结果
   submitResult () {
-    let bodyData = { 
+    let bodyData = {
+      id: this.paperData.id,
       isMarked: true,
       totalScore: 0,
       examinationDataInfo: [],
@@ -268,7 +269,6 @@ export class ReviewFilesComponent implements OnInit {
     bodyData.examinationDataInfo = paramsData
     console.log(bodyData)
     this.http.put(`/api/Examinations/${this.paperData.id}`,bodyData).subscribe(data=>{
-      console.log(data)
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 5000
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 3e91076..9be68c3 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -1250,12 +1250,7 @@ export class CollectionToolsComponent implements OnInit {
       this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
       this.canvasData.originaleveryStoreyData.sitePlanId? null : this.canvasData.originaleveryStoreyData.sitePlanId = e.id || null
       this.renovateTreeData()
-      // this.canvas.onExaminerClickFloor()
-      this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
-      this.canvas.createFloorShape(this.canvasData.originaleveryStoreyData.data);
-      this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data);
-      // 隐藏基本信息图形
-      this.canvas.setNameVisible(false, 0);
+      this.canvas.onExaminerClickFloor_CreateTestpaper()
     })
   }
 
@@ -1281,12 +1276,7 @@ export class CollectionToolsComponent implements OnInit {
       this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
       this.canvasData.originaleveryStoreyData.buildingAreaId? null : this.canvasData.originaleveryStoreyData.buildingAreaId = e.id || null
       this.renovateTreeData()
-      // this.canvas.onExaminerClickFloor()
-      this.canvas.createBackground(this.canvasData.selectStorey.imageUrl, this.canvasData.selectStorey.imageAngle);
-      this.canvas.createFloorShape(this.canvasData.originaleveryStoreyData.data);
-      this.canvas.createNodeShape(this.canvasData.selectPanelPoint.Data);
-      // 隐藏基本信息图形
-      this.canvas.setNameVisible(false, 0);
+      this.canvas.onExaminerClickFloor_CreateTestpaper()
     })
   }