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 d430b9c..6a65188 100644 --- a/src/app/examiner/examiner.module.ts +++ b/src/app/examiner/examiner.module.ts @@ -53,9 +53,11 @@ 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 { PlanLevel } from '../pipes/size.pipe'; +import { MarkPapersIndexComponent } from './mark-papers-index/mark-papers-index.component'; + @NgModule({ - declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel], + declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel,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..8585264 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -4,31 +4,36 @@ * @Author: sueRimn * @Date: 2020-12-10 10:21:40 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-11 10:26:25 + * @LastEditTime: 2020-12-14 17:03:11 -->
- +
-
- logo -
-
-
上海消防救援
-
shanghai fire and rescue
-
- +
+ logo +
+
+
上海消防救援
+
shanghai fire and rescue
+
-
    -
  • 创建考试
    • -
  • 阅卷
    • -
  • 统计分析
    • -
- +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss index b1bdf98..4db0b5f 100644 --- a/src/app/navigation/navigation.component.scss +++ b/src/app/navigation/navigation.component.scss @@ -20,38 +20,34 @@ mat-sidenav{ } ul{ width: 100%; - li{ - list-style: none; - height: 48px; - line-height: 48px; + list-style: none; + height: 48px; + line-height: 48px; + cursor: pointer; + width: 100%; + border: none; + outline: none; + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; + img { + display: inline-block; + margin: 5px; + width: 18px; + height: 20px; + vertical-align: middle; cursor: pointer; - color: white; - width: 194px; - // text-align: center; - overflow: hidden; - text-overflow:ellipsis; - white-space: nowrap; + } + label { + display: inline-block; + vertical-align: middle; + cursor: pointer; + } } } } - - .logobox{ - border-radius: 50%; - width: 64px; - height: 64px; - - background:url("https://img5.tianyancha.com/logo/lll/cce72488294fb8f4bc670a5bb7f0cc4d.png@!f_200x200") no-repeat; - background-size: 100%; - margin: 0px auto; - - img{ - width: 100%; - height: 100%; - } - - } .shownav{ position: absolute; top: 13px; @@ -87,31 +83,21 @@ mat-sidenav{ bottom: 0px; overflow-y: scroll; font-size: 15px; - /* .router-link-active{ - background-color: #FFFFFF; - } */ ul{ li{ width: 198px; height: 44px; line-height:44px; - font-size: 20px; + font-size: 18px; margin-left: 10px; margin-top: 30px; - position: relative; text-align: center; outline:none; - + border-radius: 8px; } li:hover{ - background-color: #FFFFFF; - color: #07CDCF; - } - img{ - position: relative; - top: 2px; - width: 18px; - height: 20px; + background-color: #FFFFFF; + color: #07CDCF; } } } @@ -123,7 +109,6 @@ mat-sidenav{ } ul li{ background-color: white; - //color: black; } .biglogobox{ background-color: #d50000; @@ -180,24 +165,23 @@ mat-sidenav{ padding-left: 60px; } } - // mat-panel-title{ - // color: white; - // } } .mat-expansion-indicator::after { color: white; } -.example-container .router-link-active { - //background-color: rgba(225,225,225,.5); - border-radius: 8px ; -} -.btn{ + + //选中左侧菜单样式 + .clickStyle{ + background-color: #FFFFFF; + color: #07CDCF; + } + .btn{ text-align: center; button{ margin: 0 5px; - } + } } .example-sidenav-content{ height: 100%; @@ -217,15 +201,4 @@ mat-sidenav{ border-radius: 50%; border: 2px solid #fff; font-weight: 550; -} -//选中左侧菜单样式 -.clickStyle{ - background-color: #FFFFFF; - border-radius: 8px ; - //border:1px solid #FFFFFF ; - color: #07CDCF; -} -//鼠标移入改变背景色 -.onmousbackcolor{ - background-color: #FFFFFF; } \ No newline at end of file diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index e30e975..ead61d3 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -14,62 +14,9 @@ import { Router,ActivatedRoute } from '@angular/router' styleUrls: ['./navigation.component.scss'] }) export class NavigationComponent implements OnInit { - - constructor(private router:Router,public emitService: ComponentServiceService,public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public islogin:IsLoginService) { } - - @ViewChild('child') child:AllFileComponent; //父组件中获得子组件的引用 - - allDataBank:any //所有的资料库 - selectedDataBank:any //当前选中的资料库 - hoverDataBank:any//当前鼠标移入的资料库 - isOneClick:boolean //是否第一次进入网页 - leftMenuname="found" - //左侧菜单点击事件 - clickLeftmenu(name){ - this.leftMenuname=name - } - - //支队级菜单 - detachmentMenus:any = [ - { id:"支队级-主官", name:"主官" }, - { id:"支队级-副官", name:"副官" }, - { id:"支队级-灭火救援指挥岗位", name:"灭火救援指挥岗位" }, - { id:"支队级-政工岗位", name:"政工岗位" }, - { id:"支队级-后勤与保障岗位", name:"后勤与保障岗位" }, - { id:"支队级-防火监督岗位", name:"防火监督岗位" }, - { id:"支队级-指挥中心", name:"指挥中心" }, - { id:"支队级-安全员", name:"安全员" }, - ] - //大队级菜单 - brigadeMenus:any = [ - { id:"大队级-主官", name:"主官" }, - { id:"大队级-副官", name:"副官" }, - { id:"大队级-灭火救援指挥岗位", name:"灭火救援指挥岗位" }, - { id:"大队级-政工岗位", name:"政工岗位" }, - { id:"大队级-后勤与保障岗位", name:"后勤与保障岗位" }, - { id:"大队级-防火监督岗位", name:"防火监督岗位" }, - { id:"大队级-安全员", name:"安全员" }, - ] - //消防救援站菜单 - rescueStationMenus:any = [ - { id:"消防救援站-消防站指挥员", name:"消防站指挥员" }, - { id:"消防救援站-站长助理", name:"站长助理" }, - { id:"消防救援站-战斗员", name:"战斗员" }, - { id:"消防救援站-供水源", name:"供水源" }, - { id:"消防救援站-训导员", name:"训导员" }, - { id:"消防救援站-通信员", name:"通信员" }, - { id:"消防救援站-无人机飞手", name:"无人机飞手" }, - { id:"消防救援站-消防车驾驶员", name:"消防车驾驶员" }, - { id:"消防救援站-装备技师", name:"装备技师" } - ] + constructor(private router:Router,public emitService: ComponentServiceService,public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public islogin:IsLoginService) { } - //系统管理菜单 - systemManagement:any = [ - { id:"学员管理", name:"学员管理" }, - { id:"教员管理", name:"教员管理" } - ] - isAdmin:boolean = false ngOnInit() { // if(sessionStorage.getItem("roleType") == "0"){ @@ -77,18 +24,10 @@ export class NavigationComponent implements OnInit { // } } - - darktheme = false;//黑夜主题 - switchTheme(dark) { - this.darktheme = dark; - } - defaulttheme(){ - this.darktheme = false - } - redtheme(){ - this.darktheme = true - } + switchTheme (dark) { this.darktheme = dark; } + defaulttheme () { this.darktheme = false } + redtheme () { this.darktheme = true} } diff --git a/src/app/ui/changepassword/changepassword.component.ts b/src/app/ui/changepassword/changepassword.component.ts index 1b2e15a..a880cd6 100644 --- a/src/app/ui/changepassword/changepassword.component.ts +++ b/src/app/ui/changepassword/changepassword.component.ts @@ -19,7 +19,7 @@ export class ChangepasswordComponent implements OnInit { errmsg :string = '' onSubmit(e){ - this.http.put('/api/Account/Password', { + this.http.put('/api/ExamAccounts/Password', { password: e.password, newPassword: e.newPassword, }).subscribe(data=> {