From 45f9d19418c74e337586874e4f0356553c4b4f91 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Fri, 3 Apr 2020 15:41:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=B6=88=E9=98=B2=E8=AE=BE?= =?UTF-8?q?=E6=96=BD=E5=88=9D=E6=AD=A5=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 2 +- src/app/app-routing.module.ts | 4 -- src/app/navigation/navigation.component.html | 3 +- .../fire-fighting-device.component.html | 67 +++++++++++++----- .../fire-fighting-device.component.scss | 43 ++++++++--- .../fire-fighting-device.component.ts | 35 ++++++++- .../realistic-picture.component.html | 2 +- src/assets/images/logo.png | Bin 20693 -> 0 bytes 8 files changed, 121 insertions(+), 35 deletions(-) delete mode 100644 src/assets/images/logo.png diff --git a/proxy.config.json b/proxy.config.json index 70e3504..13a8131 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://39.106.78.171:8088", + "target": "http://59.111.63.117:8090", "secure": false, "changeOrigin": true } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 10ba6b9..2362202 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,7 +3,6 @@ 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'; //路由守卫 import {AuthGuard} from './auth.guard' @@ -26,9 +25,6 @@ const routes: Routes = [ {path:'register', component:RegisterComponent,}, //注册页 - // {path:'lockscreen', - // component:LockscreenComponent, - // canActivate: [AuthGuard],}//守卫验证 ]; @NgModule({ diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 825c5b9..7cd1af8 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -6,7 +6,6 @@