diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 3aa1493..67d6fb2 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -12,7 +12,7 @@ import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥 const routes: Routes = [ - {path:'',redirectTo:'ui/plan',pathMatch:'full',}, + {path:'',redirectTo:'ui/plan/basicInfo',pathMatch:'full',}, { path:'', component:NavigationComponent, diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index a9f819f..cb8dd24 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -23,7 +23,7 @@ export class NavigationComponent implements OnInit { //路由配置 routers:any = [ - {name:'数据推送', url: '/ui/plan'}, + {name:'数据推送', url: '/ui/plan/basicInfo'}, {name:'处置要点', url: '/ui/disposalNode'}, {name:'区域危险源', url: '/ui/dangerous'}, {name:'预案甄选', url: '/ui/similarPlans'}, diff --git a/src/app/ui/basicinfo-look/basicinfo.component.ts b/src/app/ui/basicinfo-look/basicinfo.component.ts index 61e3af3..5a2aa2a 100644 --- a/src/app/ui/basicinfo-look/basicinfo.component.ts +++ b/src/app/ui/basicinfo-look/basicinfo.component.ts @@ -19,6 +19,7 @@ import * as _ from 'lodash'; // import Swiper from 'swiper'; import { LookMaster2 } from './lookmaster.component' import { Router,ActivatedRoute } from '@angular/router' +import {CacheTokenService} from '../../http-interceptors/cache-token.service' @Component({ selector: 'app-basicinfo-look', @@ -83,16 +84,26 @@ export class BasicinfoLookComponent implements OnInit { buildingCustomData:any //存储当前建筑的自定义信息 allunittype: any //所有单位类型 allorganizing:any = [] //所有组织机构 - constructor(private router:Router,private route:ActivatedRoute,private http: HttpClient, private tree: TreeService, private sanitizer: DomSanitizer, public dialog: MatDialog,public snackBar: MatSnackBar) { } + constructor(private router:Router,private route:ActivatedRoute,private http: HttpClient, private tree: TreeService, private sanitizer: DomSanitizer, public dialog: MatDialog,public snackBar: MatSnackBar,public isLogin:CacheTokenService) { } - unitId : any //当前单位id + unitId = sessionStorage.getItem('companyId') //当前单位id ngOnInit(): void { - this.getallunittype() - this.getorganization() - // this.getunitinfo() - this.getunitallbuilding() - this.unitId = this.route.snapshot.queryParams.id + let token = sessionStorage.getItem('token') + if (token) { + this.unitId = sessionStorage.getItem('companyId'); + this.getallunittype() + this.getorganization() + this.getunitallbuilding() + } else { + this.isLogin.login().then(res=>{ + this.unitId = sessionStorage.getItem('companyId'); + this.getallunittype() + this.getorganization() + this.getunitallbuilding() + }) + } + } //获得所有单位类型 getallunittype() { @@ -112,14 +123,13 @@ export class BasicinfoLookComponent implements OnInit { } //获得当前单位的基本信息 getunitinfo(){ + this.http.get(`/api/Companies/${sessionStorage.getItem('companyId')}`).subscribe((data:any)=>{ - this.http.get(`/api/Companies/${this.unitId}`).subscribe((data:any)=>{ - - if(data.buildingTypes.length){ - sessionStorage.setItem('buildingTypeId',data.buildingTypes[0].id) - }else{ - sessionStorage.setItem('buildingTypeId',"") - } + // if(data.buildingTypes.length){ + // sessionStorage.setItem('buildingTypeId',data.buildingTypes[0].id) + // }else{ + // sessionStorage.setItem('buildingTypeId',"") + // } let node this.allorganizing.forEach(item => { if(item.id == data.organizationId){ @@ -323,7 +333,7 @@ export class BasicinfoLookComponent implements OnInit { allBuildings:any getunitallbuilding(){ this.houses = [] - this.unitId = this.route.snapshot.queryParams.id + this.unitId = sessionStorage.getItem('companyId') this.http.get("/api/Buildings",{ params:{ companyId:this.unitId @@ -952,7 +962,7 @@ export class BasicinfoLookComponent implements OnInit { config.duration = 3000 this.snackBar.open('请填写必填项','确定',config); }else{ - sessionStorage.setItem('buildingTypeId',value.unittype) + // sessionStorage.setItem('buildingTypeId',value.unittype) let time =new Date() let body = { id: this.unitinfo.id, diff --git a/src/app/ui/data-push/data-push.component.scss b/src/app/ui/data-push/data-push.component.scss index f7762b0..834e72c 100644 --- a/src/app/ui/data-push/data-push.component.scss +++ b/src/app/ui/data-push/data-push.component.scss @@ -34,5 +34,5 @@ } .routerLinkPlanActive { - background-color: #e88108; + background-color: rgba(240, 136, 14, 0.65); } \ No newline at end of file