From f844871bcac61b82245ada606e300faa3fc1428e Mon Sep 17 00:00:00 2001 From: username <1105965053@qq.com> Date: Sun, 20 Sep 2020 16:35:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 25 ++- .../gis-management-routing.module.ts | 3 - src/app/http-interceptors/base-interceptor.ts | 3 +- .../http-interceptors/cache-token.service.ts | 33 +++- src/app/m-token-k1/m-token-k1.component.ts | 4 - src/app/navigation/navigation.component.html | 77 ++------ src/app/navigation/navigation.component.scss | 167 +++++------------- src/app/navigation/navigation.component.ts | 36 ++-- .../pages/lockscreen/lockscreen.component.ts | 3 - src/app/pages/login/login.component.ts | 34 +--- src/app/pages/pages-routing.module.ts | 9 - src/app/pages/register/register.component.ts | 1 - src/app/tabbar/tabbar.component.ts | 19 +- .../collection-tools.component.scss | 2 +- .../collection-tools.component.ts | 7 +- src/app/ui/dangerous/dangerous.component.html | 1 + src/app/ui/dangerous/dangerous.component.scss | 0 .../dangerous.component.spec.ts} | 12 +- src/app/ui/dangerous/dangerous.component.ts | 15 ++ .../disposal-node.component.html | 1 + .../disposal-node.component.scss | 0 .../disposal-node.component.spec.ts | 25 +++ .../disposal-node/disposal-node.component.ts | 15 ++ src/app/ui/footer/footer.component.html | 6 - src/app/ui/footer/footer.component.scss | 15 -- src/app/ui/footer/footer.component.ts | 15 -- .../plan-assistance.component.html | 1 + .../plan-assistance.component.scss | 0 .../plan-assistance.component.spec.ts | 25 +++ .../plan-assistance.component.ts | 15 ++ .../ui/real-cases/real-cases.component.html | 1 + .../ui/real-cases/real-cases.component.scss | 0 .../real-cases/real-cases.component.spec.ts | 25 +++ src/app/ui/real-cases/real-cases.component.ts | 15 ++ .../similar-plans.component.html | 1 + .../similar-plans.component.scss | 0 .../similar-plans.component.spec.ts | 25 +++ .../similar-plans/similar-plans.component.ts | 15 ++ src/app/ui/ui-routing.module.ts | 16 +- src/app/ui/ui.component.html | 2 +- src/app/ui/ui.module.ts | 9 +- .../working-area/working-area.component.ts | 26 ++- src/index.html | 4 +- 43 files changed, 348 insertions(+), 360 deletions(-) create mode 100644 src/app/ui/dangerous/dangerous.component.html create mode 100644 src/app/ui/dangerous/dangerous.component.scss rename src/app/ui/{footer/footer.component.spec.ts => dangerous/dangerous.component.spec.ts} (55%) create mode 100644 src/app/ui/dangerous/dangerous.component.ts create mode 100644 src/app/ui/disposal-node/disposal-node.component.html create mode 100644 src/app/ui/disposal-node/disposal-node.component.scss create mode 100644 src/app/ui/disposal-node/disposal-node.component.spec.ts create mode 100644 src/app/ui/disposal-node/disposal-node.component.ts delete mode 100644 src/app/ui/footer/footer.component.html delete mode 100644 src/app/ui/footer/footer.component.scss delete mode 100644 src/app/ui/footer/footer.component.ts create mode 100644 src/app/ui/plan-assistance/plan-assistance.component.html create mode 100644 src/app/ui/plan-assistance/plan-assistance.component.scss create mode 100644 src/app/ui/plan-assistance/plan-assistance.component.spec.ts create mode 100644 src/app/ui/plan-assistance/plan-assistance.component.ts create mode 100644 src/app/ui/real-cases/real-cases.component.html create mode 100644 src/app/ui/real-cases/real-cases.component.scss create mode 100644 src/app/ui/real-cases/real-cases.component.spec.ts create mode 100644 src/app/ui/real-cases/real-cases.component.ts create mode 100644 src/app/ui/similar-plans/similar-plans.component.html create mode 100644 src/app/ui/similar-plans/similar-plans.component.scss create mode 100644 src/app/ui/similar-plans/similar-plans.component.spec.ts create mode 100644 src/app/ui/similar-plans/similar-plans.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e2da654..7f253cd 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -11,29 +11,28 @@ import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥 - const routes: Routes = [ - {path:'',redirectTo:'login',pathMatch:'full'}, + {path:'',redirectTo:'ui/collectionTools',pathMatch:'full',}, { path:'', component:NavigationComponent, - canActivate: [AuthGuard],//守卫验证 + // canActivate: [AuthGuard],//守卫验证 children:[ {path:'ui',loadChildren:() => import('./ui/ui.module').then(m => m.UiModule)}, - {path:'home',loadChildren:() => import('./pages/pages.module').then(m => m.PagesModule)}, - {path:'visualization',component: HomeComponent}, - {path:'gis',loadChildren:() => import('./gis-management/gis-management.module').then(m => m.GISManagementModule)} + // {path:'home',loadChildren:() => import('./pages/pages.module').then(m => m.PagesModule)}, + // {path:'visualization',component: HomeComponent}, + // {path:'gis',loadChildren:() => import('./gis-management/gis-management.module').then(m => m.GISManagementModule)} ] }, - {path:'login', - component:LoginComponent}, + // {path:'login', + // component:LoginComponent}, - {path:'getNoMToken', - component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面 + // {path:'getNoMToken', + // component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面 - {path:'lockscreen', - component:LockscreenComponent, - canActivate: [AuthGuard]}//守卫验证 + // {path:'lockscreen', + // component:LockscreenComponent, + // canActivate: [AuthGuard]}//守卫验证 ]; @NgModule({ diff --git a/src/app/gis-management/gis-management-routing.module.ts b/src/app/gis-management/gis-management-routing.module.ts index 599381e..6031db6 100644 --- a/src/app/gis-management/gis-management-routing.module.ts +++ b/src/app/gis-management/gis-management-routing.module.ts @@ -1,10 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { GisLabelingComponent } from './gis-labeling/gis-labeling.component'; - const routes: Routes = [ - { path: '', component: GisLabelingComponent }, ]; @NgModule({ diff --git a/src/app/http-interceptors/base-interceptor.ts b/src/app/http-interceptors/base-interceptor.ts index 4b14ae9..971bc44 100644 --- a/src/app/http-interceptors/base-interceptor.ts +++ b/src/app/http-interceptors/base-interceptor.ts @@ -24,7 +24,7 @@ export class BaseInterceptor implements HttpInterceptor { }); if(!req.cancelToken) { /*获取token*/ - let token = sessionStorage.getItem("token") + let token = sessionStorage.getItem("token") || '' /*此处设置额外请求头，token令牌*/ newReq.headers = newReq.headers.set('Authorization', `Bearer ${token}`) @@ -47,7 +47,6 @@ export class BaseInterceptor implements HttpInterceptor { this.token.delete() sessionStorage.clear() window.localStorage.clear() - this.router.navigate(['/login']) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 diff --git a/src/app/http-interceptors/cache-token.service.ts b/src/app/http-interceptors/cache-token.service.ts index 54f9a35..5c0d069 100644 --- a/src/app/http-interceptors/cache-token.service.ts +++ b/src/app/http-interceptors/cache-token.service.ts @@ -1,5 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http' +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import { promise } from 'protractor'; @Injectable({ providedIn: 'root' @@ -7,7 +9,36 @@ import { HttpClient } from '@angular/common/http' export class CacheTokenService { - constructor(private http:HttpClient) { } + constructor(private http:HttpClient,public snackBar: MatSnackBar) { } + + //登录 + loginData = {name: 'superadmin', password: 'anxin119'} //登录账号信息 + + login () { + return new Promise ((resolve,reject)=>{ + sessionStorage.setItem("buildingTypeId",'5e7c9027a3050b1a840ed4b8'); //建筑类型 + sessionStorage.setItem("planId",'5f52fd529e91f4410005eac5'); //预案ID + sessionStorage.setItem("companyId",'5e9964caa760a059e84512e9'); //单位ID + this.http.post('/api/Account/SignIn',this.loginData).subscribe((data:any)=>{ + sessionStorage.setItem("level",data.level); + sessionStorage.setItem("token",data.token); + sessionStorage.setItem("refreshToken",data.refreshToken); + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('自动登录成功','确定',config); + this.startUp() + resolve('success') + },(err) => { //捕获错误 + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open(err,'确定',config); + }) + }) + } + //登录 + public timer; //刷新token令牌定时器 diff --git a/src/app/m-token-k1/m-token-k1.component.ts b/src/app/m-token-k1/m-token-k1.component.ts index 592ed9b..fc88d16 100644 --- a/src/app/m-token-k1/m-token-k1.component.ts +++ b/src/app/m-token-k1/m-token-k1.component.ts @@ -58,7 +58,6 @@ export class MTokenK1Component implements OnInit { config.verticalPosition = 'top'; config.duration = 5000 this.snackBar.open('密钥错误,不为本公司发放密钥','确定',config); - this.router.navigate(['/getNoMToken']) return false } } else { //密码验证失败 @@ -66,7 +65,6 @@ export class MTokenK1Component implements OnInit { config.verticalPosition = 'top'; config.duration = 5000 this.snackBar.open('密钥密码错误,请使用初始密码','确定',config); - this.router.navigate(['/getNoMToken']) return false } @@ -75,7 +73,6 @@ export class MTokenK1Component implements OnInit { config.verticalPosition = 'top'; config.duration = 5000 this.snackBar.open('密钥未插入','确定',config); - this.router.navigate(['/getNoMToken']) return false } @@ -84,7 +81,6 @@ export class MTokenK1Component implements OnInit { config.verticalPosition = 'top'; config.duration = 5000 this.snackBar.open('请检查您密钥是否插入或者驱动是否已启动','确定',config); - this.router.navigate(['/getNoMToken']) return false } diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 1a8c721..c04401f 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -1,68 +1,15 @@ - - - -
- -
-
- -
- - - - {{item.icon}}{{item.name}} - - - -
    -
  • -
    - - - - - {{i.name}} - - -
      -
    • {{n.name}}
      • -
    -     -
    - -
    - - {{i.name}} -
    - -
    • -
- - - - - - {{item.icon}}{{item.name}} - - - - -
- -
- H5编制工具 -
-
- +
- - -
- - +
+
着火单位: 高科技创业园
+
+
{{item.name}}
+
+ +
+ +
+ +
- - diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss index eccfaa5..1fec6a3 100644 --- a/src/app/navigation/navigation.component.scss +++ b/src/app/navigation/navigation.component.scss @@ -1,131 +1,58 @@ - -.example-container { +.content { width: 100%; - height:100%; - border: 1px solid rgba(0, 0, 0, 0.5); - } -mat-accordion{ height: 100%; + box-sizing: border-box; + padding: 5px 25px; + overflow: hidden; + display: flex; + flex-direction: column; } -mat-sidenav{ - box-shadow: 2px 0px 5px #888888; - color: white; - background-color: #3c4252; - width: 240px; - overflow-x: hidden; - ul{ +//头部 +header { + width: 100%; + height: 80px; + border: 1px solid #30bbec; + border-top: none;; + .title { width: 100%; - - li{ - line-height: 48px; - cursor: pointer; - background-color: #3c4252; - color: white; - font-size: 15px; - .commondiv{ - padding-left: 52px; - } + height: 25px; + line-height: 25px; + text-align: center; + font-size: 18px; + font-weight: 550; + color: red; + } + .router{ + width: 100%; + height: 55px; + outline: none; + .routerText { + display: inline-block; + margin: 7px 15px; + width: 150px; + height: 37px; + line-height: 37px; + font-size: 20px; + text-align: center; + border-top-left-radius: 15px; + border-bottom-right-radius: 15px; + cursor:pointer; + outline: none; + border: 2px solid #999; + color: #999; } - } - } - .shownav{ - position: absolute; - top: 13px; - z-index: 200; - - } - .mat-accordion .mat-expansion-panel:first-of-type { - border-top-right-radius:0px; - border-top-left-radius:0px; - } - .mat-accordion .mat-expansion-panel:last-of-type { - border-bottom-right-radius: 0px; - border-bottom-left-radius: 0px; - } - .mat-expansion-panel{ - border-radius: 0px; - } - .mat-expansion-panel-spacing { - margin: 0px; - } - - .navbox{ - position: absolute; - left: 0px; - top: 153px; - right: -18px; - bottom: 0px; - overflow-y: scroll; - } - mat-sidenav-container.myapp-dark-theme{ - background-color: #fafafa; - color: black; - cursor: pointer; - mat-panel-title{ - color: black!important; - line-height: 24px; - } - - ul li{ - background-color: white; - color: black; - } - .biglogobox{ - background-color: #d50000; - } - color: black; - } - - .biglogobox{ - width: 250px; - background-color: #42a5f5; - padding-top: 15px; - display: block; - text-align: center; - line-height:40px; - position: relative; - color: #FFF; - font-size: 2em; - margin: 0 auto; - margin-bottom: 100px; - img{ - margin-right: 11px; - } - } - mat-panel-title mat-icon{ - color: #afb2bb; - font-size: 24px; - line-height: 24px; - margin-right: 5px; - } - mat-expansion-panel{ - background-color: #3c4252; - mat-panel-title{ - color: white; - cursor: pointer; - line-height: 24px; - } - } - - .mat-expansion-indicator::after { - color: white; - } - -.example-container .navbox .router-link-active { - background-color: rgba(225,225,225,.5); - border:0 +//路由选中样式 +.routerLinkActive { + background-color: rgba(240,136,14,0.3); + outline: none; } -.example-sidenav-content{ - height: 100%; + +//中间区域 +.center { + flex: 1; overflow: hidden; -} -.disabledclass{ - mat-panel-title{ - color: white; - } - -} +} \ No newline at end of file diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index 3f3ffca..cba3614 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -21,40 +21,24 @@ export class NavigationComponent implements OnInit { constructor(public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,private tree:TreeService,public snackBar: MatSnackBar, private router:Router,private route:ActivatedRoute) { } - treedata:any - isgrey:boolean - olddata:any - oldtreedata:any + //路由配置 + routers:any = [ + {name:'平面图', url: '/ui/collectionTools'}, + {name:'处置要点', url: '/ui/disposalNode'}, + {name:'危化品', url: '/ui/dangerous'}, + {name:'类似预案', url: '/ui/similarPlans'}, + {name:'真实战例', url: '/ui/realCases'}, + {name:'预案辅助', url: '/ui/planAssistance'} + ] ngOnInit () { - this.http.get('/api/Account/NavMenus').subscribe((data:any)=>{ - this.olddata = data - this.oldtreedata = data - let _data = this.tree.toTree(this.oldtreedata) - this.treedata = _data - }) + } ngOnDestroy () { } - darktheme = false; - switchTheme(dark) { - this.darktheme = dark; - } - - defaulttheme(){ - this.darktheme = false - } - - redtheme(){ - this.darktheme = true - } - toGis(){ - // console.log(123) - window.open(`http://39.106.78.171:8000`); - } } diff --git a/src/app/pages/lockscreen/lockscreen.component.ts b/src/app/pages/lockscreen/lockscreen.component.ts index fe3258d..93a7eea 100644 --- a/src/app/pages/lockscreen/lockscreen.component.ts +++ b/src/app/pages/lockscreen/lockscreen.component.ts @@ -14,9 +14,6 @@ export class LockscreenComponent implements OnInit { } open(){ - if(this.password == "12345678"){ - this.router.navigate(['/ui/enterpriseuser']) - } } diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 8f8c96b..db2b573 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -24,38 +24,7 @@ export class LoginComponent implements OnInit { errmsg :string = '' onSubmit(e){ - this.http.post('/api/Account/SignIn',{ - name: e.name, - password: e.password}).subscribe( (data: Data) => { - sessionStorage.setItem("level",data.level); - sessionStorage.setItem("token",data.token); - sessionStorage.setItem("refreshToken",data.refreshToken); - // this.router.navigate([`/home`]) - this.http.get('/api/Account/NavMenus').subscribe((data:any)=>{ - - let isHave = data.find(item=>{ return item.url == "/home"}) - - if (isHave) { - this.router.navigate([`/home`]) - } else { - data.forEach(item => { - if(item.url){ - this.router.navigate([`/home`]) - return - } - }); - } - - }) - if(e.notlogin){ //7天免登录时 - localStorage.setItem("isnologin","true") - localStorage.setItem("token",data.token) - localStorage.setItem("refreshToken",data.refreshToken) } - //调用服务中的function刷新token - this.token.startUp() - }, - (err) => {this.errmsg = err} - ) + } //7天免登录自动登录 @@ -71,7 +40,6 @@ export class LoginComponent implements OnInit { sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); this.token.startUp() - this.router.navigate(['/ui/userdata']) this.snackBar.open('已自动登录', '确定', {duration: 3000}); }) } //if diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts index 1024d73..25b1d60 100644 --- a/src/app/pages/pages-routing.module.ts +++ b/src/app/pages/pages-routing.module.ts @@ -1,16 +1,7 @@ import { Routes, RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; -import { PagesComponent } from './pages.component'; -import { PersonaldataComponent } from './personaldata/personaldata.component'; -import { HomeComponent } from './home/home.component'; -import { Home2Component } from './home2/home2.component'; -import { HomedetailComponent } from './homedetail/homedetail.component'; - const routes: Routes = [ - { path: '', component: HomeComponent}, - { path: '2', component: Home2Component}, - { path: 'detail', component: HomedetailComponent}, ]; diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts index 6f9552f..5da5ecf 100644 --- a/src/app/pages/register/register.component.ts +++ b/src/app/pages/register/register.component.ts @@ -13,7 +13,6 @@ export class RegisterComponent implements OnInit { } onSubmit(e){ - // console.log(e) } } diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts index b89c4ea..f599c0f 100644 --- a/src/app/tabbar/tabbar.component.ts +++ b/src/app/tabbar/tabbar.component.ts @@ -36,26 +36,10 @@ export class TabbarComponent implements OnInit { planName:any = null routerEventsListener //监测路由变化 ngOnInit() { - this.grade = this.route.snapshot.queryParams.grade - this.routerEventsListener = this.router.events.pipe( - filter(event => event instanceof NavigationEnd) - ).subscribe((e) => { - this.title = "数字化预案编制管理平台" - this.planName = null - this.grade = null - }); - this.getUserInfo() - if(this.router.url.indexOf("editunitinfo") != -1 || this.router.url.indexOf("viewunitinfoplan") != -1){//如果url地址是从录入预案跳转 - this.title = sessionStorage.getItem("companyName") - this.planName = sessionStorage.getItem("planName") - } - if(this.router.url.indexOf("editplaninfo") != -1 || this.router.url.indexOf("viewunitinfo") != -1){//如果url地址是从重点单位跳转 - this.title = sessionStorage.getItem("companyName") - } + } ngOnDestroy(){ - this.routerEventsListener.unsubscribe() } @@ -131,7 +115,6 @@ export class TabbarComponent implements OnInit { this.token.delete() sessionStorage.clear() window.localStorage.clear() - this.router.navigate(['/login']) const config = new MatSnackBarConfig(); config.verticalPosition = 'bottom'; config.duration = 3000 diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index 5935847..9691f49 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -4,7 +4,7 @@ } .content { width: 100%; - height: 93%; + height: 100%; overflow: hidden; box-sizing: border-box; padding: 1px; diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 4dd82c0..3d00c96 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -8,6 +8,7 @@ import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; import {FlatTreeControl} from '@angular/cdk/tree'; import {WorkingAreaComponent} from '../../working-area/working-area.component' import {CanvasShareDataService,GameMode} from '../../canvas-share-data.service' //引入服务 +import {CacheTokenService} from '../../http-interceptors/cache-token.service' import Viewer from 'viewerjs'; import { saveOneDialog } from './save'; @Component({ @@ -19,7 +20,7 @@ export class CollectionToolsComponent implements OnInit { @ViewChild('canvas',{static: true}) canvas:WorkingAreaComponent; //父组件中获得子组件的引用 - constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private element: ElementRef,public canvasData: CanvasShareDataService) { } + constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private element: ElementRef,public canvasData: CanvasShareDataService,public token: CacheTokenService) { } // tree配置 private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数 return { @@ -478,10 +479,6 @@ export class CollectionToolsComponent implements OnInit { } ngOnInit(): void { - - this.getAllLibrary() - this.getAllBuildings() - this.getAllFirePlan() let that = this window.setTimeout(()=>{ diff --git a/src/app/ui/dangerous/dangerous.component.html b/src/app/ui/dangerous/dangerous.component.html new file mode 100644 index 0000000..d4e5128 --- /dev/null +++ b/src/app/ui/dangerous/dangerous.component.html @@ -0,0 +1 @@ +

dangerous works!

diff --git a/src/app/ui/dangerous/dangerous.component.scss b/src/app/ui/dangerous/dangerous.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/ui/footer/footer.component.spec.ts b/src/app/ui/dangerous/dangerous.component.spec.ts similarity index 55% rename from src/app/ui/footer/footer.component.spec.ts rename to src/app/ui/dangerous/dangerous.component.spec.ts index 2ca6c45..60c7332 100644 --- a/src/app/ui/footer/footer.component.spec.ts +++ b/src/app/ui/dangerous/dangerous.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FooterComponent } from './footer.component'; +import { DangerousComponent } from './dangerous.component'; -describe('FooterComponent', () => { - let component: FooterComponent; - let fixture: ComponentFixture; +describe('DangerousComponent', () => { + let component: DangerousComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ FooterComponent ] + declarations: [ DangerousComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(FooterComponent); + fixture = TestBed.createComponent(DangerousComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/ui/dangerous/dangerous.component.ts b/src/app/ui/dangerous/dangerous.component.ts new file mode 100644 index 0000000..6401696 --- /dev/null +++ b/src/app/ui/dangerous/dangerous.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-dangerous', + templateUrl: './dangerous.component.html', + styleUrls: ['./dangerous.component.scss'] +}) +export class DangerousComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/ui/disposal-node/disposal-node.component.html b/src/app/ui/disposal-node/disposal-node.component.html new file mode 100644 index 0000000..5f52123 --- /dev/null +++ b/src/app/ui/disposal-node/disposal-node.component.html @@ -0,0 +1 @@ +

disposal-node works!

diff --git a/src/app/ui/disposal-node/disposal-node.component.scss b/src/app/ui/disposal-node/disposal-node.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/ui/disposal-node/disposal-node.component.spec.ts b/src/app/ui/disposal-node/disposal-node.component.spec.ts new file mode 100644 index 0000000..513f7a7 --- /dev/null +++ b/src/app/ui/disposal-node/disposal-node.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DisposalNodeComponent } from './disposal-node.component'; + +describe('DisposalNodeComponent', () => { + let component: DisposalNodeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DisposalNodeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DisposalNodeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/ui/disposal-node/disposal-node.component.ts b/src/app/ui/disposal-node/disposal-node.component.ts new file mode 100644 index 0000000..ef1b830 --- /dev/null +++ b/src/app/ui/disposal-node/disposal-node.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-disposal-node', + templateUrl: './disposal-node.component.html', + styleUrls: ['./disposal-node.component.scss'] +}) +export class DisposalNodeComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/ui/footer/footer.component.html b/src/app/ui/footer/footer.component.html deleted file mode 100644 index aacca5e..0000000 --- a/src/app/ui/footer/footer.component.html +++ /dev/null @@ -1,6 +0,0 @@ - -
- Copyright 2020. All Rights Reserved By Anxin -
- - \ No newline at end of file diff --git a/src/app/ui/footer/footer.component.scss b/src/app/ui/footer/footer.component.scss deleted file mode 100644 index 59e0ee1..0000000 --- a/src/app/ui/footer/footer.component.scss +++ /dev/null @@ -1,15 +0,0 @@ - -.footer{ - position: fixed; - bottom: 0; - height: 46px; - width: 100%; - z-index: 100; - span{ - font-size: 16px; - color: white; - position: absolute; - right: 80px; - top: 8px; - } -} \ No newline at end of file diff --git a/src/app/ui/footer/footer.component.ts b/src/app/ui/footer/footer.component.ts deleted file mode 100644 index da17d82..0000000 --- a/src/app/ui/footer/footer.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-footer', - templateUrl: './footer.component.html', - styleUrls: ['./footer.component.scss'] -}) -export class FooterComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/ui/plan-assistance/plan-assistance.component.html b/src/app/ui/plan-assistance/plan-assistance.component.html new file mode 100644 index 0000000..4f08453 --- /dev/null +++ b/src/app/ui/plan-assistance/plan-assistance.component.html @@ -0,0 +1 @@ +

plan-assistance works!

diff --git a/src/app/ui/plan-assistance/plan-assistance.component.scss b/src/app/ui/plan-assistance/plan-assistance.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/ui/plan-assistance/plan-assistance.component.spec.ts b/src/app/ui/plan-assistance/plan-assistance.component.spec.ts new file mode 100644 index 0000000..f0a2929 --- /dev/null +++ b/src/app/ui/plan-assistance/plan-assistance.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PlanAssistanceComponent } from './plan-assistance.component'; + +describe('PlanAssistanceComponent', () => { + let component: PlanAssistanceComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PlanAssistanceComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PlanAssistanceComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts new file mode 100644 index 0000000..be069d7 --- /dev/null +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-plan-assistance', + templateUrl: './plan-assistance.component.html', + styleUrls: ['./plan-assistance.component.scss'] +}) +export class PlanAssistanceComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/ui/real-cases/real-cases.component.html b/src/app/ui/real-cases/real-cases.component.html new file mode 100644 index 0000000..2e7e566 --- /dev/null +++ b/src/app/ui/real-cases/real-cases.component.html @@ -0,0 +1 @@ +

real-cases works!

diff --git a/src/app/ui/real-cases/real-cases.component.scss b/src/app/ui/real-cases/real-cases.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/ui/real-cases/real-cases.component.spec.ts b/src/app/ui/real-cases/real-cases.component.spec.ts new file mode 100644 index 0000000..49c4468 --- /dev/null +++ b/src/app/ui/real-cases/real-cases.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RealCasesComponent } from './real-cases.component'; + +describe('RealCasesComponent', () => { + let component: RealCasesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ RealCasesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(RealCasesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/ui/real-cases/real-cases.component.ts b/src/app/ui/real-cases/real-cases.component.ts new file mode 100644 index 0000000..47e2369 --- /dev/null +++ b/src/app/ui/real-cases/real-cases.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-real-cases', + templateUrl: './real-cases.component.html', + styleUrls: ['./real-cases.component.scss'] +}) +export class RealCasesComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/ui/similar-plans/similar-plans.component.html b/src/app/ui/similar-plans/similar-plans.component.html new file mode 100644 index 0000000..44bcb13 --- /dev/null +++ b/src/app/ui/similar-plans/similar-plans.component.html @@ -0,0 +1 @@ +

similar-plans works!

diff --git a/src/app/ui/similar-plans/similar-plans.component.scss b/src/app/ui/similar-plans/similar-plans.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/ui/similar-plans/similar-plans.component.spec.ts b/src/app/ui/similar-plans/similar-plans.component.spec.ts new file mode 100644 index 0000000..4ef6afe --- /dev/null +++ b/src/app/ui/similar-plans/similar-plans.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SimilarPlansComponent } from './similar-plans.component'; + +describe('SimilarPlansComponent', () => { + let component: SimilarPlansComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SimilarPlansComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SimilarPlansComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/ui/similar-plans/similar-plans.component.ts b/src/app/ui/similar-plans/similar-plans.component.ts new file mode 100644 index 0000000..5393651 --- /dev/null +++ b/src/app/ui/similar-plans/similar-plans.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-similar-plans', + templateUrl: './similar-plans.component.html', + styleUrls: ['./similar-plans.component.scss'] +}) +export class SimilarPlansComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 07e55c0..116e6c5 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -1,15 +1,21 @@ import { Routes, RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; -import { UiComponent } from './ui.component'; -import { PersonaldataComponent } from '../pages/personaldata/personaldata.component'; import { CollectionToolsComponent } from './collection-tools/collection-tools.component'; +import { DisposalNodeComponent } from './disposal-node/disposal-node.component'; +import { DangerousComponent } from './dangerous/dangerous.component'; +import { PlanAssistanceComponent } from './plan-assistance/plan-assistance.component'; +import { RealCasesComponent } from './real-cases/real-cases.component'; +import { SimilarPlansComponent } from './similar-plans/similar-plans.component'; const routes: Routes = [ - { path: '', component: UiComponent}, - { path: 'person', component:PersonaldataComponent }, - { path: 'collectionTools', component:CollectionToolsComponent }, + { path: 'collectionTools', component:CollectionToolsComponent}, + { path: 'dangerous', component:DangerousComponent}, + { path: 'disposalNode', component:DisposalNodeComponent}, + { path: 'planAssistance', component:PlanAssistanceComponent}, + { path: 'realCases', component:RealCasesComponent}, + { path: 'similarPlans', component:SimilarPlansComponent}, ]; @NgModule({ diff --git a/src/app/ui/ui.component.html b/src/app/ui/ui.component.html index 81f1dc8..8b13789 100644 --- a/src/app/ui/ui.component.html +++ b/src/app/ui/ui.component.html @@ -1 +1 @@ -

ui works!

+ diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index c8e5ed7..04177ef 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -47,7 +47,6 @@ 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 { FooterComponent } from './footer/footer.component'; import { ChangepasswordComponent } from './changepassword/changepassword.component'; import { IsnoPipe } from '../pipes/boolean.pipe'; import {ConfirmpswDirective} from './changepassword/equal-validator.directive' @@ -57,8 +56,13 @@ import { CollectionToolsComponent, CreateBuilding, EditBuilding, ViewDetails } f import { WorkingAreaComponent } from '../working-area/working-area.component'; import {leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent} from './collection-tools/leftFunctionalDomain' import { saveOneDialog, saveTwoDialog } from './collection-tools/save'; +import { DisposalNodeComponent } from './disposal-node/disposal-node.component'; +import { DangerousComponent } from './dangerous/dangerous.component'; +import { SimilarPlansComponent } from './similar-plans/similar-plans.component'; +import { RealCasesComponent } from './real-cases/real-cases.component'; +import { PlanAssistanceComponent } from './plan-assistance/plan-assistance.component'; @NgModule({ - declarations: [UiComponent,PersonaldataComponent, FooterComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent], + declarations: [UiComponent,PersonaldataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent, DisposalNodeComponent, DangerousComponent, SimilarPlansComponent, RealCasesComponent, PlanAssistanceComponent], imports: [ CommonModule, @@ -113,7 +117,6 @@ import { saveOneDialog, saveTwoDialog } from './collection-tools/save'; exports:[ - FooterComponent, CollectionToolsComponent ] }) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 5112470..f93a159 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -4,6 +4,7 @@ import { EventEmitter } from 'events'; import { EventManager } from '@angular/platform-browser'; import { OutlineFilter } from 'pixi-filters'; import { CanvasShareDataService, GameMode } from '../canvas-share-data.service'; +import {CacheTokenService} from '../http-interceptors/cache-token.service' //引入自动登录 获取token服务 import * as ObjectID from 'bson-objectid'; @@ -15,7 +16,7 @@ import * as ObjectID from 'bson-objectid'; export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterViewInit { - constructor(private eventManager: EventManager, public canvasData: CanvasShareDataService) { + constructor(private eventManager: EventManager, public canvasData: CanvasShareDataService, public token: CacheTokenService) { super(); } @@ -101,6 +102,27 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // 根据ID 找到图标 // 根据ID 找到数据 + + //是否登录 + isLogin () { + let token = sessionStorage.getItem('token') // 判断 是否登录状态 + if (token) { + this.init.getAllLibrary() + this.init.getAllBuildings() + this.init.getAllFirePlan() + this.init.getSitePlan() //调用父组件 初始化方法 + } else { + this.token.login().then(res=>{ + this.init.params.companyId = sessionStorage.getItem('companyId') + this.init.getAllLibrary() + this.init.getAllBuildings() + this.init.getAllFirePlan() + this.init.getSitePlan() //调用父组件 初始化方法 + }) + } + } + //是否登录 + ngOnInit(): void { this.eventManager.addGlobalEventListener('window', 'keydown', (event: any) => { if (event.keyCode === 17) { @@ -199,7 +221,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV backgroundColor: 0xE9FAFF }); this.content.nativeElement.appendChild(this.app.view); - this.init.getSitePlan() //调用父组件 初始化方法 + this.isLogin() this.createBackgroundImage(); // this.createPreviewSinglePointIcon(); diff --git a/src/index.html b/src/index.html index 8ecc01d..ebc3ab9 100644 --- a/src/index.html +++ b/src/index.html @@ -2,13 +2,11 @@ - 数字化预案编制管理平台 + 实战指挥预案 - -