[完善]增加阅卷留痕功能

src/app/examiner/examiner.module.ts

@@ -79,6 +79,7 @@ import { ExamineePapersComponent } from "./statistic-analysis/examStatistics/exa
 import { ExamineeCapacityComponent } from "./statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component";
 import { NzRateModule } from "ng-zorro-antd/rate";
 import { EvaluateComponent } from "./review-files/evaluate/evaluate.component";
+import { ReviewRecordComponent } from './mark-papers-two/review-record/review-record.component';
 @NgModule({
   declarations: [
     CreateTestScoreComponent,
@@ -101,6 +102,7 @@ import { EvaluateComponent } from "./review-files/evaluate/evaluate.component";
     ExamineePapersComponent,
     ExamineeCapacityComponent,
     EvaluateComponent,
+    ReviewRecordComponent,
   ],
   imports: [
     CommonModule,

src/app/examiner/mark-papers-index/mark-papers-index.component.html

@@ -40,15 +40,15 @@
                     <td>{{item.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
                     <td>{{item.endTime|date:'yyyy-MM-dd HH:mm'}}</td>
                     <td>
-                        <span id={{item.name}} style="color: #07CDCF;cursor: pointer;" (click)="markTwo(item.title,item.id,item.organizationsName)">阅卷</span>
+                        <!-- <span (click)="look(item)">批阅记录</span> -->
+                        <span style="color: #07CDCF;cursor: pointer;"
+                            (click)="markTwo(item.title,item.id,item.organizationsName)">阅卷</span>
                     </td>
                 </tr>
             </tbody>
 
         </table>
-        <mat-paginator [length]="length"
-                [pageSize]="pageSize"
-                [pageSizeOptions]="pageSizeOptions"
+        <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
             (page)="chagePage($event)">
         </mat-paginator>
     </div>

src/app/examiner/mark-papers-index/mark-papers-index.component.ts

@@ -6,96 +6,161 @@
  * @LastEditors: sueRimn
  * @LastEditTime: 2021-01-04 16:53:04
  */
-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
-import {HttpClient} from '@angular/common/http'
-import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatTableDataSource } from '@angular/material/table';
-import { PageEvent } from '@angular/material/paginator';
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
-import {FormControl} from '@angular/forms';
-import { Router,ActivatedRoute } from '@angular/router';
+import { Component, OnInit, ViewChild, Inject } from "@angular/core";
+import { HttpClient } from "@angular/common/http";
+import {
+  MatDialogRef,
+  MatDialog,
+  MAT_DIALOG_DATA,
+} from "@angular/material/dialog";
+import { MatPaginator } from "@angular/material/paginator";
+import { MatTableDataSource } from "@angular/material/table";
+import { PageEvent } from "@angular/material/paginator";
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
+import { FormControl } from "@angular/forms";
+import { Router, ActivatedRoute } from "@angular/router";
 const ELEMENT_DATA = [
-  {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'未开考'},
-  {name: "富华酒店", organization: '黄埔支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'未开考'},
-  {name: "雁山园", organization: '徐汇支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'开考中'},
-  {name: "富华酒店", organization: '普陀支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'开考中'},
-  {name: "立新加油站", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'开考中'},
-  {name: "富华酒店", organization: '宝山支队', startTime: "2020-07-19 10:00", overTime: '2020-07-19 12:00',testState:'已结束'},
-  {name: "裕达国际酒店", organization: '浦东支队', startTime: "2020-08-19 10:00", overTime: '2020-08-19 12:00',testState:'已结束'},
-  {name: "锦德大酒店", organization: '长宁支队', startTime: "2019-09-19 10:00", overTime: '2019-09-19 12:00',testState:'已结束'},
+  {
+    name: "富华酒店",
+    organization: "浦东支队",
+    startTime: "2020-09-19 10:00",
+    overTime: "2020-09-19 12:00",
+    testState: "未开考",
+  },
+  {
+    name: "富华酒店",
+    organization: "黄埔支队",
+    startTime: "2020-09-19 10:00",
+    overTime: "2020-09-19 12:00",
+    testState: "未开考",
+  },
+  {
+    name: "雁山园",
+    organization: "徐汇支队",
+    startTime: "2020-09-19 10:00",
+    overTime: "2020-09-19 12:00",
+    testState: "开考中",
+  },
+  {
+    name: "富华酒店",
+    organization: "普陀支队",
+    startTime: "2020-09-19 10:00",
+    overTime: "2020-09-19 12:00",
+    testState: "开考中",
+  },
+  {
+    name: "立新加油站",
+    organization: "浦东支队",
+    startTime: "2020-09-19 10:00",
+    overTime: "2020-09-19 12:00",
+    testState: "开考中",
+  },
+  {
+    name: "富华酒店",
+    organization: "宝山支队",
+    startTime: "2020-07-19 10:00",
+    overTime: "2020-07-19 12:00",
+    testState: "已结束",
+  },
+  {
+    name: "裕达国际酒店",
+    organization: "浦东支队",
+    startTime: "2020-08-19 10:00",
+    overTime: "2020-08-19 12:00",
+    testState: "已结束",
+  },
+  {
+    name: "锦德大酒店",
+    organization: "长宁支队",
+    startTime: "2019-09-19 10:00",
+    overTime: "2019-09-19 12:00",
+    testState: "已结束",
+  },
 ];
 
 @Component({
-  selector: 'app-mark-papers-index',
-  templateUrl: './mark-papers-index.component.html',
-  styleUrls: ['./mark-papers-index.component.scss']
+  selector: "app-mark-papers-index",
+  templateUrl: "./mark-papers-index.component.html",
+  styleUrls: ["./mark-papers-index.component.scss"],
 })
 export class MarkPapersIndexComponent implements OnInit {
-
-  constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
+  constructor(
+    private router: Router,
+    private activatedRoute: ActivatedRoute,
+    public http: HttpClient,
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar
+  ) {}
 
   ngOnInit(): void {
-    this.getAlltabledate()
+    this.getAlltabledate();
   }
-  dataSource 
-  markName//试卷名称
-  markDate//考试日期
+  dataSource;
+  markName; //试卷名称
+  markDate; //考试日期
   //分页
   @ViewChild(MatPaginator, { static: true })
   pageEvent: PageEvent;
   paginator: MatPaginator;
   length: any; //共多少条数据
   pageSize: any; //每页条数
-  pageSizeOptions: number[] = [10] //设置每页条数
-  PageNumber:any //第几页
+  pageSizeOptions: number[] = [10]; //设置每页条数
+  PageNumber: any; //第几页
   //查询
   findClick() {
     let paramsdata: any = {
-      PageNumber: this.PageNumber || '1',
+      PageNumber: this.PageNumber || "1",
       PageSize: this.pageSizeOptions[0],
-      Title:this.markName||'',
-      StartTime:this.markDate||'',
+      Title: this.markName || "",
+      StartTime: this.markDate || "",
       Sort: null,
       SortType: null,
-    }
-    this.http.get(`/api/Papers`,{params:paramsdata}).subscribe((data:any)=>{
-      console.log(data)
-      this.dataSource=data.items
-    })
-    this.PageNumber = 1
-    this.pageEvent.pageIndex = 0
+    };
+    this.http
+      .get(`/api/Papers`, { params: paramsdata })
+      .subscribe((data: any) => {
+        console.log(data);
+        this.dataSource = data.items;
+      });
+    this.PageNumber = 1;
+    this.pageEvent.pageIndex = 0;
     //this.getAlltabledate()
   }
   //重置功能
   resert() {
-    this.markName=''
-    this.markDate=''
-    this.getAlltabledate()
+    this.markName = "";
+    this.markDate = "";
+    this.getAlltabledate();
   }
   //点击阅卷跳转
   markTwo(e, id, name) {
-    console.log(e)
-    this.router.navigate(['/home/mark-papers-index/mark-papers-two'],{queryParams:{'level':e,'id':id,'name':name}})
+    console.log(e);
+    this.router.navigate(["/home/mark-papers-index/mark-papers-two"], {
+      queryParams: { level: e, id: id, name: name },
+    });
   }
   //获取表格信息
   getAlltabledate() {
     let paramsdata: any = {
-      PageNumber: this.PageNumber || '1',
+      PageNumber: this.PageNumber || "1",
       PageSize: this.pageSizeOptions[0],
       Sort: null,
       SortType: null,
-    }
-    this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{
-      this.dataSource=data.items
-      this.length=data.totalCount
-      console.log(this.dataSource)
-    })
+    };
+    this.http
+      .get("/api/Papers", { params: paramsdata })
+      .subscribe((data: any) => {
+        this.dataSource = data.items;
+        this.length = data.totalCount;
+        console.log(this.dataSource);
+      });
   }
   //分页事件
   chagePage(e) {
-    this.PageNumber = e.pageIndex+1
-    this.getAlltabledate()
+    this.PageNumber = e.pageIndex + 1;
+    this.getAlltabledate();
+  }
+  look(item) {
+    console.log(item);
   }
-
 }

src/app/examiner/mark-papers-two/mark-papers-two.component.html

@@ -33,19 +33,19 @@
                     <td>{{item.examineeName}}</td>
                     <td>{{getname}}</td>
                     <td>{{item.endTime|date:'yyyy-MM-dd HH:mm'}}</td>
-                    <td [ngClass]="{'green': item.isMarked == true,'red':item.isMarked == false}">{{item.isMarked== true?"已阅卷":"未阅卷"}}</td>
+                    <td [ngClass]="{'green': item.isMarked == true,'red':item.isMarked == false}">{{item.isMarked==
+                        true?"已阅卷":"未阅卷"}}</td>
                     <td>{{item.totalScore}}</td>
                     <td>{{item.comment}}</td>
                     <td>
-                        <span style="color: #01CFD5;cursor: pointer;" (click)='reviewFiles(item)'>阅卷</span>
+                        <span (click)="look(item)">批阅记录</span>
+                        <span (click)='reviewFiles(item)'>阅卷</span>
                     </td>
                 </tr>
             </tbody>
 
         </table>
-        <mat-paginator [length]="length"
-                [pageSize]="pageSize"
-                [pageSizeOptions]="pageSizeOptions"
+        <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
             (page)="chagePage($event)">
         </mat-paginator>
     </div>

src/app/examiner/mark-papers-two/mark-papers-two.component.scss

@@ -1,6 +1,7 @@
 table {
   width: 100%;
   text-align: center;
+
   .cdk-header-cell {
     text-align: center;
   }
@@ -13,11 +14,13 @@ table {
   background: #F2F5F6;
   overflow-y: auto;
 }
+
 .header {
   width: 100%;
   padding: 10px;
   margin-bottom: 10px;
   box-sizing: border-box;
+
   .queryBox {
     box-sizing: border-box;
     padding: 5px 15px;
@@ -26,9 +29,11 @@ table {
     flex-wrap: wrap;
     align-items: center;
     justify-content: left;
+
     .queryField {
       margin: 0 25px;
       font-size: 14px;
+
       input {
         width: 320px;
         height: 44px;
@@ -38,6 +43,7 @@ table {
         outline: none;
         border: 1px solid rgb(226, 211, 211);
       }
+
       button {
         border: none;
         color: white;
@@ -52,44 +58,70 @@ table {
         outline: 0 none !important;
       }
     }
+
     .headerright {
       float: right;
     }
-    } //queryBox
   }
+
+  //queryBox
+}
+
 .centertable {
   width: 95%;
   margin-right: 40px;
   margin-left: 40px;
   background-color: #FFFFFF;
+
   table {
-      td,th{
+
+    td,
+    th {
       height: 48px;
       font-size: 16px;
     }
+
     td {
       border-bottom: 1px solid #F2F5F6;
     }
+
     thead {
       background-color: #F5FDFE;
     }
+
     .green {
       color: #07CDCF;
     }
+
     .red {
       color: #FF8678;
     }
   }
+
+  span {
+    cursor: pointer;
+    margin: 0 5px;
+    color: #01CFD5
+  }
 }
 
 .operationSpan {
   margin: 0 10px;
+
   .spanbtn {
     font-weight: 550;
     cursor: pointer;
   }
-    .green{ color: #04ced1; }
-    .red{ color: #FF8678 }
-    .gray{ color: gray; }
+
+  .green {
+    color: #04ced1;
+  }
+
+  .red {
+    color: #FF8678
   }
 
+  .gray {
+    color: gray;
+  }
+}

src/app/examiner/mark-papers-two/mark-papers-two.component.ts

@@ -19,6 +19,7 @@ import { PageEvent } from "@angular/material/paginator";
 import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
 import { FormControl } from "@angular/forms";
 import { Router, ActivatedRoute } from "@angular/router";
+import { ReviewRecordComponent } from "./review-record/review-record.component";
 
 @Component({
   selector: "app-mark-papers-two",
@@ -96,4 +97,9 @@ export class MarkPapersTwoComponent implements OnInit {
   reviewFiles(e) {
     window.open(`/reviewFiles?examId=${e.id}&paperType=1`);
   }
+  look(item) {
+    console.log(item);
+    const dialogRef = this.dialog.open(ReviewRecordComponent, { data: item });
+    dialogRef.afterClosed().subscribe((res) => {});
+  }
 }

src/app/examiner/mark-papers-two/review-record/review-record.component.html

@@ -0,0 +1,28 @@
+<div class="box">
+    <h1>批改记录</h1>
+    <div class="content" *ngFor="let item of this.modifyHistory">
+        <div class="itembox">
+            <span>批改人:</span>
+            <div>
+                {{item.modifiedBy.realName}}
+            </div>
+        </div>
+        <div class="itembox">
+            <span>批改时间:</span>
+            <div>
+                {{item.modifiedTime | date:'yyyy-MM-dd HH:mm'}}
+            </div>
+        </div>
+        <div class="itembox">
+            <span>批改内容:</span>
+            <div>
+                <div *ngFor="let i of item.data">
+                    <p style="color: #1890ff;">{{i.name}} : </p>
+                    <p *ngFor="let e of i.data">
+                        <span>{{e.name}} : </span>由{{ e.oldIsRight }}修改为{{ e.newIsRight }}
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

src/app/examiner/mark-papers-two/review-record/review-record.component.scss

@@ -0,0 +1,29 @@
+.box {
+  width: 550px;
+  font-size: 14px;
+  max-height: 500px;
+  overflow-y: auto;
+}
+h1{
+    font-weight: 600;
+    text-align: center;
+}
+.content {
+  box-sizing: border-box;
+  padding: 12px 0;
+  border-bottom: 1px dashed rgb(182, 180, 180);
+}
+
+.itembox {
+  display: flex;
+
+  span {
+    margin-right: 6px;
+  }
+
+  div {
+    p {
+      margin-bottom: 3px;
+    }
+  }
+}

src/app/examiner/mark-papers-two/review-record/review-record.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ReviewRecordComponent } from './review-record.component';
+
+describe('ReviewRecordComponent', () => {
+  let component: ReviewRecordComponent;
+  let fixture: ComponentFixture<ReviewRecordComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ReviewRecordComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ReviewRecordComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/examiner/mark-papers-two/review-record/review-record.component.ts

@@ -0,0 +1,56 @@
+import { HttpClient } from "@angular/common/http";
+import { Component, OnInit, Inject } from "@angular/core";
+import {
+  MAT_DIALOG_DATA,
+  MatDialog,
+  MatDialogRef,
+} from "@angular/material/dialog";
+import { MatSnackBar } from "@angular/material/snack-bar";
+
+@Component({
+  selector: "app-review-record",
+  templateUrl: "./review-record.component.html",
+  styleUrls: ["./review-record.component.scss"],
+})
+export class ReviewRecordComponent implements OnInit {
+  constructor(
+    public http: HttpClient,
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar,
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    public dialogRef: MatDialogRef<any>
+  ) {}
+
+  modifyHistory = [];
+  ngOnInit(): void {
+    console.log(this.data);
+    this.http
+      .get(`/api/Examinations/${this.data.id}`)
+      .subscribe((data: any) => {
+        if (!data.modifyHistory) {
+          return;
+        }
+        let modifyHistory = JSON.parse(data.modifyHistory);
+        modifyHistory.forEach((element) => {
+          element.data.forEach((item) => {
+            item.data.forEach((i) => {
+              if (i.name.indexOf("作战部署") == -1) {
+                i.oldIsRight
+                  ? (i.oldIsRight = "正确")
+                  : (i.oldIsRight = "错误");
+                i.newIsRight
+                  ? (i.newIsRight = "正确")
+                  : (i.newIsRight = "错误");
+              }else{
+                i.oldIsRight = i.oldIsRight+'分'
+                i.newIsRight = i.newIsRight+'分'
+              }
+            });
+          });
+        });
+        this.modifyHistory = modifyHistory.reverse();
+
+        console.log(888, this.modifyHistory);
+      });
+  }
+}

src/app/examiner/review-files/editFraction.html

@@ -1,6 +1,7 @@
 <div class="editRightWrong">
+  <p style="margin-bottom: 12px;">得分(最高分{{data.paperPlanInfo.score}}分):</p>
   <div class="content">
-    <input type="text" [(ngModel)]="isScore">
+    <input type="number" [(ngModel)]="isScore">
   </div>
   <div mat-dialog-actions>
     <button mat-raised-button color="primary" (click)='submit()'>确定</button>

src/app/examiner/review-files/review-files.component.ts

@@ -9,7 +9,6 @@ import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
 import { ActivatedRoute } from "@angular/router";
 import { EvaluateComponent } from "./evaluate/evaluate.component";
 
-
 @Component({
   selector: "app-review-files",
   templateUrl: "./review-files.component.html",
@@ -36,6 +35,7 @@ export class ReviewFilesComponent implements OnInit {
       let isHidden = document.hidden;
       if (!isHidden) {
         this.getUnitPlans(false);
+        // console.log("此HTML标签焦点事件", this.correctionRecordData);
       }
     });
   }
@@ -352,73 +352,95 @@ export class ReviewFilesComponent implements OnInit {
       //forEach
     });
   }
-  oldData=[] //基本信息
+  correctionRecordData = []; //批改记录
   //修改结果
   editResults(e) {
+    console.log("e", e);
     let data = e;
     const dialogRef = this.dialog.open(editRightWrongComponent, { data });
-    dialogRef.afterClosed().subscribe((data) => {
-      if (data) {
-        let index=0
-        if (e.isRight != data.isChecked) {
-          this.oldData.forEach((element:any,i)=>{
-            if(element.name==e.name){
-              // element.oldIsRight=e.isRight
-              // element.newIsRight=data.isChecked
-              this.oldData.splice(i, 1)
-              index++
-              return
+    dialogRef.afterClosed().subscribe((res) => {
+      if (!res) {
+        return;
       }
-          })
-          if(!index){
-            this.oldData.push(
-              {
+      let isExist = this.correctionRecordData.findIndex(
+        (item) => item.name === this.selectPaper.companyInfo.name
+      );
+      let correctionRecordDataIndex;
+      if (isExist !== -1) {
+        correctionRecordDataIndex = isExist;
+      } else {
+        this.correctionRecordData.push({
+          name: this.selectPaper.companyInfo.name,
+          data: [],
+        });
+        correctionRecordDataIndex = this.correctionRecordData.length - 1;
+      }
+      //如果值变了
+      if (e.isRight != res.isChecked) {
+        let isFind = this.correctionRecordData[
+          correctionRecordDataIndex
+        ].data.findIndex((ele) => ele.name === e.name);
+        if (isFind === -1) {
+          this.correctionRecordData[correctionRecordDataIndex].data.push({
             name: e.name,
             oldIsRight: e.isRight,
-                newIsRight:data.isChecked
-              }
-            )
+            newIsRight: res.isChecked,
+          });
+        } else {
+          //如果数组中已经有值 说明改过但又改回来了
+          this.correctionRecordData[correctionRecordDataIndex].data.splice(
+            isFind,
+            1
+          );
         }
-          console.log(this.oldData);
-          
-          e.isRight = data.isChecked;
+        e.isRight = res.isChecked;
         this.getPaperGrade();
       }
-      }
     });
   }
-  oldData2=[] //作战部署
   editFraction(e) {
+    console.log("e", e);
     let data = e;
-    console.log(e);
-    
     const dialogRef = this.dialog.open(editFractionComponent, { data });
-    dialogRef.afterClosed().subscribe((data) => {
-      if (data) {
-        if (e.score != data.isScore) {
-          let index=0
-          this.oldData2.forEach((element:any,i)=>{
-            if(element.id==e.name){
-              element.newIsScore=data.isScore
-              this.oldData2.splice(i, 1)
-              index++
-              return
+    dialogRef.afterClosed().subscribe((res) => {
+      if (!res) {
+        return;
       }
-          })
-          if(!index){
-            this.oldData2.push(
-              {
-                name:e.id,
-                oldIsScore:e.score,
-                newIsScore:data.isScore
-              }
-            )
+      let isExist = this.correctionRecordData.findIndex(
+        (item) => item.name === this.selectPaper.companyInfo.name
+      );
+      let correctionRecordDataIndex;
+      if (isExist !== -1) {
+        correctionRecordDataIndex = isExist;
+      } else {
+        this.correctionRecordData.push({
+          name: this.selectPaper.companyInfo.name,
+          data: [],
+        });
+        correctionRecordDataIndex = this.correctionRecordData.length - 1;
+      }
+      //如果值变了
+      if (e.score != res.isScore) {
+        let isFind = this.correctionRecordData[
+          correctionRecordDataIndex
+        ].data.findIndex((ele) => ele.name === e.name);
+        if (isFind === -1) {
+          this.correctionRecordData[correctionRecordDataIndex].data.push({
+            name: "作战部署-" + e.paperPlanInfo.title,
+            oldIsRight: e.score,
+            newIsRight: res.isScore,
+          });
+        } else {
+          //如果数组中已经有值 说明改过但又改回来了
+          this.correctionRecordData[correctionRecordDataIndex].data.splice(
+            isFind,
+            1
+          );
         }
-          e.score = data.isScore
+        console.log(this.correctionRecordData);
+        e.score = res.isScore;
         this.getPaperGrade();
       }
-        
-      }
     });
   }
   //刷新预案设定表格
@@ -458,7 +480,7 @@ export class ReviewFilesComponent implements OnInit {
     dialogRef.afterClosed().subscribe((result) => {
       // console.log("The dialog was closed", result);
       if (result.type) {
-        let bodyData = {
+        let bodyData: any = {
           id: this.paperData.id,
           isMarked: true,
           totalScore: 0,
@@ -507,8 +529,24 @@ export class ReviewFilesComponent implements OnInit {
           element.importLocationData = JSON.stringify(
             element.importLocationData
           );
+
+          console.log(this.correctionRecordData);
+
+          // console.log("element", element);
         });
+        // console.log(456, this.paperData);
+        let arr = [];
+        if (this.paperData.modifyHistory) {
+          arr = JSON.parse(this.paperData.modifyHistory);
+        }
+        let obj = {
+          modifiedBy: JSON.parse(sessionStorage.getItem("creatorData")),
+          modifiedTime: new Date(),
+          data: this.correctionRecordData,
+        };
+        arr.push(obj);
         bodyData.examinationDataInfo = paramsData;
+        bodyData.modifyHistory = JSON.stringify(arr);
         this.http
           .put(`/api/Examinations/${this.paperData.id}`, bodyData)
           .subscribe((data) => {
@@ -604,7 +642,21 @@ export class editFractionComponent implements OnInit {
   isScore: Number; //分数
 
   submit() {
+    if (this.isScore > this.data.paperPlanInfo.score) {
+      alert("超出最大分值!");
+    } else {
+      let params: any = {
+        paperPlanId: this.data.paperPlanId,
+        examinationId: this.data.examinationId,
+        score: this.isScore,
+        remark: this.data.remark,
+      };
+      this.http
+        .put("/api/ExaminationPlans/ModifyScore", "", { params: params })
+        .subscribe((res) => {
           let data = { isScore: this.isScore };
           this.dialogRef.close(data);
+        });
+    }
   }
 }