+
得分(最高分{{data.paperPlanInfo.score}}分):
-
+
diff --git a/src/app/examiner/review-files/review-files.component.ts b/src/app/examiner/review-files/review-files.component.ts
index e6dcc2e..1053b5e 100644
--- a/src/app/examiner/review-files/review-files.component.ts
+++ b/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,72 +352,94 @@ 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
- }
- })
- if(!index){
- this.oldData.push(
- {
- name:e.name,
- oldIsRight:e.isRight,
- newIsRight:data.isChecked
- }
- )
- }
- console.log(this.oldData);
-
- e.isRight = data.isChecked;
- this.getPaperGrade();
+ dialogRef.afterClosed().subscribe((res) => {
+ if (!res) {
+ return;
+ }
+ 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: res.isChecked,
+ });
+ } else {
+ //如果数组中已经有值 说明改过但又改回来了
+ this.correctionRecordData[correctionRecordDataIndex].data.splice(
+ isFind,
+ 1
+ );
}
+ 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
- }
- })
- if(!index){
- this.oldData2.push(
- {
- name:e.id,
- oldIsScore:e.score,
- newIsScore:data.isScore
- }
- )
- }
- e.score = data.isScore
- this.getPaperGrade();
+ dialogRef.afterClosed().subscribe((res) => {
+ if (!res) {
+ return;
+ }
+ 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
+ );
}
-
+ 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) => {
@@ -597,14 +635,28 @@ export class editFractionComponent implements OnInit {
ngOnInit(): void {
console.log(this.data);
-
+
this.isScore = JSON.parse(JSON.stringify(this.data.score));
}
isScore: Number; //分数
submit() {
- let data = { isScore: this.isScore };
- this.dialogRef.close(data);
+ 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);
+ });
+ }
}
-}
\ No newline at end of file
+}