12 changed files with 538 additions and 242 deletions
@ -1,101 +1,166 @@
|
||||
/* |
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Descripttion: |
||||
* @version: |
||||
* @Author: sueRimn |
||||
* @Date: 2020-12-14 16:30:31 |
||||
* @LastEditors: sueRimn |
||||
* @LastEditTime: 2021-01-04 16:53:04 |
||||
*/ |
||||
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'; |
||||
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", 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:'已结束'}, |
||||
{ |
||||
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-mark-papers-index', |
||||
templateUrl: './mark-papers-index.component.html', |
||||
styleUrls: ['./mark-papers-index.component.scss'] |
||||
selector: "app-mark-papers-index", |
||||
templateUrl: "./mark-papers-index.component.html", |
||||
styleUrls: ["./mark-papers-index.component.scss"], |
||||
}) |
||||
export class MarkPapersIndexComponent implements OnInit { |
||||
|
||||
constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } |
||||
constructor( |
||||
private router: Router, |
||||
private activatedRoute: ActivatedRoute, |
||||
public http: HttpClient, |
||||
public dialog: MatDialog, |
||||
public snackBar: MatSnackBar |
||||
) {} |
||||
|
||||
ngOnInit(): void { |
||||
this.getAlltabledate() |
||||
this.getAlltabledate(); |
||||
} |
||||
dataSource
|
||||
markName//试卷名称
|
||||
markDate//考试日期
|
||||
dataSource; |
||||
markName; //试卷名称
|
||||
markDate; //考试日期
|
||||
//分页
|
||||
@ViewChild(MatPaginator, {static: true})
|
||||
@ViewChild(MatPaginator, { static: true }) |
||||
pageEvent: PageEvent; |
||||
paginator: MatPaginator; |
||||
length:any; //共多少条数据
|
||||
pageSize:any; //每页条数
|
||||
pageSizeOptions: number[] = [10] //设置每页条数
|
||||
PageNumber:any //第几页
|
||||
length: any; //共多少条数据
|
||||
pageSize: any; //每页条数
|
||||
pageSizeOptions: number[] = [10]; //设置每页条数
|
||||
PageNumber: any; //第几页
|
||||
//查询
|
||||
findClick(){ |
||||
let paramsdata:any = { |
||||
PageNumber: this.PageNumber || '1', |
||||
PageSize: this.pageSizeOptions[0], |
||||
Title:this.markName||'', |
||||
StartTime:this.markDate||'', |
||||
findClick() { |
||||
let paramsdata: any = { |
||||
PageNumber: this.PageNumber || "1", |
||||
PageSize: this.pageSizeOptions[0], |
||||
Title: this.markName || "", |
||||
StartTime: this.markDate || "", |
||||
Sort: null, |
||||
SortType: null, |
||||
} |
||||
this.http.get(`/api/Papers`,{params:paramsdata}).subscribe((data:any)=>{ |
||||
console.log(data) |
||||
this.dataSource=data.items |
||||
}) |
||||
this.PageNumber = 1 |
||||
this.pageEvent.pageIndex = 0 |
||||
}; |
||||
this.http |
||||
.get(`/api/Papers`, { params: paramsdata }) |
||||
.subscribe((data: any) => { |
||||
console.log(data); |
||||
this.dataSource = data.items; |
||||
}); |
||||
this.PageNumber = 1; |
||||
this.pageEvent.pageIndex = 0; |
||||
//this.getAlltabledate()
|
||||
} |
||||
//重置功能
|
||||
resert(){ |
||||
this.markName='' |
||||
this.markDate='' |
||||
this.getAlltabledate() |
||||
resert() { |
||||
this.markName = ""; |
||||
this.markDate = ""; |
||||
this.getAlltabledate(); |
||||
} |
||||
//点击阅卷跳转
|
||||
markTwo(e,id,name){ |
||||
console.log(e) |
||||
this.router.navigate(['/home/mark-papers-index/mark-papers-two'],{queryParams:{'level':e,'id':id,'name':name}}) |
||||
markTwo(e, id, name) { |
||||
console.log(e); |
||||
this.router.navigate(["/home/mark-papers-index/mark-papers-two"], { |
||||
queryParams: { level: e, id: id, name: name }, |
||||
}); |
||||
} |
||||
//获取表格信息
|
||||
getAlltabledate(){ |
||||
let paramsdata:any = { |
||||
PageNumber: this.PageNumber || '1', |
||||
PageSize: this.pageSizeOptions[0], |
||||
getAlltabledate() { |
||||
let paramsdata: any = { |
||||
PageNumber: this.PageNumber || "1", |
||||
PageSize: this.pageSizeOptions[0], |
||||
Sort: null, |
||||
SortType: null, |
||||
} |
||||
this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{ |
||||
this.dataSource=data.items |
||||
this.length=data.totalCount |
||||
console.log(this.dataSource) |
||||
}) |
||||
}; |
||||
this.http |
||||
.get("/api/Papers", { params: paramsdata }) |
||||
.subscribe((data: any) => { |
||||
this.dataSource = data.items; |
||||
this.length = data.totalCount; |
||||
console.log(this.dataSource); |
||||
}); |
||||
} |
||||
//分页事件
|
||||
chagePage(e){ |
||||
this.PageNumber = e.pageIndex+1 |
||||
this.getAlltabledate() |
||||
chagePage(e) { |
||||
this.PageNumber = e.pageIndex + 1; |
||||
this.getAlltabledate(); |
||||
} |
||||
look(item) { |
||||
console.log(item); |
||||
} |
||||
|
||||
} |
||||
|
||||
@ -1,95 +1,127 @@
|
||||
table { |
||||
width: 100%; |
||||
width: 100%; |
||||
text-align: center; |
||||
|
||||
.cdk-header-cell { |
||||
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; |
||||
} |
||||
|
||||
.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; |
||||
.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; |
||||
} |
||||
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); |
||||
} |
||||
.headerright{ |
||||
float: right; |
||||
} |
||||
} //queryBox |
||||
} |
||||
.centertable{ |
||||
width: 95%; |
||||
margin-right: 40px; |
||||
margin-left: 40px; |
||||
background-color: #FFFFFF; |
||||
table{ |
||||
td,th{ |
||||
height: 48px; |
||||
|
||||
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; |
||||
} |
||||
td{ |
||||
border-bottom: 1px solid #F2F5F6; |
||||
} |
||||
thead{ |
||||
background-color:#F5FDFE; |
||||
} |
||||
.green{ |
||||
color: #07CDCF; |
||||
} |
||||
.red{ |
||||
color: #FF8678; |
||||
} |
||||
|
||||
.headerright { |
||||
float: right; |
||||
} |
||||
} |
||||
|
||||
.operationSpan{ |
||||
margin: 0 10px; |
||||
.spanbtn { |
||||
font-weight: 550; |
||||
cursor: pointer; |
||||
|
||||
//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; |
||||
} |
||||
.green{ color: #04ced1; } |
||||
.red{ color: #FF8678 } |
||||
.gray{ color: gray; } |
||||
|
||||
thead { |
||||
background-color: #F5FDFE; |
||||
} |
||||
|
||||
.green { |
||||
color: #07CDCF; |
||||
} |
||||
|
||||
.red { |
||||
color: #FF8678; |
||||
} |
||||
} |
||||
|
||||
span { |
||||
cursor: pointer; |
||||
margin: 0 5px; |
||||
color: #01CFD5 |
||||
} |
||||
} |
||||
|
||||
.operationSpan { |
||||
margin: 0 10px; |
||||
|
||||
.spanbtn { |
||||
font-weight: 550; |
||||
cursor: pointer; |
||||
} |
||||
|
||||
.green { |
||||
color: #04ced1; |
||||
} |
||||
|
||||
.red { |
||||
color: #FF8678 |
||||
} |
||||
|
||||
.gray { |
||||
color: gray; |
||||
} |
||||
|
||||
} |
||||
|
||||
@ -0,0 +1,28 @@
|
||||
<div class="box"> |
||||
<h1>批改记录</h1> |
||||
<div class="content" *ngFor="let item of this.modifyHistory"> |
||||
<div class="itembox"> |
||||
<span>批改人:</span> |
||||
<div> |
||||
{{item.modifiedBy.realName}} |
||||
</div> |
||||
</div> |
||||
<div class="itembox"> |
||||
<span>批改时间:</span> |
||||
<div> |
||||
{{item.modifiedTime | date:'yyyy-MM-dd HH:mm'}} |
||||
</div> |
||||
</div> |
||||
<div class="itembox"> |
||||
<span>批改内容:</span> |
||||
<div> |
||||
<div *ngFor="let i of item.data"> |
||||
<p style="color: #1890ff;">{{i.name}} : </p> |
||||
<p *ngFor="let e of i.data"> |
||||
<span>{{e.name}} : </span>由{{ e.oldIsRight }}修改为{{ e.newIsRight }} |
||||
</p> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
@ -0,0 +1,29 @@
|
||||
.box { |
||||
width: 550px; |
||||
font-size: 14px; |
||||
max-height: 500px; |
||||
overflow-y: auto; |
||||
} |
||||
h1{ |
||||
font-weight: 600; |
||||
text-align: center; |
||||
} |
||||
.content { |
||||
box-sizing: border-box; |
||||
padding: 12px 0; |
||||
border-bottom: 1px dashed rgb(182, 180, 180); |
||||
} |
||||
|
||||
.itembox { |
||||
display: flex; |
||||
|
||||
span { |
||||
margin-right: 6px; |
||||
} |
||||
|
||||
div { |
||||
p { |
||||
margin-bottom: 3px; |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,25 @@
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; |
||||
|
||||
import { ReviewRecordComponent } from './review-record.component'; |
||||
|
||||
describe('ReviewRecordComponent', () => { |
||||
let component: ReviewRecordComponent; |
||||
let fixture: ComponentFixture<ReviewRecordComponent>; |
||||
|
||||
beforeEach(async(() => { |
||||
TestBed.configureTestingModule({ |
||||
declarations: [ ReviewRecordComponent ] |
||||
}) |
||||
.compileComponents(); |
||||
})); |
||||
|
||||
beforeEach(() => { |
||||
fixture = TestBed.createComponent(ReviewRecordComponent); |
||||
component = fixture.componentInstance; |
||||
fixture.detectChanges(); |
||||
}); |
||||
|
||||
it('should create', () => { |
||||
expect(component).toBeTruthy(); |
||||
}); |
||||
}); |
||||
@ -0,0 +1,56 @@
|
||||
import { HttpClient } from "@angular/common/http"; |
||||
import { Component, OnInit, Inject } from "@angular/core"; |
||||
import { |
||||
MAT_DIALOG_DATA, |
||||
MatDialog, |
||||
MatDialogRef, |
||||
} from "@angular/material/dialog"; |
||||
import { MatSnackBar } from "@angular/material/snack-bar"; |
||||
|
||||
@Component({ |
||||
selector: "app-review-record", |
||||
templateUrl: "./review-record.component.html", |
||||
styleUrls: ["./review-record.component.scss"], |
||||
}) |
||||
export class ReviewRecordComponent implements OnInit { |
||||
constructor( |
||||
public http: HttpClient, |
||||
public dialog: MatDialog, |
||||
public snackBar: MatSnackBar, |
||||
@Inject(MAT_DIALOG_DATA) public data: any, |
||||
public dialogRef: MatDialogRef<any> |
||||
) {} |
||||
|
||||
modifyHistory = []; |
||||
ngOnInit(): void { |
||||
console.log(this.data); |
||||
this.http |
||||
.get(`/api/Examinations/${this.data.id}`) |
||||
.subscribe((data: any) => { |
||||
if (!data.modifyHistory) { |
||||
return; |
||||
} |
||||
let modifyHistory = JSON.parse(data.modifyHistory); |
||||
modifyHistory.forEach((element) => { |
||||
element.data.forEach((item) => { |
||||
item.data.forEach((i) => { |
||||
if (i.name.indexOf("作战部署") == -1) { |
||||
i.oldIsRight |
||||
? (i.oldIsRight = "正确") |
||||
: (i.oldIsRight = "错误"); |
||||
i.newIsRight |
||||
? (i.newIsRight = "正确") |
||||
: (i.newIsRight = "错误"); |
||||
}else{ |
||||
i.oldIsRight = i.oldIsRight+'分' |
||||
i.newIsRight = i.newIsRight+'分' |
||||
} |
||||
}); |
||||
}); |
||||
}); |
||||
this.modifyHistory = modifyHistory.reverse(); |
||||
|
||||
console.log(888, this.modifyHistory); |
||||
}); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue