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/examiner/examiner-index/examiner-index.component.spec.ts b/src/app/examiner/examiner-index/examiner-index.component.spec.ts
new file mode 100644
index 0000000..9b6d381
--- /dev/null
+++ b/src/app/examiner/examiner-index/examiner-index.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ExaminerIndexComponent } from './examiner-index.component';
+
+describe('ExaminerIndexComponent', () => {
+ let component: ExaminerIndexComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ExaminerIndexComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ExaminerIndexComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
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 ee2f7dc..40da210 100644
--- a/src/app/examiner/examiner.module.ts
+++ b/src/app/examiner/examiner.module.ts
@@ -47,9 +47,10 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatPaginatorIntl } from '@angular/material/paginator';
import { myPaginator } from '../ui/my-paginator';
+import { ExaminerIndexComponent } from './examiner-index/examiner-index.component';
@NgModule({
- declarations: [],
+ declarations: [ExaminerIndexComponent],
imports: [
CommonModule,
examinerRoutingModule,
diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html
index 41b6b56..6b8724e 100644
--- a/src/app/navigation/navigation.component.html
+++ b/src/app/navigation/navigation.component.html
@@ -1,19 +1,34 @@
+
+
+
+
-
+
+
+
+
+
上海消防救援
+
shanghai fire and rescue
+
+
-
- - 参加考试
- - 考试记录
+ 
创建考试
阅卷
统计分析
+
diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss
index 717c7ca..8a80aec 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;
@@ -188,4 +215,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/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html
index 3c8e9b8..10d232e 100644
--- a/src/app/tabbar/tabbar.component.html
+++ b/src/app/tabbar/tabbar.component.html
@@ -1,30 +1,39 @@
-
+
+
- 考核系统
+ 欢迎登录消防救援考核系统
- 欢迎您，{{realName}}
+
-