From ba0683dffe0a40b533f48ef737caad574016246c Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Mon, 3 Dec 2018 11:28:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=AF=E7=94=B1=E5=A4=8D?= =?UTF-8?q?=E7=94=A8=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 11 +- src/app/app.module.ts | 9 +- src/app/login/login-routing.module.ts | 3 +- .../basic-data/basic-data-routing.module.ts | 42 +++-- .../historical-data-routing.module.ts | 3 +- src/app/pages/main/main-routing.module.ts | 3 +- src/app/pages/main/main.component.html | 12 +- src/app/pages/main/main.component.scss | 13 ++ src/app/pages/main/main.component.ts | 175 +++++++++--------- src/app/pages/operate-spin-service.service.ts | 4 +- src/app/pages/pages-routing.module.ts | 15 +- src/app/pages/pages.component.html | 6 +- src/app/pages/pages.component.scss | 14 ++ src/app/pages/pages.component.ts | 10 +- src/app/pages/pages.module.ts | 2 +- .../seasonal-plan-routing.module.ts | 3 +- .../system-management-routing.module.ts | 19 +- src/app/register/register-routing.module.ts | 3 +- src/app/router-reuse-strategy.ts | 85 +++++++++ src/app/services/websocket.service.ts | 1 + src/assets/images/page-loading.gif | Bin 0 -> 1324443 bytes 21 files changed, 289 insertions(+), 144 deletions(-) create mode 100644 src/app/router-reuse-strategy.ts create mode 100644 src/assets/images/page-loading.gif diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index fad259a..f6284ca 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -6,7 +6,7 @@ import { RouterModule, Routes } from '@angular/router'; import { SelectivePreloadingStrategy } from './preloading-strategy'; /* 引入路由权限控制 */ -import {LoginAuthService} from './services/login-auth.service' +import { LoginAuthService } from './services/login-auth.service' /* 定义路由 */ @@ -15,18 +15,19 @@ const appRoutes: Routes = [ { path: 'login', loadChildren: './login/login.module#LoginModule', - canActivate:[LoginAuthService], + canActivate: [LoginAuthService], + data: { preload: false, reuse: false } }, { path: 'register', loadChildren: './register/register.module#RegisterModule', - // data: { preload: false } + data: { preload: false, reuse: false } }, { path: 'app', loadChildren: './pages/pages.module#PagesModule', - canActivate:[LoginAuthService], - data: { preload: false } + canActivate: [LoginAuthService], + data: { preload: false, reuse: true } } ] diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 60b74b6..36ff455 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,6 @@ import { BrowserModule } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations' +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouteReuseStrategy } from '@angular/router'; import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common' import { HttpClientModule } from '@angular/common/http' @@ -25,6 +26,9 @@ import { LoginAuthService } from './services/login-auth.service'; /* websocket */ import { WebsocketService } from './services/websocket.service'; +/* 路由缓存策略 */ +import { AppReuseStrategy } from './router-reuse-strategy'; + @NgModule({ declarations: [ AppComponent @@ -43,7 +47,8 @@ import { WebsocketService } from './services/websocket.service'; LoginAuthService, HttpService, HttpClientService, - WebsocketService + WebsocketService, + { provide: RouteReuseStrategy, useClass: AppReuseStrategy } ], bootstrap: [AppComponent] }) diff --git a/src/app/login/login-routing.module.ts b/src/app/login/login-routing.module.ts index f3c9374..7710a68 100644 --- a/src/app/login/login-routing.module.ts +++ b/src/app/login/login-routing.module.ts @@ -6,7 +6,8 @@ import { LoginComponent } from './login.component' const loginRoutes: Routes = [ { path: '', - component: LoginComponent + component: LoginComponent, + data: { preload: false, reuse: false } } ] diff --git a/src/app/pages/basic-data/basic-data-routing.module.ts b/src/app/pages/basic-data/basic-data-routing.module.ts index eb8ba7a..2d7bf98 100644 --- a/src/app/pages/basic-data/basic-data-routing.module.ts +++ b/src/app/pages/basic-data/basic-data-routing.module.ts @@ -21,57 +21,75 @@ const basicDataRoutes: Routes = [ path: '', component: BasicDataComponent, children:[ + { + path:'', + redirectTo:'chekingroup', + pathMatch:'full' + }, { path:'checkingroup', - component:CheckinGroupComponent + component:CheckinGroupComponent, + data: { preload: true, reuse: false } }, { path:'gate', - component:GateComponent + component:GateComponent, + data: { preload: true, reuse: false } }, { path:'terminal', component:TerminalComponent, + data: { preload: true, reuse: false } }, { path:'chut', - component:ChutComponent + component:ChutComponent, + data: { preload: true, reuse: false } }, { path:'stand', - component:StandComponent + component:StandComponent, + data: { preload: true, reuse: false } }, { path:'carousel', - component:CarouselComponent + component:CarouselComponent, + data: { preload: true, reuse: false } }, { path:'checkindesk', - component:CheckinDeskComponent + component:CheckinDeskComponent, + data: { preload: true, reuse: false } }, { path:'airport', - component:AirportComponent + component:AirportComponent, + data: { preload: true, reuse: false } }, { path:'city', - component:CityComponent + component:CityComponent, + data: { preload: true, reuse: false } }, { path:'aircrafttype', - component:AircraftTypeComponent + component:AircraftTypeComponent, + data: { preload: true, reuse: false } }, { path:'aircraft', - component:AircraftComponent + component:AircraftComponent, + data: { preload: true, reuse: false } }, { path:'terminalarea', - component:TerminalAreaComponent + component:TerminalAreaComponent, + data: { preload: true, reuse: false } }, { path:'airline', - component:AirlineComponent + component:AirlineComponent, + data: { preload: true, reuse: false } } ] } diff --git a/src/app/pages/historical-data/historical-data-routing.module.ts b/src/app/pages/historical-data/historical-data-routing.module.ts index b62e70b..4014ea0 100644 --- a/src/app/pages/historical-data/historical-data-routing.module.ts +++ b/src/app/pages/historical-data/historical-data-routing.module.ts @@ -6,7 +6,8 @@ import { HistoricalDataComponent } from './historical-data.component'; const historicalDataRoutes: Routes = [ { path: '', - component: HistoricalDataComponent + component: HistoricalDataComponent, + data: { preload: true, reuse: false } } ] diff --git a/src/app/pages/main/main-routing.module.ts b/src/app/pages/main/main-routing.module.ts index 952014b..1fa5d67 100644 --- a/src/app/pages/main/main-routing.module.ts +++ b/src/app/pages/main/main-routing.module.ts @@ -5,7 +5,8 @@ import { MainComponent } from './main.component' const mainRoutes: Routes = [ { path: '', - component: MainComponent + component: MainComponent, + data: { preload: true, reuse: true } } ] diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html index 5b9bc66..9540874 100644 --- a/src/app/pages/main/main.component.html +++ b/src/app/pages/main/main.component.html @@ -18,10 +18,7 @@
- -
@@ -53,12 +50,6 @@ -