diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 83c5cae..f059bea 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -36,7 +36,7 @@ export class LoginComponent implements OnInit { sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); this.token.startUp(); //登陆成功启动定时器刷新token - this.router.navigate(['/home/createexam']) //登陆成功跳转页面 + this.router.navigate(['/home/teachear']) //登陆成功跳转页面 },(err) => {this.errmsg = err}) } diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html index 3c8e9b8..4a22f92 100644 --- a/src/app/tabbar/tabbar.component.html +++ b/src/app/tabbar/tabbar.component.html @@ -3,11 +3,6 @@

考核系统

- - - 欢迎您，{{realName}} - - -
- - -
- -
- - -
-
- - +
+
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
-
- - -
- - + + + +
- + - + - + - - + + + + + + + + + + + + - + -
姓名用户姓名 {{element.realName}} 身份证号 {{element.name}} 职务 - - {{item.name}} - - 消防救援站上海总队 手机号13562321997创建时间{{element.creationTime | date:'yyyy-MM-dd'}}操作 - assessment查看学习记录 - cached重置密码 - edit修改 - remove_circle禁用 - remove_circle禁用 - delete删除 + 重置密码 + 编辑 + 禁用 + 禁用 + 删除
- - + + + +
diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.scss b/src/app/ui/enterpriseuser/enterpriseuser.component.scss index e54613b..71c0551 100644 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.scss +++ b/src/app/ui/enterpriseuser/enterpriseuser.component.scss @@ -1,16 +1,17 @@ table { - width: 100%; + width: 100%; + text-align: center; + .cdk-header-cell { text-align: center; - .cdk-header-cell { - text-align: center; - } } -.maginleft { - margin-left: 5px; } - - +.content { + width: 100%; + height: 100%; + overflow: hidden; + background: #F2F5F6; +} .header { width: 100%; padding: 10px; @@ -25,39 +26,29 @@ table { align-items:center; justify-content:center; .queryField { - margin: 0 15px; + margin: 0 25px; font-size: 14px; input { - width: 280px; - height: 22px; - line-height: 22px; - // border-radius: 3px; + width: 160px; + height: 34px; + line-height: 34px; + border-radius: 5px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); } + button { color: #fff; } } - .btnbox{ - float: right; - } - } //queryBox } .operationSpan{ - margin: 0 5px; - .spanbtn:hover{ - text-decoration: underline; + margin: 0 10px; + .spanbtn { + font-weight: 550; cursor: pointer; } - .blue{ - color:rgb(24, 144, 255) ; - } - .red{ - color: rgb(245, 34, 45); - } - .gray{ - color: gray; - } -} -.icon{ - font-size: 18px; - vertical-align: top; + .green{ color: #04ced1; } + .red{ color: #FF8678 } + .gray{ color: gray; } } diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.ts b/src/app/ui/enterpriseuser/enterpriseuser.component.ts index e5c7af0..67a2486 100644 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.ts +++ b/src/app/ui/enterpriseuser/enterpriseuser.component.ts @@ -8,6 +8,7 @@ import { AddEnterpriserUser } from './addenterpriseuser.component' import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import {FormControl} from '@angular/forms'; import { Router,ActivatedRoute } from '@angular/router' + @Component({ selector: 'app-enterpriseuser', templateUrl: './enterpriseuser.component.html', @@ -21,15 +22,12 @@ export class EnterpriseuserComponent implements OnInit { this.initData() } - displayedColumns: string[] = ['name', 'identitycard', 'post', 'operation',]; + displayedColumns: string[] = [ 'name','identitycard', 'post', 'tel', 'time', 'operation',]; dataSource:any; //所有企业用户 - userLogin:string; //搜索账号 - userName:string; //搜索名称 - creditcode:string//统一社会信用代码 - name:any //姓名 identityCard:any //身份证 + fireTeam:any; //消防救援站 //分页 @ViewChild(MatPaginator, {static: true}) @@ -95,9 +93,9 @@ export class EnterpriseuserComponent implements OnInit { //跳转学习记录 openRecord(e){ - // this.router.navigate([`/home/statistics`],{queryParams:{'name':`${e.realName}`,'id':`${e.name}`}}) window.open(`/home/statistics?name=${e.realName}&id=${e.name}`) } + //创建用户 open(){ let dialogRef = this.dialog.open(AddEnterpriserUser, {//调用open方法打开对话框并且携带参数过去 @@ -197,7 +195,6 @@ export class EnterpriseuserComponent implements OnInit { }) } - //删除 delete (e) { let isTrue = confirm('您确定要删除吗') diff --git a/src/app/ui/login/login.component.html b/src/app/ui/login/login.component.html deleted file mode 100644 index adb4633..0000000 --- a/src/app/ui/login/login.component.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
- -
-
- -
- account_box - - - -
- -
- lock - - - -
- -
- {{errmsg}} -
- - -
-
- -
diff --git a/src/app/ui/login/login.component.scss b/src/app/ui/login/login.component.scss deleted file mode 100644 index c1dc33e..0000000 --- a/src/app/ui/login/login.component.scss +++ /dev/null @@ -1,45 +0,0 @@ -.header { - margin: 0 auto; - width: 50px; - height: 50px; - border-radius: 50%; - img { - width: 100%; - height: 100%; - } -} - -.content { - margin: 20px 0; - text-align: center; - .alert-danger { - text-align: left; - font-size: 14px; - color: red; - } - .loginBtn { - width: 90%; - border-radius: 5px; - margin-top: 10px; - } -} -.input { - margin-left: 22px; - position: relative; -} -.icon { - width: 24px; - color: #666; - font-size: 24px; - position: absolute; - top: 17px; - left: -24px; -} -.icon2 { - width: 24px; - color: #666; - font-size: 24px; - position: absolute; - top: 17px; - left: -24px; -} \ No newline at end of file diff --git a/src/app/ui/login/login.component.spec.ts b/src/app/ui/login/login.component.spec.ts deleted file mode 100644 index d6d85a8..0000000 --- a/src/app/ui/login/login.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LoginComponent } from './login.component'; - -describe('LoginComponent', () => { - let component: LoginComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ LoginComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(LoginComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/login/login.component.ts b/src/app/ui/login/login.component.ts deleted file mode 100644 index fc2690a..0000000 --- a/src/app/ui/login/login.component.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { IsLoginService } from '../../is-login.service' -import { CacheTokenService } from '../../http-interceptors/cache-token.service' -import { MatDialogRef } from '@angular/material/dialog'; -import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar'; - -@Component({ - selector: 'app-login', - templateUrl: './login.component.html', - styleUrls: ['./login.component.scss'] -}) -export class LoginComponent implements OnInit { - - constructor(private http:HttpClient,private isLogin:IsLoginService,private token:CacheTokenService,public dialogRef: MatDialogRef,public snackBar: MatSnackBar) { } - - ngOnInit(): void { - - } - - errmsg:any; //err信息 - - //登录 - onSubmit (e) { - let loginMsg = { - name: e.name, - password: e.password - } - this.http.post('/api/Account/SignIn',loginMsg).subscribe((data:any)=>{ - sessionStorage.setItem("token",data.token); - sessionStorage.setItem("refreshToken",data.refreshToken); - this.token.startUp(); //登陆成功启动定时器刷新token - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('登陆成功','确定',config); - this.dialogRef.close(data); - },(err) => {this.errmsg = err}) - - } - -} diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.html b/src/app/ui/teacherManagement/enterpriseuser.component.html index 651eba4..b2e9ba1 100644 --- a/src/app/ui/teacherManagement/enterpriseuser.component.html +++ b/src/app/ui/teacherManagement/enterpriseuser.component.html @@ -1,68 +1,72 @@ -
-
-
- -
- -
- -
- - -
- -
- - -
-
- - +
+
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
-
- - -
- - - - - - - - + + + +
姓名{{element.realName}}
+ - + - + + + + + + - - + + - + + + + + + - + -
帐号用户帐号 {{element.name}} 用户姓名{{element.realName}}职务 - - {{item.name}} - - 消防救援站上海总队 创建时间{{element.creationTime | date:'yyyy-MM-dd'}}操作 - - cached重置密码 - edit修改 - remove_circle禁用 - remove_circle禁用 - delete删除 + 重置密码 + 编辑 + 禁用 + 禁用 + 删除
- - + + + +
diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.scss b/src/app/ui/teacherManagement/enterpriseuser.component.scss index e54613b..71c0551 100644 --- a/src/app/ui/teacherManagement/enterpriseuser.component.scss +++ b/src/app/ui/teacherManagement/enterpriseuser.component.scss @@ -1,16 +1,17 @@ table { - width: 100%; + width: 100%; + text-align: center; + .cdk-header-cell { text-align: center; - .cdk-header-cell { - text-align: center; - } } -.maginleft { - margin-left: 5px; } - - +.content { + width: 100%; + height: 100%; + overflow: hidden; + background: #F2F5F6; +} .header { width: 100%; padding: 10px; @@ -25,39 +26,29 @@ table { align-items:center; justify-content:center; .queryField { - margin: 0 15px; + margin: 0 25px; font-size: 14px; input { - width: 280px; - height: 22px; - line-height: 22px; - // border-radius: 3px; + width: 160px; + height: 34px; + line-height: 34px; + border-radius: 5px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); } + button { color: #fff; } } - .btnbox{ - float: right; - } - } //queryBox } .operationSpan{ - margin: 0 5px; - .spanbtn:hover{ - text-decoration: underline; + margin: 0 10px; + .spanbtn { + font-weight: 550; cursor: pointer; } - .blue{ - color:rgb(24, 144, 255) ; - } - .red{ - color: rgb(245, 34, 45); - } - .gray{ - color: gray; - } -} -.icon{ - font-size: 18px; - vertical-align: top; + .green{ color: #04ced1; } + .red{ color: #FF8678 } + .gray{ color: gray; } } diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.ts b/src/app/ui/teacherManagement/enterpriseuser.component.ts index d49e7e7..d70cf9c 100644 --- a/src/app/ui/teacherManagement/enterpriseuser.component.ts +++ b/src/app/ui/teacherManagement/enterpriseuser.component.ts @@ -21,15 +21,12 @@ export class TeacherManagementComponent implements OnInit { this.initData() } - displayedColumns: string[] = ['name', 'identitycard', 'post', 'operation',]; + displayedColumns: string[] = ['identitycard', 'name', 'post', 'time', 'operation',]; dataSource:any; //所有企业用户 - userLogin:string; //搜索账号 - userName:string; //搜索名称 - creditcode:string//统一社会信用代码 - - name:any //姓名 - identityCard:any //身份证 + name:any //用户姓名 + identityCard:any //用户账号 + fireTeam:any; //消防救援站 //分页 @ViewChild(MatPaginator, {static: true}) @@ -64,7 +61,6 @@ export class TeacherManagementComponent implements OnInit { RoleType: '1', } this.http.get('/api/Users',{params:data}).subscribe((data:any)=>{ - // console.log(666,data) this.length = data.totalCount this.pageSize = data.pageSize this.pageEvent.pageIndex = 0 @@ -93,7 +89,7 @@ export class TeacherManagementComponent implements OnInit { this.name = '' this.initData() } - + //创建教员 open(){ let dialogRef = this.dialog.open(AddTeacher, {//调用open方法打开对话框并且携带参数过去 @@ -143,16 +139,6 @@ export class TeacherManagementComponent implements OnInit { }) } - //查看企业信息 - see (e) { - // this.http.get(`/api/CompanyUsers/${e.name}`).subscribe( - // data=> { - // let dialogRef = this.dialog.open(seeTeacher, {data}); - // dialogRef.afterClosed().subscribe(); - // } - // ) - } - //启用 enabled (e) { let date = new Date() @@ -193,7 +179,6 @@ export class TeacherManagementComponent implements OnInit { }) } - //删除 delete (e) { let isTrue = confirm('您确定要删除吗') diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 75e8990..987b642 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -17,7 +17,9 @@ const routes: Routes = [ { path: 'looktest', component:LookOverTestComponent }, { path: 'statisticAnalysis', component:StatisticAnalysisComponent }, { path: 'joinExam', component:JoinExamComponent }, - { path: 'testRecords', component:TestRecordsComponent } + { path: 'testRecords', component:TestRecordsComponent }, + { path: 'teachear', component:TeacherManagementComponent }, //管理员 教员页面 + { path: 'examinee', component:EnterpriseuserComponent }, //管理员 考生页面 ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index d3465c9..e911908 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -50,7 +50,6 @@ import {ConfirmpswDirective} from './changepassword/equal-validator.directive'; import { FileUploadModule } from 'ng2-file-upload' import { AllFileComponent, ViewDetails, FolderDialog } from './all-file/all-file.component'; import { ChangeuserdataComponent } from './changeuserdata/changeuserdata.component'; -import { LoginComponent } from './login/login.component'; import { IsLoginService } from '../is-login.service'; import { UploadFilesComponent } from './upload-files/upload-files.component'; import {AddEnterpriserUser} from './enterpriseuser/addenterpriseuser.component'; @@ -67,7 +66,7 @@ import { JoinExamComponent } from './join-exam/join-exam.component'; import { TestRecordsComponent } from './test-records/test-records.component' import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; @NgModule({ - declarations: [FolderDialog,ViewDetails,ChangepasswordComponent,SizePipe,NamePipe,NamePipe2,NamePipe3,ConfirmpswDirective, AllFileComponent, ChangeuserdataComponent, LoginComponent, UploadFilesComponent,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,TeacherManagementComponent,editTeacher,AddTeacher,seeTeacher, LearningRecordDetailsComponent, EhartsStatisticsComponent, CreateExamComponent, LookOverTestComponent, StatisticAnalysisComponent, JoinExamComponent, TestRecordsComponent,testState,CreateDialog], + declarations: [FolderDialog,ViewDetails,ChangepasswordComponent,SizePipe,NamePipe,NamePipe2,NamePipe3,ConfirmpswDirective, AllFileComponent, ChangeuserdataComponent, UploadFilesComponent,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,TeacherManagementComponent,editTeacher,AddTeacher,seeTeacher, LearningRecordDetailsComponent, EhartsStatisticsComponent, CreateExamComponent, LookOverTestComponent, StatisticAnalysisComponent, JoinExamComponent, TestRecordsComponent,testState,CreateDialog], imports: [ NzDatePickerModule,