diff --git a/package-lock.json b/package-lock.json index b5831d7..0492bc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16031,8 +16031,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -16075,8 +16074,7 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", @@ -16087,8 +16085,7 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -16205,8 +16202,7 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -16218,7 +16214,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -16248,7 +16243,6 @@ "version": "2.9.0", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -16267,7 +16261,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -16370,7 +16363,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -16456,8 +16448,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -16493,7 +16484,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -16513,7 +16503,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -16557,14 +16546,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -17002,8 +16989,7 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -17120,8 +17106,7 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -17163,7 +17148,6 @@ "version": "2.9.0", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -17182,7 +17166,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -17285,7 +17268,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -17371,8 +17353,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -17408,7 +17389,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -17472,14 +17452,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d149e86..e4b547a 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { LoginComponent } from './pages/login/login.component'; -import { RegisterComponent } from './pages/register/register.component'; import { NavigationComponent } from './navigation/navigation.component'; import { LockscreenComponent } from './pages/lockscreen/lockscreen.component'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 6602cda..5664cce 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,6 +1,5 @@ import { Component } from '@angular/core'; import { HttpClient } from '@angular/common/http' -import { Data } from './interface' import { Router,ActivatedRoute } from '@angular/router' import { IsLoginService } from './is-login.service' //引入服务 import {CacheTokenService} from './http-interceptors/cache-token.service' //引入服务 @@ -14,7 +13,6 @@ import {CacheTokenService} from './http-interceptors/cache-token.service' //引 }) export class AppComponent { - constructor(private http:HttpClient,private router:Router,public token:CacheTokenService,public isLogin:IsLoginService) { } ngOnInit(): void { diff --git a/src/app/http-interceptors/cache-token.service.ts b/src/app/http-interceptors/cache-token.service.ts index 29e5bfd..f5acaf9 100644 --- a/src/app/http-interceptors/cache-token.service.ts +++ b/src/app/http-interceptors/cache-token.service.ts @@ -29,7 +29,7 @@ export class CacheTokenService { } else { this.delete() } },18*60*1000) } - + //删除定时器 delete = ():void=> { window.clearInterval(this.timer) diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 41b6b56..306e96f 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -1,30 +1,31 @@ - -
- logo -
- - + +
+ logo +
+ - -
+
-
- - - +
+
+ +
+
+
+
diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss index 717c7ca..5c17aaa 100644 --- a/src/app/navigation/navigation.component.scss +++ b/src/app/navigation/navigation.component.scss @@ -175,6 +175,8 @@ mat-sidenav{ .example-sidenav-content{ height: 100%; overflow: hidden; + display: flex; + flex-direction: column; } //一级目录前图标 diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts deleted file mode 100644 index ec1ecae..0000000 --- a/src/app/pages/pages-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -// import { Routes, RouterModule } from '@angular/router'; -// import { NgModule } from '@angular/core'; -// import { PagesComponent } from './pages.component'; -// import { PersonaldataComponent } from './personaldata/personaldata.component'; - - -// const routes: Routes = [ -// { path: '', component: PagesComponent}, -// { path: 'personaldata ', component: PersonaldataComponent}, - -// ]; - -// @NgModule({ -// imports: [RouterModule.forChild(routes)], -// exports: [RouterModule] -// }) -// export class PagesRoutingModule {} diff --git a/src/app/pages/pages.component.html b/src/app/pages/pages.component.html deleted file mode 100644 index c56369e..0000000 --- a/src/app/pages/pages.component.html +++ /dev/null @@ -1 +0,0 @@ -

pages works!

diff --git a/src/app/pages/pages.component.scss b/src/app/pages/pages.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/pages/pages.component.spec.ts b/src/app/pages/pages.component.spec.ts deleted file mode 100644 index 7a864ac..0000000 --- a/src/app/pages/pages.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PagesComponent } from './pages.component'; - -describe('PagesComponent', () => { - let component: PagesComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ PagesComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PagesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts deleted file mode 100644 index d8ad6cb..0000000 --- a/src/app/pages/pages.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-pages', - templateUrl: './pages.component.html', - styleUrls: ['./pages.component.scss'] -}) -export class PagesComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 2282c13..9a9e5fa 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -1,11 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { PagesComponent } from './pages.component'; import { LoginComponent } from './login/login.component'; -import { RegisterComponent } from './register/register.component'; -// import { PagesRoutingModule } from './pages-routing.module' - - import {A11yModule} from '@angular/cdk/a11y'; import {DragDropModule} from '@angular/cdk/drag-drop'; import {PortalModule} from '@angular/cdk/portal'; @@ -48,17 +43,13 @@ import {MatToolbarModule} from '@angular/material/toolbar'; import {MatTooltipModule} from '@angular/material/tooltip'; import {MatTreeModule} from '@angular/material/tree'; import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { PersonaldataComponent } from './personaldata/personaldata.component'; import { RouterModule } from '@angular/router'; import { LockscreenComponent } from './lockscreen/lockscreen.component'; -// import { PagesRoutingModule } from './pages-routing.module'; - @NgModule({ - declarations: [PagesComponent, LoginComponent, RegisterComponent, LockscreenComponent], + declarations: [LoginComponent, LockscreenComponent], imports: [ CommonModule, - A11yModule, CdkStepperModule, CdkTableModule, @@ -70,7 +61,6 @@ import { LockscreenComponent } from './lockscreen/lockscreen.component'; MatButtonModule, MatButtonToggleModule, MatCardModule, - MatCheckboxModule, MatChipsModule, MatStepperModule, @@ -102,11 +92,9 @@ import { LockscreenComponent } from './lockscreen/lockscreen.component'; MatTreeModule, PortalModule, ScrollingModule, - FormsModule, ReactiveFormsModule, RouterModule - // PagesRoutingModule, ] }) export class PagesModule { } diff --git a/src/app/pages/personaldata/personaldata.component.html b/src/app/pages/personaldata/personaldata.component.html deleted file mode 100644 index 4e0fb3e..0000000 --- a/src/app/pages/personaldata/personaldata.component.html +++ /dev/null @@ -1,280 +0,0 @@ -
-
- - - - 安信科创 - 嘻嘻嘻嘻 -

- 不要做程序员,要做问题解决者 -

-
- - - - -
- -
- -
- 260 - 粉丝 -
-
- 180 - 关注 -
-
- 2000 - 博客 -
-
-
- - - - - - -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- 我是假数据 -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- - - - -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- - 我是假数据 -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- 我是假数据 -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- 我是假数据 -
-
-
-
- -
-
- - - -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- - 我是假数据 -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- 我是假数据 -
-
- - - -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- 我是假数据 -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- 我是假数据 -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- - - - -
-
-
-
- - - -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- 我是假数据 -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- - 我是假数据 -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- - - - -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- 我是假数据 -
-
- -
- -
-
我是假数据 - 我是假数据 -
- 我是假数据 -
-
-
- 我是假数据 -
-
-
-
-
-
-
-
diff --git a/src/app/pages/personaldata/personaldata.component.scss b/src/app/pages/personaldata/personaldata.component.scss deleted file mode 100644 index 674904d..0000000 --- a/src/app/pages/personaldata/personaldata.component.scss +++ /dev/null @@ -1,110 +0,0 @@ - -#xxx{ - display: flex; - justify-content: space-around; -} -.pages-profile { - padding: 30px; - - .profile-card { - padding: 9px; - text-align: center; - font-family: Roboto, sans-serif; - width: 500px; - height: 600px; - mat-card-content { - padding: 40px 15px; - margin: 0; - } - - .mat-card-avatar { - width: 130px; - height: 130px; - margin-bottom: 10px; - } - - .profile-user { - margin: 10px 0; - font-weight: normal; - } - - .profile-job { - margin-bottom: 20px; - color: #9e9e9e; - font-weight: 500; - } - - .profile-introduction { - margin: 0 0 1rem; - color: #757575; - } - - .profile-social { - margin: 25px 0; - - mat-icon { - margin: 0 10px; - color: rgba(66, 66, 66, .4); - } - } - - mat-card-actions { - padding: 10px; - background: #f6f9fd; - } - - .profile-card-footer { - display: flex; - justify-content: space-around; - .profile-stat-count { - display: block; - margin-bottom: 3px; - font-size: 20px; - font-weight: bold; - color: #616161; - - +span { - color: #9e9e9e; - } - } - } - - } - - .profile-board { - padding: 30px; - width: 500px; - mat-list { - padding-bottom: 20px; - } - - mat-list-item { - height: auto; - padding: 25px 0; - margin-left: -16px; - border-bottom: 1px solid #dfe0df; - - .profile-item-content { - padding: 20px 0 0 56px; - line-height: 1.571429; - color: #757575; - white-space: normal; - display: flex; - flex-wrap: wrap; - - img { - width: 100%; - max-width: 220px; - max-height: 150px; - padding: 0 20px 20px 0; - } - } - } - } - - .show-more-btn { - width: 100%; - background-color: #eee; - color: #3949ab; - } -} \ No newline at end of file diff --git a/src/app/pages/personaldata/personaldata.component.spec.ts b/src/app/pages/personaldata/personaldata.component.spec.ts deleted file mode 100644 index cf44bea..0000000 --- a/src/app/pages/personaldata/personaldata.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PersonaldataComponent } from './personaldata.component'; - -describe('PersonaldataComponent', () => { - let component: PersonaldataComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ PersonaldataComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PersonaldataComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/personaldata/personaldata.component.ts b/src/app/pages/personaldata/personaldata.component.ts deleted file mode 100644 index 28d9b93..0000000 --- a/src/app/pages/personaldata/personaldata.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-personaldata', - templateUrl: './personaldata.component.html', - styleUrls: ['./personaldata.component.scss'] -}) -export class PersonaldataComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/pages/register/register.component.html b/src/app/pages/register/register.component.html deleted file mode 100644 index 4439983..0000000 --- a/src/app/pages/register/register.component.html +++ /dev/null @@ -1,81 +0,0 @@ - \ No newline at end of file diff --git a/src/app/pages/register/register.component.scss b/src/app/pages/register/register.component.scss deleted file mode 100644 index 32cd9ee..0000000 --- a/src/app/pages/register/register.component.scss +++ /dev/null @@ -1,88 +0,0 @@ -.login { - width: 100%; - height: 100%; - // background: url('../../../assets/images/bg_login.jpg'); - - .loginbox { - width: 100%; - height: 100%; - background-color: #000; - background: rgba(0,0,0,0.5);/*盒子背景透明*/ - // opacity: 0.5; - position: relative; - } - - .intro { - width: 650px; - // height: 350px; - position: fixed; - top:35%; - left: 15%; - p { - font-size: 36px; - color:white; - margin-bottom: 35px; - } - span { - font-size: 16px; - color:white; - opacity: 0.5; - } - } - - .card{ - width: 460px; - height: 100%; - padding-left: 20px; - background-color: #fff; - position: absolute; - right: 0; - p { - width: 100%; - margin: 18px 0; - } - .cardheader{ - font-size: 26px; - font-weight: 500; - } - - } - -} - -.example-container { - display: flex; - flex-direction: column; -} - -.example-container > * { - width: 100%; -} -.loginbtn { - margin-top: 18px; - height: 35px; - background-color:#039be5; - border-radius: 15px; - color: #fff;; -} -.mat-card { - box-shadow: 0 0 0; - margin-top: 70px; -} - -.applyfor { - font-size: 16px; - a { - color: #039be5; - } -} - -.website { - font-size: 14px; - text-align: center; - margin-top: 50px; -} -.alert-danger { - font-size: 14px; - color: red; -} \ No newline at end of file diff --git a/src/app/pages/register/register.component.spec.ts b/src/app/pages/register/register.component.spec.ts deleted file mode 100644 index 6c19551..0000000 --- a/src/app/pages/register/register.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { RegisterComponent } from './register.component'; - -describe('RegisterComponent', () => { - let component: RegisterComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ RegisterComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(RegisterComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts deleted file mode 100644 index 6f9552f..0000000 --- a/src/app/pages/register/register.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-register', - templateUrl: './register.component.html', - styleUrls: ['./register.component.scss'] -}) -export class RegisterComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - - onSubmit(e){ - // console.log(e) - } - -} diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index d2ff06f..d3465c9 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -17,7 +17,6 @@ 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 {MatDialogModule} from '@angular/material/dialog'; import {MatDividerModule} from '@angular/material/divider'; import {MatExpansionModule} from '@angular/material/expansion'; @@ -45,7 +44,6 @@ import {MatTreeModule} from '@angular/material/tree'; import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatPaginatorIntl } from '@angular/material/paginator'; -import { PersonaldataComponent } from '../pages/personaldata/personaldata.component'; import { ChangepasswordComponent } from './changepassword/changepassword.component'; import { SizePipe , NamePipe,NamePipe2, NamePipe3, testState} from '../pipes/size.pipe'; import {ConfirmpswDirective} from './changepassword/equal-validator.directive'; @@ -69,7 +67,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,PersonaldataComponent, 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, LoginComponent, UploadFilesComponent,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,TeacherManagementComponent,editTeacher,AddTeacher,seeTeacher, LearningRecordDetailsComponent, EhartsStatisticsComponent, CreateExamComponent, LookOverTestComponent, StatisticAnalysisComponent, JoinExamComponent, TestRecordsComponent,testState,CreateDialog], imports: [ NzDatePickerModule, @@ -89,7 +87,6 @@ import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; MatCheckboxModule, MatChipsModule, MatStepperModule, - // MatDatepickerModule, MatDialogModule, MatDividerModule, MatExpansionModule, @@ -117,7 +114,6 @@ import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; MatTreeModule, PortalModule, ScrollingModule, - ReactiveFormsModule, FormsModule, FileUploadModule diff --git a/src/assets/images/loginBackground.png b/src/assets/images/loginBackground.png new file mode 100644 index 0000000..ba9ab6d Binary files /dev/null and b/src/assets/images/loginBackground.png differ diff --git a/src/index.html b/src/index.html index b6b8eee..1b14057 100644 --- a/src/index.html +++ b/src/index.html @@ -2,12 +2,11 @@ - 灭火救援指挥培训系统 + 消防救援单位信息考核系统 -