12 changed files with 538 additions and 242 deletions
@ -1,101 +1,166 @@ |
|||||||
/* |
/* |
||||||
* @Descripttion:
|
* @Descripttion: |
||||||
* @version:
|
* @version: |
||||||
* @Author: sueRimn |
* @Author: sueRimn |
||||||
* @Date: 2020-12-14 16:30:31 |
* @Date: 2020-12-14 16:30:31 |
||||||
* @LastEditors: sueRimn |
* @LastEditors: sueRimn |
||||||
* @LastEditTime: 2021-01-04 16:53:04 |
* @LastEditTime: 2021-01-04 16:53:04 |
||||||
*/ |
*/ |
||||||
import { Component, OnInit, ViewChild, Inject } from '@angular/core'; |
import { Component, OnInit, ViewChild, Inject } from "@angular/core"; |
||||||
import {HttpClient} from '@angular/common/http' |
import { HttpClient } from "@angular/common/http"; |
||||||
import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; |
import { |
||||||
import { MatPaginator } from '@angular/material/paginator'; |
MatDialogRef, |
||||||
import { MatTableDataSource } from '@angular/material/table'; |
MatDialog, |
||||||
import { PageEvent } from '@angular/material/paginator'; |
MAT_DIALOG_DATA, |
||||||
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; |
} from "@angular/material/dialog"; |
||||||
import {FormControl} from '@angular/forms'; |
import { MatPaginator } from "@angular/material/paginator"; |
||||||
import { Router,ActivatedRoute } from '@angular/router'; |
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 = [ |
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: "富华酒店", |
||||||
{name: "雁山园", organization: '徐汇支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'开考中'}, |
organization: "浦东支队", |
||||||
{name: "富华酒店", organization: '普陀支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'开考中'}, |
startTime: "2020-09-19 10:00", |
||||||
{name: "立新加油站", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'开考中'}, |
overTime: "2020-09-19 12:00", |
||||||
{name: "富华酒店", organization: '宝山支队', startTime: "2020-07-19 10:00", overTime: '2020-07-19 12:00',testState:'已结束'}, |
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-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({ |
@Component({ |
||||||
selector: 'app-mark-papers-index', |
selector: "app-mark-papers-index", |
||||||
templateUrl: './mark-papers-index.component.html', |
templateUrl: "./mark-papers-index.component.html", |
||||||
styleUrls: ['./mark-papers-index.component.scss'] |
styleUrls: ["./mark-papers-index.component.scss"], |
||||||
}) |
}) |
||||||
export class MarkPapersIndexComponent implements OnInit { |
export class MarkPapersIndexComponent implements OnInit { |
||||||
|
constructor( |
||||||
constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } |
private router: Router, |
||||||
|
private activatedRoute: ActivatedRoute, |
||||||
|
public http: HttpClient, |
||||||
|
public dialog: MatDialog, |
||||||
|
public snackBar: MatSnackBar |
||||||
|
) {} |
||||||
|
|
||||||
ngOnInit(): void { |
ngOnInit(): void { |
||||||
this.getAlltabledate() |
this.getAlltabledate(); |
||||||
} |
} |
||||||
dataSource
|
dataSource; |
||||||
markName//试卷名称
|
markName; //试卷名称
|
||||||
markDate//考试日期
|
markDate; //考试日期
|
||||||
//分页
|
//分页
|
||||||
@ViewChild(MatPaginator, {static: true})
|
@ViewChild(MatPaginator, { static: true }) |
||||||
pageEvent: PageEvent; |
pageEvent: PageEvent; |
||||||
paginator: MatPaginator; |
paginator: MatPaginator; |
||||||
length:any; //共多少条数据
|
length: any; //共多少条数据
|
||||||
pageSize:any; //每页条数
|
pageSize: any; //每页条数
|
||||||
pageSizeOptions: number[] = [10] //设置每页条数
|
pageSizeOptions: number[] = [10]; //设置每页条数
|
||||||
PageNumber:any //第几页
|
PageNumber: any; //第几页
|
||||||
//查询
|
//查询
|
||||||
findClick(){ |
findClick() { |
||||||
let paramsdata:any = { |
let paramsdata: any = { |
||||||
PageNumber: this.PageNumber || '1', |
PageNumber: this.PageNumber || "1", |
||||||
PageSize: this.pageSizeOptions[0], |
PageSize: this.pageSizeOptions[0], |
||||||
Title:this.markName||'', |
Title: this.markName || "", |
||||||
StartTime:this.markDate||'', |
StartTime: this.markDate || "", |
||||||
Sort: null, |
Sort: null, |
||||||
SortType: null, |
SortType: null, |
||||||
} |
}; |
||||||
this.http.get(`/api/Papers`,{params:paramsdata}).subscribe((data:any)=>{ |
this.http |
||||||
console.log(data) |
.get(`/api/Papers`, { params: paramsdata }) |
||||||
this.dataSource=data.items |
.subscribe((data: any) => { |
||||||
}) |
console.log(data); |
||||||
this.PageNumber = 1 |
this.dataSource = data.items; |
||||||
this.pageEvent.pageIndex = 0 |
}); |
||||||
|
this.PageNumber = 1; |
||||||
|
this.pageEvent.pageIndex = 0; |
||||||
//this.getAlltabledate()
|
//this.getAlltabledate()
|
||||||
} |
} |
||||||
//重置功能
|
//重置功能
|
||||||
resert(){ |
resert() { |
||||||
this.markName='' |
this.markName = ""; |
||||||
this.markDate='' |
this.markDate = ""; |
||||||
this.getAlltabledate() |
this.getAlltabledate(); |
||||||
} |
} |
||||||
//点击阅卷跳转
|
//点击阅卷跳转
|
||||||
markTwo(e,id,name){ |
markTwo(e, id, name) { |
||||||
console.log(e) |
console.log(e); |
||||||
this.router.navigate(['/home/mark-papers-index/mark-papers-two'],{queryParams:{'level':e,'id':id,'name':name}}) |
this.router.navigate(["/home/mark-papers-index/mark-papers-two"], { |
||||||
|
queryParams: { level: e, id: id, name: name }, |
||||||
|
}); |
||||||
} |
} |
||||||
//获取表格信息
|
//获取表格信息
|
||||||
getAlltabledate(){ |
getAlltabledate() { |
||||||
let paramsdata:any = { |
let paramsdata: any = { |
||||||
PageNumber: this.PageNumber || '1', |
PageNumber: this.PageNumber || "1", |
||||||
PageSize: this.pageSizeOptions[0], |
PageSize: this.pageSizeOptions[0], |
||||||
Sort: null, |
Sort: null, |
||||||
SortType: null, |
SortType: null, |
||||||
} |
}; |
||||||
this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{ |
this.http |
||||||
this.dataSource=data.items |
.get("/api/Papers", { params: paramsdata }) |
||||||
this.length=data.totalCount |
.subscribe((data: any) => { |
||||||
console.log(this.dataSource) |
this.dataSource = data.items; |
||||||
}) |
this.length = data.totalCount; |
||||||
|
console.log(this.dataSource); |
||||||
|
}); |
||||||
} |
} |
||||||
//分页事件
|
//分页事件
|
||||||
chagePage(e){ |
chagePage(e) { |
||||||
this.PageNumber = e.pageIndex+1 |
this.PageNumber = e.pageIndex + 1; |
||||||
this.getAlltabledate() |
this.getAlltabledate(); |
||||||
|
} |
||||||
|
look(item) { |
||||||
|
console.log(item); |
||||||
} |
} |
||||||
|
|
||||||
} |
} |
||||||
|
|||||||
@ -1,95 +1,127 @@ |
|||||||
table { |
table { |
||||||
width: 100%; |
width: 100%; |
||||||
|
text-align: center; |
||||||
|
|
||||||
|
.cdk-header-cell { |
||||||
text-align: center; |
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; |
.content { |
||||||
margin-bottom: 10px; |
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; |
box-sizing: border-box; |
||||||
.queryBox { |
padding: 5px 15px; |
||||||
box-sizing: border-box; |
display: flex; |
||||||
padding: 5px 15px; |
flex-direction: row; |
||||||
display: flex; |
flex-wrap: wrap; |
||||||
flex-direction: row; |
align-items: center; |
||||||
flex-wrap: wrap; |
justify-content: left; |
||||||
align-items:center; |
|
||||||
justify-content:left; |
.queryField { |
||||||
.queryField { |
margin: 0 25px; |
||||||
margin: 0 25px; |
font-size: 14px; |
||||||
font-size: 14px; |
|
||||||
input { |
input { |
||||||
width: 320px; |
width: 320px; |
||||||
height: 44px; |
height: 44px; |
||||||
line-height: 34px; |
line-height: 34px; |
||||||
border-radius: 5px; |
border-radius: 5px; |
||||||
padding-left: 5px; |
padding-left: 5px; |
||||||
outline: none; |
outline: none; |
||||||
border: 1px solid rgb(226, 211, 211); |
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; |
button { |
||||||
} |
border: none; |
||||||
} //queryBox |
color: white; |
||||||
} |
padding: 10px 25px; |
||||||
.centertable{ |
text-align: center; |
||||||
width: 95%; |
text-decoration: none; |
||||||
margin-right: 40px; |
display: inline-block; |
||||||
margin-left: 40px; |
|
||||||
background-color: #FFFFFF; |
|
||||||
table{ |
|
||||||
td,th{ |
|
||||||
height: 48px; |
|
||||||
font-size: 16px; |
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{ |
//queryBox |
||||||
margin: 0 10px; |
} |
||||||
.spanbtn { |
|
||||||
font-weight: 550; |
.centertable { |
||||||
cursor: pointer; |
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 } |
thead { |
||||||
.gray{ color: gray; } |
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