Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/examSystem-Anxin

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-21 14:25:29
+ * @LastEditTime: 2020-12-23 09:45:28
  */
 import { Component, OnInit, ViewChild, Inject,Input  } from '@angular/core';
 import {HttpClient} from '@angular/common/http'
@@ -238,6 +238,7 @@ export class ExaminerIndexComponent implements OnInit {
     this.jsId=''
     this.js=''
     this.jscheck=''
+    this.getAlltabledate()
   }
   //删除一套考题
   deleteExam(examid){

src/app/student/student-exam-record/student-exam-record.component.html

@@ -1 +1,38 @@
-<p>student-exam-record works!</p>
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-20 16:26:44
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-12-23 13:53:33
+-->
+<div class="content">
+    <div class="centertable">
+        <table >
+            <thead>
+                <th style="width: 20%;">试卷名称</th>
+                <th style="width: 10%;">参加人</th>
+                <th style="width: 20%;">考核队站</th>
+                <th style="width: 20%;">考试时间</th>
+                <th style="width: 15%;">考试成绩</th>
+                <th style="width: 15%;">操作</th>
+            </thead>
+            <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 style="color: #FF8678;">90分</td>
+                    <td style="color: #07CDCF;cursor: pointer;">查看</td>
+                </tr>
+            </tbody>
+            
+        </table>
+        <mat-paginator [length]="length"
+                [pageSize]="pageSize"
+                [pageSizeOptions]="pageSizeOptions"
+                (page)="chagePage($event)">
+            </mat-paginator>
+    </div>
+</div>

src/app/student/student-exam-record/student-exam-record.component.scss

@@ -0,0 +1,35 @@
+.content {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    background: #F2F5F6;
+    overflow-y: auto;
+  }
+  .centertable{
+    width: 95%;
+    margin-right: 40px;
+    margin-left: 40px;
+    margin-top: 40px;
+    background-color: #FFFFFF;
+    table{
+        width: 100%;
+      td,th{
+        height: 48px;
+        font-size: 16px;
+      }
+      td{
+        border-bottom: 1px solid #F2F5F6;
+        text-align: center;
+      }
+      thead{
+        background-color:#F5FDFE;
+        width: 100%;
+      }
+      .green{
+        color: #07CDCF;
+    }
+    .red{
+        color: #FF8678;
+    }
+    }
+  }

src/app/student/student-exam-record/student-exam-record.component.ts

@@ -1,4 +1,23 @@
-import { Component, OnInit } from '@angular/core';
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-20 16:26:44
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-12-23 10:33:24
+ */
+import { Component, OnInit, ViewChild, Inject,Input  } 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 { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+import { FlatTreeControl } from '@angular/cdk/tree';
+import { TreeService } from '../../http-interceptors/tree.service'
 
 @Component({
   selector: 'app-student-exam-record',
@@ -7,9 +26,43 @@ import { Component, OnInit } from '@angular/core';
 })
 export class StudentExamRecordComponent implements OnInit {
 
-  constructor() { }
+  constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private tree: TreeService) { }
 
   ngOnInit(): void {
+    this.getAlltabledate()
+  }
+
+  //分页
+  @ViewChild(MatPaginator, {static: true}) 
+  pageEvent: PageEvent;
+  paginator: MatPaginator;
+  length:any; //共多少条数据
+  pageSize:any; //每页条数
+  pageSizeOptions: number[] = [10] //设置每页条数
+  PageNumber:any //第几页
+  startTime:[]
+  endTime:[]
+  tabledataSource//表格数据
+
+  //分页事件
+  chagePage(e){
+    this.PageNumber = e.pageIndex+1
+    this.getAlltabledate()
+  }
+
+  //获取表格信息
+  getAlltabledate(){
+    let paramsdata:any = {
+      PageNumber: this.PageNumber || '1',
+      PageSize:  this.pageSizeOptions[0],
+      Sort: null,
+      SortType: null
+    }
+    this.http.get("/api/Examinations",{params:paramsdata}).subscribe((data:any)=>{
+      this.tabledataSource=data.items
+      this.length=data.totalCount
+      console.log(this.tabledataSource)
+    })
   }
 
 }

src/app/student/student-index/student-index.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-20 15:01:30
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-22 10:08:19
+ * @LastEditTime: 2020-12-24 10:49:54
  */
 import { Component, OnInit, ViewChild, Inject,Input  } from '@angular/core';
 import {HttpClient} from '@angular/common/http'
@@ -30,12 +30,18 @@ export class StudentIndexComponent implements OnInit {
 
   ngOnInit(): void {
     this.getAlltabledate()
-    setInterval(()=>this.getAlltabledate(),60000)
+    this.tableInterval=setInterval(()=>this.getAlltabledate(),60000)
-    //this.idtime=setInterval(()=>this.jishi("","2020-12-22 11:03"),1000)
+    //this.gettime("2020-12-22T18:40:00+08:00","2020-12-22T18:39:00+08:00")
-    //console.log(this.idtime)
+    //this.idtime=setInterval(()=>this.newjsq(),1000)
+    //this.newjsq()
+  }
+  ngOnDestroy (){
+    clearInterval(this.idtime)
+    clearInterval(this.tableInterval)
   }
 
   idtime
+  tableInterval
 
   //分页
   @ViewChild(MatPaginator, {static: true}) 
@@ -68,15 +74,18 @@ export class StudentIndexComponent implements OnInit {
     this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{
       this.tabledataSource=data.items
       this.length=data.totalCount
-      console.log(this.tabledataSource)
+      //console.log(this.tabledataSource)
     })
   }
   //计时器
   jishi(startTime,endTime){
-    startTime=new Date
+    //startTime=new Date
-    var nowtime = new Date(startTime),  //获取当前时间
+    var nowtime = new Date(startTime),  //获取开始时间
         endtime = new Date(endTime);  //定义结束时间
-        var lefttime = endtime.getTime() - nowtime.getTime(),  //距离结束时间的毫秒数
+        var jieshu=nowtime.getTime()
+        setInterval(()=>{jieshu--})
+        //console.log(endtime.getSeconds()-1)
+        var lefttime = jieshu - nowtime.getTime(),  //距离结束时间的毫秒数
         leftd = Math.floor(lefttime/(1000*60*60*24)),  //计算天数
         lefth = Math.floor(lefttime/(1000*60*60)),  //计算小时数
         leftm = Math.floor(lefttime/(1000*60)%60),  //计算分钟数
@@ -90,6 +99,55 @@ export class StudentIndexComponent implements OnInit {
         console.log(this.timecha)
   }
 
+
+
+  timerID;
+  //time_end=new Date("2020-12-22T18:40:00+08:00").getTime();//结束的时间
+  time_end
+  //time_now_server=new Date("2020-12-22T18:30:00+08:00").getTime();//开始的时间
+  time_now_server
+  time_now_client=new Date().getTime();
+  //time_server_client=this.time_now_server-this.time_now_client;
+  time_server_client
+  str_time=""
+
+  gettime(endtime,stearttime){
+    this.time_end=new Date(endtime).getTime()
+    this.time_now_server=new Date(stearttime).getTime()
+    this.time_server_client=this.time_now_server-this.time_now_client
+    this.idtime=setInterval(()=>this.newtimer(),1000)
+  }
+  //新计时器
+  newtimer(){
+    var time_distance;
+    var int_day,int_hour,int_minute,int_second;
+    var time_now=new Date().getTime();
+    time_now=time_now+this.time_server_client;
+    time_distance=this.time_end-time_now;
+    if(time_distance>0){
+      int_day=Math.floor(time_distance/86400000)
+      time_distance-=int_day*86400000;
+      int_hour=Math.floor(time_distance/3600000)
+      time_distance-=int_hour*3600000;
+      int_minute=Math.floor(time_distance/60000)
+      time_distance-=int_minute*60000;
+      int_second=Math.floor(time_distance/1000)
+      if(int_hour<10)
+      int_hour="0"+int_hour;
+      if(int_minute<10)
+      int_minute="0"+int_minute;
+      if(int_second<10)
+      int_second="0"+int_second;
+      this.str_time=int_hour+":"+int_minute+":"+int_second;
+      if(this.str_time=="00:00:00")
+      {this.str_time="已结束"}
+      //console.log(this.str_time)
+    }else{
+      //timer=timer;
+      clearTimeout(this.timerID)
+    }
+  }
+
   //参加考试
   takeTest (e) {
     let body = {