[新增]阅卷首页面和第一层跳转页面

src/app/examiner/create-test-score/create-test-score.component.ts

@@ -90,7 +90,7 @@ export class CreateTestScoreComponent implements OnInit {
   //               {name:'华南城集团有限公司',id:'5ee19fe06f91049f5e23e937'},
   //               {name:'贵港油库',id:'5fa35d68f8eb762cb03c662e'}
   //             ]
-  unitId:any = JSON.parse(localStorage.getItem('checkedWork')) 
+  unitId:any = JSON.parse(sessionStorage.getItem('checkedWork')) 
   //获取单位基本信息
   getUnitData(){
     this.unitId.forEach((element,index) => {
@@ -1198,6 +1198,7 @@ export class FinishDialog{
         this.http.post('/api/Papers',params).subscribe(data => {
           this.snackBar.open('创建成功','确定',config);
           this.dialogRef.close();
+          sessionStorage.removeItem("checkedWork")
         },err => {
           this.snackBar.open(err,'确定',config);
         })

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-14 15:59:51
+ * @LastEditTime: 2020-12-15 11:36:19
 -->
 <div class="content">
     <div class="header">
@@ -12,10 +12,8 @@
             <div class="queryField">
                 <label style="margin-right: 10px;font-size: 18px;">消防救援站:</label>
                 <input list="cars" placeholder="请输入用户账号" [(ngModel)]="accound" />
-                <datalist id="cars">
+                <datalist id="cars" (onchange)="getoption()">
-	            <option value="admin">
+	            <option *ngFor="let item of helpName" value={{item.name}} id={{item.id}} >
-	            <option value="surper">
-	            <option value="ceshi">
                 </datalist>
             </div>
             <div class="queryField">
@@ -46,16 +44,17 @@
                 <th style="width: 20%;">操作</th>
             </thead>
             <tbody>
-                <tr *ngFor="let item of dataSource">
+                <tr *ngFor="let item of tabledataSource">
-                    <td>{{item.name}}</td>
+                    <td>{{item.title}}</td>
-                    <td>{{item.organization}}</td>
+                    <td>广西总队</td>
-                    <td>{{item.startTime}}</td>
+                    <td>{{item.startTime|date:'yyyy-MM-dd hh:mm'}}</td>
-                    <td>{{item.overTime}}</td>
+                    <td>{{item.endTime|date:'yyyy-MM-dd hh:mm'}}</td>
-                    <td [ngClass]="{'green': item.testState == '开考中','red':item.testState == '已结束'}">{{item.testState}}</td>
+                    <!-- <td [ngClass]="{'green': item.testState == '开考中','red':item.testState == '已结束'}">{{item.testState}}</td> -->
+                    <td [ngClass]="{'green': item.status == '1','red':item.status == '2'}">{{item.status=="2"?"已结束":item.status=="0"?"未开考":"开考中"}}</td>
                     <td>
                         <span style="color: #07CDCF;margin-right: 10px;">编辑</span>    
                         <span style="color: #07CDCF;">详情</span>
-                        <span *ngIf="item.testState=='未开考'" style="color: #FF8678;margin-left: 10px;cursor: pointer;">删除</span>
+                        <span *ngIf="item.status=='0'" style="color: #FF8678;margin-left: 10px;cursor: pointer;" (click)="deleteExam(item.id)">删除</span>
                     </td>
                 </tr>
             </tbody>

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-14 16:44:42
+ * @LastEditTime: 2020-12-15 12:25:15
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import {HttpClient} from '@angular/common/http'
@@ -16,16 +16,7 @@ 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:'已结束'},
-];
 
 @Component({
   selector: 'app-examiner-index',
@@ -36,15 +27,17 @@ export class ExaminerIndexComponent implements OnInit {
 
   constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
   //displayedColumns: string[] = ['name', 'organization', 'startTime', 'overTime', 'testState', 'operation'];
-  dataSource = ELEMENT_DATA;
 
   ngOnInit(): void {
-    //this.getAlltabledate()
+    this.getAlltabledate()
+    this.getHelp()
   }
 
   displayedColumns: string[] = ['name','startTime','endTime', 'examzhong','scc'];
   tabledataSource:any
   accound
+  helpName//消防救援对名称
+  optionId
   //分页
   @ViewChild(MatPaginator, {static: true}) 
   pageEvent: PageEvent;
@@ -53,10 +46,27 @@ export class ExaminerIndexComponent implements OnInit {
   pageSize:any; //每页条数
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any //第几页
+  startTime:[]
+  endTime:[]
+
+  //获得查询支队信息
+  help(){
+    let paramsdata:any = {
+      PageNumber: this.PageNumber || '1',
+      PageSize:  this.pageSizeOptions[0],
+      Sort: null,
+      SortType: null,
+    }
+    //console.log(paramsdata)
+    this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{
+      this.tabledataSource=data
+      console.log(this.tabledataSource)
+    })
+  }
   //分页事件
   chagePage(e){
     this.PageNumber = e.pageIndex+1
-    //this.getAllKeyUnit();
+    this.getAlltabledate()
   }
   //获取表格信息
   getAlltabledate(){
@@ -66,14 +76,39 @@ export class ExaminerIndexComponent implements OnInit {
       Sort: null,
       SortType: null,
     }
-    //console.log(paramsdata)
     this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{
+      this.tabledataSource=data.items
+      this.length=data.totalCount
       console.log(data)
-      
     })
     //console.log(this.tabledataSource)
   }
+  //获取消防救援对信息
+  getHelp(){
+    let paramsdata:any={
+      Name:'',
+      IdentityCard:'',
+      Phone:'',
+      RealName:'',
+      OrganizationId:'',
+      PageNumber:'',
+      PageSize:'',
+      Sort:'',
+      RoleType:'1',
+      SortType:''
+    }
+    this.http.get("/api/ExamUsers",{params:paramsdata}).subscribe((data:any)=>{
+      console.log(data)
+      this.helpName=data.items
+    })
+  }
 
+  //获取optionid
+  getoption(){
+    var selectIndex =document.getElementById("cars");
+    console.log(selectIndex)
+    //var activeName_value =document.getElementById("usertype").options[selectIndex].id;
+  }
   //查询按钮
   findClick(){
     const config = new MatSnackBarConfig();
@@ -82,12 +117,28 @@ export class ExaminerIndexComponent implements OnInit {
     if(this.accound==undefined){
       this.snackBar.open('请输入消防救援队名称','确定',config);
     }
+    else{
+      this.http.get(`/api/Papers/1`).subscribe((data:any)=>{
+        console.log(data)
+      })
+    }
     console.log(this.accound)
   }
   //重置按钮
   Reset(){
     this.accound=undefined
   }
+  //删除一套考题
+  deleteExam(examid){
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
+    this.http.delete(`/api/Papers/${examid}`).subscribe((data:any)=>{
+      this.snackBar.open('删除试卷成功','确定',config);
+      this.getAlltabledate()
+    })
+    
+  }
   //新增考题跳转
   newExamination(){
     this.router.navigate(['/home/examiner-new-one'])

src/app/examiner/examiner-new-one/examiner-new-one.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-11 16:34:26
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-14 11:14:49
+ * @LastEditTime: 2020-12-15 08:46:14
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -305,7 +305,7 @@ export class ExaminerNewOneComponent implements OnInit {
       }
     )
   }
-  selectedunitArr:any =JSON.parse(localStorage.getItem("checkedWork"))||[] //选中单位的数组
+  selectedunitArr:any =JSON.parse(sessionStorage.getItem("checkedWork"))||[] //选中单位的数组
   deleteByid=""//根据id取消选中
   //勾选框事件
   checkChange(e,element){
@@ -347,7 +347,7 @@ export class ExaminerNewOneComponent implements OnInit {
       workDate.push(this.selectedunitArr[i].buildingTypes)
     }
     console.log(workDate) */
-    localStorage.setItem("checkedWork",JSON.stringify(this.selectedunitArr) )
+    sessionStorage.setItem("checkedWork",JSON.stringify(this.selectedunitArr) )
     this.router.navigateByUrl("/examiner/create-test-score")
   }
   //编辑单位信息

src/app/examiner/examiner-routing.ts

@@ -4,19 +4,21 @@
  * @Author: sueRimn
  * @Date: 2020-12-10 12:11:26
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-14 16:33:04
+ * @LastEditTime: 2020-12-14 17:23:10
  */
 import { Routes, RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
 import { ExaminerIndexComponent } from './examiner-index/examiner-index.component'
 import { ExaminerNewOneComponent} from './examiner-new-one/examiner-new-one.component'
 import { MarkPapersIndexComponent} from './mark-papers-index/mark-papers-index.component'
+import { MarkPapersTwoComponent } from './mark-papers-two/mark-papers-two.component'
 
 const routes: Routes = [
     // { path: '', component:CreateExamComponent }
     { path: 'createexam-index', component:ExaminerIndexComponent },
     { path: 'examiner-new-one', component:ExaminerNewOneComponent },
-    { path: 'mark-papers-index',component:MarkPapersIndexComponent}
+    { path: 'mark-papers-index',component:MarkPapersIndexComponent},
+    { path: 'mark-papers-two',component:MarkPapersTwoComponent}
 
   //{ path: 'createexam-index', component:ExaminerIndexComponent },
 ]

src/app/examiner/examiner.module.ts

@@ -53,9 +53,10 @@ import { ExaminerIndexComponent } from './examiner-index/examiner-index.componen
 import { ExaminerNewOneComponent } from './examiner-new-one/examiner-new-one.component';
 import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
 import { MarkPapersIndexComponent } from './mark-papers-index/mark-papers-index.component';
+import { MarkPapersTwoComponent } from './mark-papers-two/mark-papers-two.component';
 
 @NgModule({
-  declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog, MarkPapersIndexComponent],
+  declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog, MarkPapersIndexComponent, MarkPapersTwoComponent],
   imports: [
     CommonModule,
     examinerRoutingModule,

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-14 16:57:25
+ * @LastEditTime: 2020-12-14 17:39:30
 -->
 <div class="content">
     <div class="header">
@@ -39,8 +39,8 @@
                     <td>{{item.organization}}</td>
                     <td>{{item.startTime}}</td>
                     <td>{{item.overTime}}</td>
-                    <td>
+                    <td >
-                        <span style="color: #07CDCF;cursor: pointer;">阅卷</span>
+                        <span id={{item.name}} style="color: #07CDCF;cursor: pointer;" (click)="markTwo(item.name)">阅卷</span>
                     </td>
                 </tr>
             </tbody>

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

@@ -1,3 +1,11 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-14 16:30:31
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-12-15 08:53:09
+ */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import {HttpClient} from '@angular/common/http'
 import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
@@ -32,9 +40,15 @@ export class MarkPapersIndexComponent implements OnInit {
   dataSource = ELEMENT_DATA;
   markName//试卷名称
   markDate//考试日期
+  //重置功能
   resert(){
     this.markName=undefined
     this.markDate=undefined
   }
+  //点击阅卷跳转
+  markTwo(e){
+    console.log(e)
+    this.router.navigate(['/home/mark-papers-two'],{queryParams:{'level':e}})
+  }
 
 }

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

@@ -0,0 +1,50 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-14 17:21:02
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-12-15 09:21:32
+-->
+<div class="content">
+    <div class="header">
+        <div class="queryBox">
+            <div class="queryField">
+                <label style="margin-right: 10px;font-size: 20px;">{{headtext}}</label>
+                
+            </div>
+            
+            
+        </div>
+    </div>
+    <div class="centertable">
+        <table >
+            <thead>
+                <th style="width: 15%;">考试人</th>
+                <th style="width: 15%;">考核中队</th>
+                <th style="width: 15%;">交卷时间</th>
+                <th style="width: 15%;">是否已阅</th>
+                <th style="width: 15%;">分数</th>
+                <th style="width: 20%;">操作</th>
+            </thead>
+            <tbody>
+                <tr *ngFor="let item of dataSource">
+                    <td>{{item.name}}</td>
+                    <td>{{item.organization}}</td>
+                    <td>{{item.startTime}}</td>
+                    <td [ngClass]="{'green': item.testState == '已阅卷','red':item.testState == '未阅卷'}">{{item.testState}}</td>
+                    <td>{{item.mark}}</td>
+                    <td >
+                        <span style="color: #01CFD5;">阅卷</span>
+                    </td>
+                </tr>
+            </tbody>
+            
+        </table>
+        <mat-paginator [length]="100"
+              [pageSize]="10"
+              [pageSizeOptions]="[10]">
+</mat-paginator>
+    </div>
+    
+</div>

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

@@ -0,0 +1,95 @@
+table {
+    width: 100%;
+    text-align: center;
+    .cdk-header-cell {
+      text-align: center;
+    }
+  }
+  
+  .content {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    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;
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      align-items:center;
+      justify-content:left;
+      .queryField {
+        margin: 0 25px;
+        font-size: 14px;
+        input {
+          width: 320px;
+          height: 44px;
+          line-height: 34px;
+          border-radius: 5px;
+          padding-left: 5px;
+          outline: none;
+          border: 1px solid rgb(226, 211, 211);
+        }
+        button { 
+          border: none;
+          color: white;
+          padding: 10px 25px;
+          text-align: center;
+          text-decoration: none;
+          display: inline-block;
+          font-size: 16px;
+          margin: 4px 2px;
+          cursor: pointer;
+          border-radius: 8px;
+          outline:0 none !important;
+         }
+      }
+      .headerright{
+        float: right;
+      }
+    } //queryBox
+  }
+  .centertable{
+    width: 95%;
+    margin-right: 40px;
+    margin-left: 40px;
+    background-color: #FFFFFF;
+    table{
+      td,th{
+        height: 48px;
+        font-size: 16px;
+      }
+      td{
+        border-bottom: 1px solid #F2F5F6;
+      }
+      thead{
+        background-color:#F5FDFE;
+      }
+      .green{
+        color: #07CDCF;
+    }
+    .red{
+        color: #FF8678;
+    }
+    }
+  }
+  
+  .operationSpan{
+    margin: 0 10px;
+    .spanbtn {
+      font-weight: 550;
+      cursor: pointer;
+    }
+    .green{ color: #04ced1; }
+    .red{ color: #FF8678 }
+    .gray{ color: gray; }
+  }
+  

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

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

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

@@ -0,0 +1,49 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-14 17:21:02
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-12-15 09:16:29
+ */
+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", mark: '120',testState:'未阅卷'},
+  {name: "提亚马特", organization: '黄埔支队', startTime: "2020-09-19 10:00", mark: '100',testState:'已阅卷'},
+  {name: "艾泽拉斯", organization: '徐汇支队', startTime: "2020-09-19 10:00", mark: '90',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-two',
+  templateUrl: './mark-papers-two.component.html',
+  styleUrls: ['./mark-papers-two.component.scss']
+})
+export class MarkPapersTwoComponent implements OnInit {
+
+  constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
+
+  ngOnInit(): void {
+    this.activatedRoute.queryParams.subscribe(param=>{
+      this.headtext=param.level
+      //console.log(headName)
+    });
+  }
+  headtext
+  dataSource = ELEMENT_DATA;
+  markName//试卷名称
+  markDate//考试日期
+
+}

src/app/navigation/navigation.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-10 10:21:40
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-14 17:03:11
+ * @LastEditTime: 2020-12-15 12:28:31
 -->
 
 <mat-sidenav-container class="example-container" autosize [class.myapp-dark-theme]="darktheme">