From f4740a1bb8064502b399b6b781408c960edcb8d9 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Tue, 29 Dec 2020 15:19:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E8=80=83=E5=AE=98?= =?UTF-8?q?=E8=80=83=E7=94=9F=E7=9A=84=E8=80=83=E6=A0=B8=E5=AF=B9=E6=88=98?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9C=9F=E5=AE=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examiner/examiner-index/examiner-index.component.html | 4 ++-- .../examiner/examiner-index/examiner-index.component.ts | 2 +- .../mark-papers-index/mark-papers-index.component.html | 6 +++--- .../mark-papers-index/mark-papers-index.component.ts | 6 +++--- .../mark-papers-two/mark-papers-two.component.html | 4 ++-- .../examiner/mark-papers-two/mark-papers-two.component.ts | 5 ++++- .../student-exam-record.component.html | 8 ++++---- .../student/student-index/student-index.component.html | 4 ++-- 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/app/examiner/examiner-index/examiner-index.component.html b/src/app/examiner/examiner-index/examiner-index.component.html index ecf0a39..7343e92 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.html +++ b/src/app/examiner/examiner-index/examiner-index.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-11 09:06:03 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-20 09:33:02 + * @LastEditTime: 2020-12-29 10:11:11 -->
@@ -78,7 +78,7 @@ {{item.title}} - 广西总队 + {{item.organizationsName}} {{item.startTime|date:'yyyy-MM-dd HH:mm'}} {{item.endTime|date:'yyyy-MM-dd HH:mm'}} diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index aba7c7e..c213bb4 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-11 09:06:03 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-23 09:45:28 + * @LastEditTime: 2020-12-29 15:18:12 */ import { Component, OnInit, ViewChild, Inject,Input } from '@angular/core'; import {HttpClient} from '@angular/common/http' diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.html b/src/app/examiner/mark-papers-index/mark-papers-index.component.html index 8489564..c305def 100644 --- a/src/app/examiner/mark-papers-index/mark-papers-index.component.html +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-14 16:30:31 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-25 08:59:47 + * @LastEditTime: 2020-12-29 14:52:17 -->
@@ -36,11 +36,11 @@ {{item.title}} - 广西总队 + {{item.organizationsName}} {{item.startTime|date:'yyyy-MM-dd HH:mm'}} {{item.endTime|date:'yyyy-MM-dd HH:mm'}} - 阅卷 + 阅卷 diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.ts b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts index 62e2ce5..60d99be 100644 --- a/src/app/examiner/mark-papers-index/mark-papers-index.component.ts +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-14 16:30:31 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-25 09:00:41 + * @LastEditTime: 2020-12-29 14:52:09 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import {HttpClient} from '@angular/common/http' @@ -55,9 +55,9 @@ export class MarkPapersIndexComponent implements OnInit { this.markDate=undefined } //点击阅卷跳转 - markTwo(e,id){ + markTwo(e,id,name){ console.log(e) - this.router.navigate(['/home/mark-papers-index/mark-papers-two'],{queryParams:{'level':e,'id':id}}) + this.router.navigate(['/home/mark-papers-index/mark-papers-two'],{queryParams:{'level':e,'id':id,'name':name}}) } //获取表格信息 getAlltabledate(){ diff --git a/src/app/examiner/mark-papers-two/mark-papers-two.component.html b/src/app/examiner/mark-papers-two/mark-papers-two.component.html index 33fa3cb..c992c18 100644 --- a/src/app/examiner/mark-papers-two/mark-papers-two.component.html +++ b/src/app/examiner/mark-papers-two/mark-papers-two.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-14 17:21:02 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-28 15:09:51 + * @LastEditTime: 2020-12-29 14:53:39 -->
@@ -30,7 +30,7 @@ {{item.examineeName}} - 广西总队 + {{getname}} {{item.endTime|date:'yyyy-MM-dd HH:mm'}} {{item.isMarked== true?"已阅卷":"未阅卷"}} 90 diff --git a/src/app/examiner/mark-papers-two/mark-papers-two.component.ts b/src/app/examiner/mark-papers-two/mark-papers-two.component.ts index 596233e..b297667 100644 --- a/src/app/examiner/mark-papers-two/mark-papers-two.component.ts +++ b/src/app/examiner/mark-papers-two/mark-papers-two.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-14 17:21:02 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-25 09:15:42 + * @LastEditTime: 2020-12-29 14:53:15 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import {HttpClient} from '@angular/common/http' @@ -29,12 +29,14 @@ export class MarkPapersTwoComponent implements OnInit { this.activatedRoute.queryParams.subscribe(param=>{ this.headtext=param.level this.getid=param.id + this.getname=param.name }); this.getAlltabledate() } headtext getid//试卷id + getname//考核中队 dataSource //分页 @@ -58,6 +60,7 @@ export class MarkPapersTwoComponent implements OnInit { this.http.get("/api/Examinations",{params:paramsdata}).subscribe((data:any)=>{ this.dataSource=data.items this.length=data.totalCount + console.log(this.dataSource) }) } diff --git a/src/app/student/student-exam-record/student-exam-record.component.html b/src/app/student/student-exam-record/student-exam-record.component.html index 6acbdcd..79aafdd 100644 --- a/src/app/student/student-exam-record/student-exam-record.component.html +++ b/src/app/student/student-exam-record/student-exam-record.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-20 16:26:44 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-23 13:53:33 + * @LastEditTime: 2020-12-29 15:09:36 -->
@@ -20,9 +20,9 @@ {{item.name}} - 张三 - 广西总队 - {{item.serverTime|date:'yyyy-MM-dd HH:mm'}} + {{item.examineeName}} + {{item.paperInfo.organizationsName}} + {{item.paperInfo.startTime|date:'yyyy-MM-dd HH:mm'}} 90分 查看 diff --git a/src/app/student/student-index/student-index.component.html b/src/app/student/student-index/student-index.component.html index 2266d4e..26881ff 100644 --- a/src/app/student/student-index/student-index.component.html +++ b/src/app/student/student-index/student-index.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-20 15:01:30 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-21 17:10:56 + * @LastEditTime: 2020-12-29 10:15:42 -->
@@ -20,7 +20,7 @@ {{item.title}} - 广西总队 + {{item.organizationsName}} {{item.startTime|date:'yyyy-MM-dd HH:mm'}} {{item.endTime|date:'yyyy-MM-dd HH:mm'}} {{item.duration}}分钟 From 0781b0cca31eedb171b0f6cd2cca6bbda3a8e554 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Tue, 29 Dec 2020 15:33:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=98=85=E5=8D=B7?= =?UTF-8?q?=E4=BD=9C=E6=88=98=E9=83=A8=E7=BD=B2=E6=8C=89=E9=92=AE=E6=94=BE?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/examiner/review-files/review-files.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/examiner/review-files/review-files.component.html b/src/app/examiner/review-files/review-files.component.html index 3cee59f..7442663 100644 --- a/src/app/examiner/review-files/review-files.component.html +++ b/src/app/examiner/review-files/review-files.component.html @@ -18,7 +18,7 @@
- +