diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4f4acf6..0eac6ce 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -7,24 +7,21 @@ import { LockscreenComponent } from './pages/lockscreen/lockscreen.component'; //路由守卫 import {AuthGuard} from './auth.guard' import { CreateTestScoreComponent } from './examiner/create-test-score/create-test-score.component'; -import { ExaminerIndexComponent } from './examiner/examiner-index/examiner-index.component' const routes: Routes = [ {path:'',redirectTo:'login',pathMatch:'full'}, { - path:'home', - component:NavigationComponent, - canActivate: [AuthGuard],//守卫验证 + path:'home',component:NavigationComponent,canActivate: [AuthGuard],//守卫验证 children:[ - {path:'',loadChildren:() => import('./examiner/examiner.module').then(m => m.ExaminerModule)} + {path:'',loadChildren:() => import('./examiner/examiner.module').then(m => m.ExaminerModule)}, + {path:'',loadChildren:() => import('./ui/ui.module').then(m => m.UiModule)} ] }, + { path:'examiner/create-test-score', component:CreateTestScoreComponent,canActivate: [AuthGuard],}, //创建试卷具体分数页面 { path:'adminLogin', component:LoginComponent}, //管理员登录路由 { path:'login', component:LockscreenComponent}, //教员学员登录路由 - { path:'examiner/create-test-score', component:CreateTestScoreComponent}, //创建试卷具体分数页面 - ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c998e2e..126f803 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -21,6 +21,7 @@ import { registerLocaleData } from '@angular/common'; import zh from '@angular/common/locales/zh'; import { ExaminerModule } from './examiner/examiner.module'; registerLocaleData(zh); + @NgModule({ declarations: [ AppComponent @@ -32,7 +33,6 @@ registerLocaleData(zh); MatButtonModule, MatCheckboxModule, MatSidenavModule, - // NavigationModule, MatIconModule, PagesModule, FormsModule, diff --git a/src/app/examiner/examiner-routing.ts b/src/app/examiner/examiner-routing.ts index c511108..33e459b 100644 --- a/src/app/examiner/examiner-routing.ts +++ b/src/app/examiner/examiner-routing.ts @@ -11,9 +11,7 @@ import { NgModule } from '@angular/core'; import { ExaminerIndexComponent } from './examiner-index/examiner-index.component' const routes: Routes = [ - // { path: '', component:CreateExamComponent } - { path: 'createexam-index', component:ExaminerIndexComponent } - + { path: 'createexam-index', component:ExaminerIndexComponent }, ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/examiner/examiner.module.ts b/src/app/examiner/examiner.module.ts index 00361b2..96c7a81 100644 --- a/src/app/examiner/examiner.module.ts +++ b/src/app/examiner/examiner.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { examinerRoutingModule } from './examiner-routing'; - import {A11yModule} from '@angular/cdk/a11y'; import {DragDropModule} from '@angular/cdk/drag-drop'; import {PortalModule} from '@angular/cdk/portal'; @@ -18,7 +17,7 @@ import {MatCardModule} from '@angular/material/card'; import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatChipsModule} from '@angular/material/chips'; import {MatStepperModule} from '@angular/material/stepper'; -// import {MatDatepickerModule} from '@angular/material/datepicker'; +import {MatDatepickerModule} from '@angular/material/datepicker'; import {MatDialogModule} from '@angular/material/dialog'; import {MatDividerModule} from '@angular/material/divider'; import {MatExpansionModule} from '@angular/material/expansion'; @@ -54,7 +53,6 @@ import { ExaminerIndexComponent } from './examiner-index/examiner-index.componen - @NgModule({ declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog], imports: [ @@ -74,7 +72,7 @@ import { ExaminerIndexComponent } from './examiner-index/examiner-index.componen MatCheckboxModule, MatChipsModule, MatStepperModule, - // MatDatepickerModule, + MatDatepickerModule, MatDialogModule, MatDividerModule, MatExpansionModule, diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index bdc4947..c52fa74 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -28,7 +28,6 @@ export class NavigationComponent implements OnInit { //左侧菜单点击事件 clickLeftmenu(name){ this.leftMenuname=name - console.log(this.leftMenuname) } //支队级菜单 @@ -70,20 +69,12 @@ export class NavigationComponent implements OnInit { { id:"学员管理", name:"学员管理" }, { id:"教员管理", name:"教员管理" } ] - isAdmin:boolean = false ngOnInit() { - // this.http.get('/api/DataBanks').subscribe((data:any) => { - // if(data && data.length != 0){ - // this.selectedDataBank = data[0].id - // } - // }) - // this.getAllDataBank() - this.selectedDataBank = "支队级-主官" - if(sessionStorage.getItem("roleType") == "0"){ - this.isAdmin = true - } + // if(sessionStorage.getItem("roleType") == "0"){ + // this.isAdmin = true + // } } @@ -99,135 +90,6 @@ export class NavigationComponent implements OnInit { this.darktheme = true } - - //点击用户管理 - clickUser(item){ - this.selectedDataBank = item.id - if(item.name == "学员管理"){ - this.router.navigate([`/home/userManagement`]) - }else if(item.name == "教员管理"){ - this.router.navigate([`/home/teacherManagement`]) - } - - } - - //新增资料库 - // addDataBank(){ - // const dialogRef = this.dialog.open(AddDataBank, {//调用open方法打开对话框并且携带参数过去 - // width: '260px', - // data: {} - // }); - // dialogRef.afterClosed().subscribe( - // (data:any)=>{ - // if(data){ - // let headers = new HttpHeaders({ - // 'Content-Type': 'text/json' - // }); - // let options = { - // headers - // }; - // let body = JSON.stringify(data.name); - // this.http.post('/api/DataBanks',body,options).subscribe(data => { - // this.getAllDataBank() - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('创建资料库成功','确定',config); - // }, - // err => { - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open(err,'确定',config); - // }) - // } - // } - // ); - // } - - - //获得所有资料库 - // getAllDataBank(){ - // this.http.get('/api/DataBanks').subscribe(data => { - // this.allDataBank = data - // // console.log(123,data) - // } - // , - // err=>{ - // // console.log(456,err) - // }) - // } - - - //点击资料库 - clickLi(item){ - this.selectedDataBank = item.id - //触发子组件的方法 - // this.child.getALLFileList(item.id); - // this.child.selection.clear(); - this.router.navigate([`/home`]) - this.emitService.eventEmit.emit(item.id); - } - - - //鼠标移入资料库 - liEnter(item){ - this.hoverDataBank = item.id - } - //鼠标移出资料库 - liLeave(item){ - this.hoverDataBank = "" - } - //修改资料库名称 - editDataBankName(e,item){ - e.stopPropagation() - const dialogRef = this.dialog.open(EditDataBankName, {//调用open方法打开对话框并且携带参数过去 - width: '260px', - data: {name:item.name} - }); - dialogRef.afterClosed().subscribe( - (data:any)=>{ - if(data){ - if(data != item.name){ - let headers = new HttpHeaders({ - 'Content-Type': 'text/json' - }); - let options = { - headers - }; - let body = JSON.stringify(data.name); - this.http.put(`/api/DataBanks/${item.id}`,body,options).subscribe(data => { - // this.getAllDataBank() - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('修改资料库名称成功','确定',config); - }) - } - } - } - ); - } - //删除资料库 - deleteDataBank(e,item){ - e.stopPropagation() - var r = confirm(`您确定要删除 ${item.name} 资料库吗？`); - if (r == true) { - this.http.delete(`/api/DataBanks/${item.id}`).subscribe(data => { - // this.getAllDataBank() - let config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除成功','确定',config); - }, - err=>{ - let config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除失败，请联系管理员','确定',config); - }) - } - } } //新增资料库 diff --git a/src/app/pages/lockscreen/lockscreen.component.html b/src/app/pages/lockscreen/lockscreen.component.html index bd55be4..5a296cc 100644 --- a/src/app/pages/lockscreen/lockscreen.component.html +++ b/src/app/pages/lockscreen/lockscreen.component.html @@ -1,5 +1,7 @@
-
+
+ +
@@ -28,7 +30,7 @@
{{errmsg}}
- +
diff --git a/src/app/pages/lockscreen/lockscreen.component.scss b/src/app/pages/lockscreen/lockscreen.component.scss index de121e5..8466be9 100644 --- a/src/app/pages/lockscreen/lockscreen.component.scss +++ b/src/app/pages/lockscreen/lockscreen.component.scss @@ -1,6 +1,8 @@ .content { width: 100%; height: 100%; + min-width: 1024px; + min-height: 768px; display: flex; overflow: hidden; box-sizing: border-box; @@ -9,6 +11,9 @@ flex: 70%; background: url('../../../assets/images/loginBackground.png'); background-size: 100% 100%; + display: flex; + align-items: center; + justify-content: center; } .loginBox { flex: 30%; diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html index 3b7b8fa..443f290 100644 --- a/src/app/pages/login/login.component.html +++ b/src/app/pages/login/login.component.html @@ -20,7 +20,7 @@
{{errmsg}}
- + diff --git a/src/app/pages/login/login.component.scss b/src/app/pages/login/login.component.scss index dd3e43a..504997a 100644 --- a/src/app/pages/login/login.component.scss +++ b/src/app/pages/login/login.component.scss @@ -1,6 +1,8 @@ .login { width: 100%; height: 100%; + min-width: 1024px; + min-height: 768px; overflow: hidden; box-sizing: border-box; padding: 1px; diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html index d6a537f..354a895 100644 --- a/src/app/tabbar/tabbar.component.html +++ b/src/app/tabbar/tabbar.component.html @@ -10,7 +10,6 @@

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

- --> - diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 987b642..003f889 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -4,13 +4,13 @@ import { AllFileComponent } from './all-file/all-file.component'; import { EnterpriseuserComponent } from './enterpriseuser/enterpriseuser.component'; import { TeacherManagementComponent } from './teacherManagement/enterpriseuser.component'; import {EhartsStatisticsComponent} from './eharts-statistics/eharts-statistics.component' - import { LearningRecordDetailsComponent } from './learning-record-details/learning-record-details.component'; import { CreateExamComponent } from './create-exam/create-exam.component'; import { LookOverTestComponent } from './look-over-test/look-over-test.component'; import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; import { JoinExamComponent } from './join-exam/join-exam.component'; import { TestRecordsComponent } from './test-records/test-records.component'; + const routes: Routes = [ { path: '', component:CreateExamComponent }, { path: 'createexam', component:CreateExamComponent }, diff --git a/src/assets/images/loginBackground.png b/src/assets/images/loginBackground.png index ba9ab6d..6358699 100644 Binary files a/src/assets/images/loginBackground.png and b/src/assets/images/loginBackground.png differ diff --git a/src/assets/images/loginCenter.png b/src/assets/images/loginCenter.png new file mode 100644 index 0000000..53d89f7 Binary files /dev/null and b/src/assets/images/loginCenter.png differ diff --git a/src/assets/images/logo1.png b/src/assets/images/logo1.png deleted file mode 100644 index 4446bc9..0000000 Binary files a/src/assets/images/logo1.png and /dev/null differ diff --git a/src/assets/images/main_bg.png b/src/assets/images/main_bg.png deleted file mode 100644 index 8beb6c5..0000000 Binary files a/src/assets/images/main_bg.png and /dev/null differ