diff --git a/src/app/examiner/examiner-index/examiner-index.component.html b/src/app/examiner/examiner-index/examiner-index.component.html index 7d5dc44..44cf7b5 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.html +++ b/src/app/examiner/examiner-index/examiner-index.component.html @@ -4,14 +4,14 @@ * @Author: sueRimn * @Date: 2020-12-11 09:06:03 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-14 14:22:11 + * @LastEditTime: 2020-12-14 15:59:51 -->
- +
- - + +
@@ -36,7 +36,7 @@ --> - +
@@ -55,15 +55,17 @@ +
试卷名称 考核中队 编辑 详情 - 删除 + 删除
- - + +
\ No newline at end of file diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index 91558ff..d5fab3e 100644 --- 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-11 19:38:25 + * @LastEditTime: 2020-12-14 16:44:42 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import {HttpClient} from '@angular/common/http' @@ -35,11 +35,58 @@ const ELEMENT_DATA = [ 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']; + //displayedColumns: string[] = ['name', 'organization', 'startTime', 'overTime', 'testState', 'operation']; dataSource = ELEMENT_DATA; ngOnInit(): void { - + //this.getAlltabledate() + } + + displayedColumns: string[] = ['name','startTime','endTime', 'examzhong','scc']; + tabledataSource:any + accound + //分页 + @ViewChild(MatPaginator, {static: true}) + pageEvent: PageEvent; + paginator: MatPaginator; + length:any; //共多少条数据 + pageSize:any; //每页条数 + pageSizeOptions: number[] = [10] //设置每页条数 + PageNumber:any //第几页 + //分页事件 + chagePage(e){ + this.PageNumber = e.pageIndex+1 + //this.getAllKeyUnit(); + } + //获取表格信息 + getAlltabledate(){ + 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)=>{ + console.log(data) + + }) + //console.log(this.tabledataSource) + } + + //查询按钮 + findClick(){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + if(this.accound==undefined){ + this.snackBar.open('请输入消防救援队名称','确定',config); + } + console.log(this.accound) + } + //重置按钮 + Reset(){ + this.accound=undefined } //新增考题跳转 newExamination(){ diff --git a/src/app/examiner/examiner-routing.ts b/src/app/examiner/examiner-routing.ts index c2fcb4c..e78963d 100644 --- a/src/app/examiner/examiner-routing.ts +++ b/src/app/examiner/examiner-routing.ts @@ -4,17 +4,19 @@ * @Author: sueRimn * @Date: 2020-12-10 12:11:26 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-12 09:16:04 + * @LastEditTime: 2020-12-14 16:33:04 */ 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' const routes: Routes = [ // { path: '', component:CreateExamComponent } { path: 'createexam-index', component:ExaminerIndexComponent }, - { path: 'examiner-new-one', component:ExaminerNewOneComponent } + { path: 'examiner-new-one', component:ExaminerNewOneComponent }, + { path: 'mark-papers-index',component:MarkPapersIndexComponent} //{ path: 'createexam-index', component:ExaminerIndexComponent }, ] diff --git a/src/app/examiner/examiner.module.ts b/src/app/examiner/examiner.module.ts index 9710199..d8d5bf9 100644 --- a/src/app/examiner/examiner.module.ts +++ b/src/app/examiner/examiner.module.ts @@ -52,9 +52,10 @@ import { NzTreeModule } from 'ng-zorro-antd/tree'; import { ExaminerIndexComponent } from './examiner-index/examiner-index.component'; 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'; @NgModule({ - declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog], + declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog, MarkPapersIndexComponent], imports: [ CommonModule, examinerRoutingModule, diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.html b/src/app/examiner/mark-papers-index/mark-papers-index.component.html new file mode 100644 index 0000000..49095cf --- /dev/null +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.html @@ -0,0 +1,55 @@ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + +
试卷名称考核中队开始时间结束时间操作
{{item.name}}{{item.organization}}{{item.startTime}}{{item.overTime}} + 阅卷 +
+ + +
+ +
diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.scss b/src/app/examiner/mark-papers-index/mark-papers-index.component.scss new file mode 100644 index 0000000..4a42ddb --- /dev/null +++ b/src/app/examiner/mark-papers-index/mark-papers-index.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; } + } + \ No newline at end of file diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.spec.ts b/src/app/examiner/mark-papers-index/mark-papers-index.component.spec.ts new file mode 100644 index 0000000..ae72adb --- /dev/null +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MarkPapersIndexComponent } from './mark-papers-index.component'; + +describe('MarkPapersIndexComponent', () => { + let component: MarkPapersIndexComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MarkPapersIndexComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MarkPapersIndexComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.ts b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts new file mode 100644 index 0000000..5bafdee --- /dev/null +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts @@ -0,0 +1,40 @@ +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:'已结束'}, +]; + +@Component({ + 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) { } + + ngOnInit(): void { + } + dataSource = ELEMENT_DATA; + markName//试卷名称 + markDate//考试日期 + resert(){ + this.markName=undefined + this.markDate=undefined + } + +} diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index c489a07..b4959d6 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-10 10:21:40 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-11 10:26:25 + * @LastEditTime: 2020-12-14 16:33:43 --> @@ -25,7 +25,7 @@
  • 创建考试
    • -
  • 阅卷
    • +
  • 阅卷
  • 统计分析