diff --git a/src/app/examiner/examiner-index/examiner-index.component.html b/src/app/examiner/examiner-index/examiner-index.component.html new file mode 100644 index 0000000..1e89125 --- /dev/null +++ b/src/app/examiner/examiner-index/examiner-index.component.html @@ -0,0 +1 @@ +

examiner-index works!

diff --git a/src/app/examiner/examiner-index/examiner-index.component.scss b/src/app/examiner/examiner-index/examiner-index.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/ui/login/login.component.spec.ts b/src/app/examiner/examiner-index/examiner-index.component.spec.ts similarity index 52% rename from src/app/ui/login/login.component.spec.ts rename to src/app/examiner/examiner-index/examiner-index.component.spec.ts index d6d85a8..9b6d381 100644 --- a/src/app/ui/login/login.component.spec.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LoginComponent } from './login.component'; +import { ExaminerIndexComponent } from './examiner-index.component'; -describe('LoginComponent', () => { - let component: LoginComponent; - let fixture: ComponentFixture; +describe('ExaminerIndexComponent', () => { + let component: ExaminerIndexComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ LoginComponent ] + declarations: [ ExaminerIndexComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(LoginComponent); + fixture = TestBed.createComponent(ExaminerIndexComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts new file mode 100644 index 0000000..426699d --- /dev/null +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-examiner-index', + templateUrl: './examiner-index.component.html', + styleUrls: ['./examiner-index.component.scss'] +}) +export class ExaminerIndexComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/examiner/examiner-routing.ts b/src/app/examiner/examiner-routing.ts index df76be0..c511108 100644 --- a/src/app/examiner/examiner-routing.ts +++ b/src/app/examiner/examiner-routing.ts @@ -1,8 +1,18 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-10 12:11:26 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-11 09:15:24 + */ import { Routes, RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; +import { ExaminerIndexComponent } from './examiner-index/examiner-index.component' const routes: Routes = [ // { path: '', component:CreateExamComponent } + { path: 'createexam-index', component:ExaminerIndexComponent } ] @NgModule({ diff --git a/src/app/examiner/examiner.module.ts b/src/app/examiner/examiner.module.ts index e00fda0..00361b2 100644 --- a/src/app/examiner/examiner.module.ts +++ b/src/app/examiner/examiner.module.ts @@ -50,6 +50,11 @@ import { myPaginator } from '../ui/my-paginator'; import { AddPlanDialog, AddPlanTwoDialog, CreateTestScoreComponent } from './create-test-score/create-test-score.component'; import { NavigationModule } from '../navigation/navigation.module'; import { NzTreeModule } from 'ng-zorro-antd/tree'; +import { ExaminerIndexComponent } from './examiner-index/examiner-index.component'; + + + + @NgModule({ declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog], imports: [ diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 306e96f..049838b 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -1,21 +1,35 @@ + - - -
- logo -
-
-
    -
  • 创建考试
    • -
  • 阅卷
    • -
  • 统计分析
    • -
-
    -
  • 参加考试
    • -
  • 考试记录
    • -
-
+ +
+ +
+
+
+ logo +
+
+
上海消防救援
+
shanghai fire and rescue
+
+ +
+
+
    +
  • 创建考试
    • +
  • 阅卷
    • +
  • 统计分析
    • +
+ +
diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss index 5c17aaa..8f50918 100644 --- a/src/app/navigation/navigation.component.scss +++ b/src/app/navigation/navigation.component.scss @@ -9,8 +9,9 @@ mat-accordion{ mat-sidenav{ box-shadow: 2px 0px 5px #888888; color: white; - background: url(../../assets/images/main_bg.png) 100% 100%; - width: 194px; + //background: url(../../assets/images/main_bg.png) 100% 100%; + background-color: #07CDCF; + width: 216px; overflow-x: hidden; p{ height: 48px; @@ -91,13 +92,26 @@ mat-sidenav{ overflow-y: scroll; font-size: 15px; .router-link-active{ - background-color: #5d9cf2; + background-color: #FFFFFF; } ul{ li{ + width: 198px; + height: 44px; + line-height:44px; + font-size: 20px; + margin-left: 10px; + margin-top: 30px; position: relative; text-align: center; - border-bottom: 1px solid #326db1; + outline:none; + + } + img{ + position: relative; + top: 2px; + width: 18px; + height: 20px; } } } @@ -109,7 +123,7 @@ mat-sidenav{ } ul li{ background-color: white; - color: black; + //color: black; } .biglogobox{ background-color: #d50000; @@ -118,20 +132,33 @@ mat-sidenav{ color: black; } .biglogobox{ - width: 194px; - height: 148px; - background-color: #4699f6; + width: 220px; + height: 56px; display: block; text-align: center; - position: relative; - left: 0; - margin-bottom: 20px; + display: flex; color: #FFF; margin: 0 auto; - border-bottom: 1px solid rgba(0, 0, 0, 0.12); + .biglogoimg{ + margin-left: 20px; + height: 40px; + width: 36px; + } + .biglogospan{ + display: flex; + flex-direction: column; + .down{ + position: relative; + bottom: 7px; + width: 125px; + span{ + white-space: nowrap; + } + } + } img{ - width: 138px; - height: 138px; + width: 32px; + height: 34px; margin-top: 6px; } } @@ -162,9 +189,9 @@ mat-sidenav{ color: white; } -.example-container .navbox .router-link-active { +.example-container .router-link-active { background-color: rgba(225,225,225,.5); - border:0 + border-radius: 8px ; } .btn{ text-align: center; @@ -190,4 +217,15 @@ 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 2af5bf3..b7c2586 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -23,6 +23,13 @@ export class NavigationComponent implements OnInit { selectedDataBank:any //当前选中的资料库 hoverDataBank:any //当前鼠标移入的资料库 isOneClick:boolean //是否第一次进入网页 + leftMenuname="" + + //左侧菜单点击事件 + clickLeftmenu(name){ + this.leftMenuname=name + console.log(this.leftMenuname) + } //支队级菜单 detachmentMenus:any = [ diff --git a/src/app/pages/lockscreen/lockscreen.component.html b/src/app/pages/lockscreen/lockscreen.component.html index 35e50bb..bd55be4 100644 --- a/src/app/pages/lockscreen/lockscreen.component.html +++ b/src/app/pages/lockscreen/lockscreen.component.html @@ -1,13 +1,18 @@
-

考试系统

+
+
+ +

消防救援单位信息考核系统

+
+
- - + +
@@ -20,20 +25,13 @@
-
- -
- -
- {{errmsg}} -
- +
+
{{errmsg}}
+ +
-
-

arrow_drop_down_circle

-

Copyright copyright 2019 北京安信科创软件有限公司出品

\ No newline at end of file diff --git a/src/app/pages/lockscreen/lockscreen.component.scss b/src/app/pages/lockscreen/lockscreen.component.scss index c872d8a..de121e5 100644 --- a/src/app/pages/lockscreen/lockscreen.component.scss +++ b/src/app/pages/lockscreen/lockscreen.component.scss @@ -1,76 +1,31 @@ .content { width: 100%; height: 100%; - max-height: 100%; display: flex; - justify-content:center; - align-items: center; - background: url('../../../assets//images/loginBGC.png'); - background-repeat:no-repeat; - background-size:100% 100%; - -moz-background-size:100% 100%; -} - -.loginBox { - min-width: 1080px; - min-height: 610px; - margin: 0 auto; - width: 70%; - text-align: center; + overflow: hidden; box-sizing: border-box; - position: relative; - - .loginBackground{ - width: 100%; - height: 100%; - margin: 0 auto; - } - .center { - width: 30%; - box-sizing: border-box; - margin: 0 auto; - position: absolute; - top: 24%; - right: 16%; + padding: 1px; + .leftBox { + flex: 70%; + background: url('../../../assets/images/loginBackground.png'); + background-size: 100% 100%; } -} - -.header { - width: 100%; - text-align: center; - position: fixed; - top: 60px; - font-size: 46px; - font-weight: 800; - color: #fff; - font-family: 'NSimSun'; -} -.footer { - width: 100%; - text-align: center; - position: fixed; - bottom: 35px; - font-size: 14px; - color: white; -} -.toLogin{ - color: #B0B0B0; - transform: rotate(90deg); - transform-origin: center center; - position: fixed; - left: 1%; - bottom: 1%; - cursor:pointer; - mat-icon{ - width: 36px; - height: 36px; - font-size: 36px; - cursor:pointer; + .loginBox { + flex: 30%; + position: relative; + display: flex; + // align-items: center; + background-color: #fff; + .center { + width: 60%; + margin: 0 auto; + text-align: center; + box-sizing: border-box; + padding-top: 120px; + } } } - - // 表单内部样式 .forget{ width: 100%; @@ -79,7 +34,7 @@ label { box-sizing: border-box; font-size: 14px; - color: #2196f3; + color: #07CDCF; cursor:pointer; } } @@ -93,7 +48,7 @@ width: 100%; color: white; border-radius: 5px; - background:linear-gradient(to right,#4DA3FE,#52b9fe,#56cdff) + background:linear-gradient(to right,#07CDCF,#07CDCF,#0ad6da); } //input 框 + 字体图标 .input { @@ -102,14 +57,13 @@ position: relative; .role{ box-sizing: border-box; - margin: 0px 15px; + padding: 10px 0; + margin: 0 10px; display: inline-block; - width: 30%; text-align: center; - font-size: 26px; - font-weight: 800; - font-family: 'NSimSun'; - color: #4DA1FE; + font-size: 18px; + font-weight: 550; + color: #07CDCF; cursor:pointer; } input { @@ -119,6 +73,8 @@ height: 36px; padding-left: 30px; } + img { width: 75px; height: 80px; } + h1 { font-size:28px; font-weight:700; margin-top:25px; font-style:italic; } } .icon { width: 24px; @@ -136,8 +92,20 @@ top: 7px; left: 8px; } +.toAdmin { + display: inline-block; + width: 100%; + text-align: center; + font-size: 14px; + font-weight: 550; + color: #07CDCF; + cursor:pointer; + position: absolute; + bottom: 25px; + left: 0; +} //class名是否选中 .isCheck { - border-bottom: 3px solid #4DA1FE; + border-bottom: 3px solid #07CDCF; } \ No newline at end of file diff --git a/src/app/pages/lockscreen/lockscreen.component.ts b/src/app/pages/lockscreen/lockscreen.component.ts index 9ef9b3e..f83430d 100644 --- a/src/app/pages/lockscreen/lockscreen.component.ts +++ b/src/app/pages/lockscreen/lockscreen.component.ts @@ -36,11 +36,7 @@ export class LockscreenComponent implements OnInit { 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.router.navigate(['/home/createexam']) //登陆成功跳转页面 - this.snackBar.open('登陆成功','确定',config); },(err) => {this.errmsg = err}) } diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html index 0ddf531..3b7b8fa 100644 --- a/src/app/pages/login/login.component.html +++ b/src/app/pages/login/login.component.html @@ -1,33 +1,31 @@ -
+ \ No newline at end of file diff --git a/src/app/pages/login/login.component.scss b/src/app/pages/login/login.component.scss index 09c8307..dd3e43a 100644 --- a/src/app/pages/login/login.component.scss +++ b/src/app/pages/login/login.component.scss @@ -1,81 +1,66 @@ -.content { +.login { width: 100%; height: 100%; - max-height: 100%; - background: url('../../../assets//images/loginBackground.jpg'); - background-repeat:no-repeat; + overflow: hidden; + box-sizing: border-box; + padding: 1px; + background: url('../../../assets/images/loginBackground.png'); background-size:100% 100%; - -moz-background-size:100% 100%; } - .loginBox { - margin: 0 auto; - width: 40%; - text-align: center; - box-sizing: border-box; - padding: 8% 0; - .header { - font-size: 34px; - font-weight: 650; - font-family: 'NSimSun'; - } - .center { - padding: 100px 0; - width: 50%; - box-sizing: border-box; - margin: 0 auto; - } -} -.footer { width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; +} + +.card { + width: 500px; + height: 355px; + border-radius: 10px; + padding-top: 30px; + background-color: #fff; text-align: center; - position: fixed; - bottom: 35px; - color: #858688; - font-size: 14px; + box-shadow:0px 0px 10px 5px #333; + position: relative; + .example-container { width: 60%; margin: 0 auto; } } -.toLogin{ - color: #B0B0B0; - transform: rotate(270deg); - transform-origin: center center; - position: fixed; - left: 1%; - bottom: 1%; - cursor:pointer; - mat-icon{ - width: 36px; - height: 36px; - font-size: 36px; - cursor:pointer; - } +.cardheader{ + font-size: 26px; + font-weight: 700; + font-style: italic; + color: #07CDCF; } - - // 表单内部样式 .forget{ - margin: 30px auto; + width: 100%; + text-align: right; + margin: 15px auto; label { - margin-left: 80%; box-sizing: border-box; font-size: 14px; - color: #2196f3; + color: #07CDCF; cursor:pointer; } } .alert-danger { - margin-bottom: 30px; + margin-bottom: 10px; text-align: left; font-size: 14px; color: red; } .loginBtn { width: 100%; + color: white; + border-radius: 5px; + background:linear-gradient(to right,#07CDCF,#07CDCF,#0ad6da); } //input 框 + 字体图标 .input { width: 100%; - margin: 30px auto; + margin: 35px auto 0; position: relative; input { width: 90%; @@ -100,4 +85,16 @@ position: absolute; top: 7px; left: 8px; +} +.toAdmin { + display: inline-block; + width: 100%; + text-align: center; + font-size: 14px; + font-weight: 550; + color: #07CDCF; + cursor:pointer; + position: absolute; + bottom: 10px; + left: 0; } \ No newline at end of file diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 8299f2b..f059bea 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -36,11 +36,7 @@ export class LoginComponent implements OnInit { 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.router.navigate(['/home/createexam']) //登陆成功跳转页面 - this.snackBar.open('登陆成功','确定',config); + 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..d6a537f 100644 --- a/src/app/tabbar/tabbar.component.html +++ b/src/app/tabbar/tabbar.component.html @@ -1,30 +1,34 @@ - + + -

考核系统

+

欢迎登录消防救援考核系统

- - - - 欢迎您，{{realName}} + - + 用户名：{{realName}}keyboard_arrow_down - diff --git a/src/app/tabbar/tabbar.component.scss b/src/app/tabbar/tabbar.component.scss index 56b67c3..0fb7afa 100644 --- a/src/app/tabbar/tabbar.component.scss +++ b/src/app/tabbar/tabbar.component.scss @@ -8,5 +8,15 @@ mat-icon{ } .login{ position: absolute; - right:60px; + right:220px; + background-color: #000000; +} +p{ + color:#1E2323; + border-bottom: 3px solid #fff; + border-radius: 3px; + font-size: 25px; + padding: 0 4px; + font-weight: 400; + line-height: 34px; } \ No newline at end of file diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts index c75a1b6..f1566b9 100644 --- a/src/app/tabbar/tabbar.component.ts +++ b/src/app/tabbar/tabbar.component.ts @@ -4,7 +4,6 @@ import { Router,ActivatedRoute } from '@angular/router' import { MatDialog } from '@angular/material/dialog'; import {ChangepasswordComponent} from '../ui/changepassword/changepassword.component' import {ChangeuserdataComponent} from '../ui/changeuserdata/changeuserdata.component' -import {LoginComponent} from '../ui/login/login.component' import {CacheTokenService} from '../http-interceptors/cache-token.service'//引入服务 import {IsLoginService} from '../is-login.service'//引入服务 import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar'; @@ -36,13 +35,6 @@ export class TabbarComponent implements OnInit { realName:string; //登录用户角色 - //登录系统 - login () { - let dialogRef = this.dialog.open(LoginComponent); - dialogRef.afterClosed().subscribe(); - } - - //退出系统 signOut () { diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.html b/src/app/ui/enterpriseuser/enterpriseuser.component.html index beedf2f..f8e8e66 100644 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.html +++ b/src/app/ui/enterpriseuser/enterpriseuser.component.html @@ -1,68 +1,77 @@ -
-
-
- -
- -
- -
- - -
- -
- - -
-
- - +
+
+ +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
-
- - -
- - + + + +
- + - + - + - - + + + + + + + + + + + + - + -
姓名用户姓名 {{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.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, diff --git a/src/assets/images/Statistics.png b/src/assets/images/Statistics.png new file mode 100644 index 0000000..c7f19e0 Binary files /dev/null and b/src/assets/images/Statistics.png differ diff --git a/src/assets/images/backbottom.png b/src/assets/images/backbottom.png new file mode 100644 index 0000000..dc8f372 Binary files /dev/null and b/src/assets/images/backbottom.png differ diff --git a/src/assets/images/backleft.png b/src/assets/images/backleft.png new file mode 100644 index 0000000..5f4516c Binary files /dev/null and b/src/assets/images/backleft.png differ diff --git a/src/assets/images/found.png b/src/assets/images/found.png new file mode 100644 index 0000000..2c4aece Binary files /dev/null and b/src/assets/images/found.png differ diff --git a/src/assets/images/login.gif b/src/assets/images/login.gif deleted file mode 100644 index 91438e2..0000000 Binary files a/src/assets/images/login.gif and /dev/null differ diff --git a/src/assets/images/login.png b/src/assets/images/login.png deleted file mode 100644 index 4252287..0000000 Binary files a/src/assets/images/login.png and /dev/null differ diff --git a/src/assets/images/loginBGC.png b/src/assets/images/loginBGC.png deleted file mode 100644 index 42677c3..0000000 Binary files a/src/assets/images/loginBGC.png and /dev/null differ diff --git a/src/assets/images/loginBackground.jpg b/src/assets/images/loginBackground.jpg deleted file mode 100644 index 72a0a3c..0000000 Binary files a/src/assets/images/loginBackground.jpg and /dev/null differ diff --git a/src/assets/images/loginHeader.png b/src/assets/images/loginHeader.png new file mode 100644 index 0000000..8db0891 Binary files /dev/null and b/src/assets/images/loginHeader.png differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index 4446bc9..1a4fbc7 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/assets/images/logo1.png b/src/assets/images/logo1.png new file mode 100644 index 0000000..4446bc9 Binary files /dev/null and b/src/assets/images/logo1.png differ diff --git a/src/assets/images/papers.png b/src/assets/images/papers.png new file mode 100644 index 0000000..ec8d61b Binary files /dev/null and b/src/assets/images/papers.png differ diff --git a/src/assets/images/sign.png b/src/assets/images/sign.png new file mode 100644 index 0000000..b6421f9 Binary files /dev/null and b/src/assets/images/sign.png differ diff --git a/src/assets/images/uppsd.png b/src/assets/images/uppsd.png new file mode 100644 index 0000000..0fd0259 Binary files /dev/null and b/src/assets/images/uppsd.png differ