[修改]考官考生的考核对战显示真实数据

4 years ago · f4740a1bb8
8 changed files with 21 additions and 18 deletions
--- 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
 -->
 <div class="content">
    <div class="header">
@ -78,7 +78,7 @@
            <tbody>
                <tr *ngFor="let item of tabledataSource">
                    <td>{{item.title}}</td>
-                    <td>广西总队</td>
+                    <td>{{item.organizationsName}}</td>
                    <td>{{item.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
                    <td>{{item.endTime|date:'yyyy-MM-dd HH:mm'}}</td>
                    <!-- <td [ngClass]="{'green': item.testState == '开考中','red':item.testState == '已结束'}">{{item.testState}}</td> -->
--- 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'
--- 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
 -->
 <div class="content">
    <div class="header">
@ -36,11 +36,11 @@
            <tbody>
                <tr *ngFor="let item of dataSource">
                    <td>{{item.title}}</td>
-                    <td>广西总队</td>
+                    <td>{{item.organizationsName}}</td>
                    <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)">阅卷</span>
+                        <span id={{item.name}} style="color: #07CDCF;cursor: pointer;" (click)="markTwo(item.title,item.id,item.organizationsName)">阅卷</span>
                    </td>
                </tr>
            </tbody>
--- 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(){
--- 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
 -->
 <div class="content">
    <div class="header">
@ -30,7 +30,7 @@
            <tbody>
                <tr *ngFor="let item of dataSource">
                    <td>{{item.examineeName}}</td>
-                    <td>广西总队</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>90</td>
--- 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)
    })
  }

--- 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
 -->
 <div class="content">
    <div class="centertable">
@ -20,9 +20,9 @@
            <tbody>
                <tr *ngFor="let item of tabledataSource">
                    <td>{{item.name}}</td>
-                    <td>张三</td>
-                    <td>广西总队</td>
-                    <td>{{item.serverTime|date:'yyyy-MM-dd HH:mm'}}</td>
+                    <td>{{item.examineeName}}</td>
+                    <td>{{item.paperInfo.organizationsName}}</td>
+                    <td>{{item.paperInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
                    <td style="color: #FF8678;">90分</td>
                    <td style="color: #07CDCF;cursor: pointer;">查看</td>
                </tr>
--- 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
 -->
 <div class="content">
    <div class="centertable">
@ -20,7 +20,7 @@
            <tbody>
                <tr *ngFor="let item of tabledataSource">
                    <td>{{item.title}}</td>
-                    <td>广西总队</td>
+                    <td>{{item.organizationsName}}</td>
                    <td>{{item.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
                    <td>{{item.endTime|date:'yyyy-MM-dd HH:mm'}}</td>
                    <td>{{item.duration}}分钟</td>