Browse Source

功能分区

master
邵佳豪 4 years ago
parent
commit
b3ede42396
  1. 2
      src/app/app-routing.module.ts
  2. 6
      src/app/http-interceptors/cache-token.service.ts
  3. 5
      src/app/ui/data-push/data-push.component.html
  4. 2
      src/app/ui/data-push/data-push.component.ts
  5. 2
      src/app/ui/plan/collection-tools.component.html
  6. 2
      src/app/ui/plan/collection-tools.component.ts
  7. 2
      src/app/ui/similar-plans/similar-plans.component.ts

2
src/app/app-routing.module.ts

@ -16,7 +16,7 @@ import { CollectionToolsComponent } from './ui/collection-tools/collection-tools
const routes: Routes = [
{path:'',redirectTo:`/plan`,pathMatch:'full',},
{path:'',redirectTo:`/ui/plan`,pathMatch:'full',},
{
path:'', component:NavigationComponent, // canActivate: [AuthGuard],//守卫验证
children:[

6
src/app/http-interceptors/cache-token.service.ts

@ -15,9 +15,9 @@ export class CacheTokenService {
login () {
return new Promise ((resolve,reject)=>{
// sessionStorage.setItem("buildingTypeId",'5e7c9078a3050b1a840ed4ba'); //建筑类型
// sessionStorage.setItem("planId",'5fa3820af8eb762cb03c666d'); //预案ID
// sessionStorage.setItem("companyId",'5fa35d68f8eb762cb03c662e'); //单位ID
sessionStorage.setItem("buildingTypeId",'5e7c9078a3050b1a840ed4ba'); //建筑类型
sessionStorage.setItem("planId",'5fa3820af8eb762cb03c666d'); //预案ID
sessionStorage.setItem("companyId",'5fa35d68f8eb762cb03c662e'); //单位ID
this.http.post('/api/Account/SignIn',this.loginData).subscribe((data:any)=>{
sessionStorage.setItem("level",data.level);
sessionStorage.setItem("token",data.token);

5
src/app/ui/data-push/data-push.component.html

@ -1,11 +1,14 @@
<div class="content">
<div class="left">
<div class="publicRouter" *ngFor="let item of routers" routerLink= {{item.url}} routerLinkActive="routerLinkPlanActive">
<div class="publicRouter" *ngFor="let item of routers" [routerLink]="[item.url]" [queryParams]="{'usci':item.id}" routerLinkActive="router-link-active" routerLinkActive="routerLinkPlanActive">
{{item.name}}
</div>
<div class="publicRouter" (click)="open3D()">
三维预案
</div>
<div class="publicRouter" [routerLink]="['/ui/plan/planarGraph']" routerLinkActive="router-link-active" >
xxxxx
</div>
</div>
<div class="right">
<router-outlet></router-outlet>

2
src/app/ui/data-push/data-push.component.ts

@ -16,7 +16,7 @@ export class DataPushComponent implements OnInit {
//路由配置
routers:any = [
{name:'基本信息', url: '/ui/plan/basicInfo'},
{name:'平面图', url: '/ui/plan/planarGraph'},
{name:'平面图', url: '/ui/plan/planarGraph',id:'B56498312911454698'},
{name:'四周毗邻', url: '/ui/plan/allaround'},
{name:'消防设施', url: '/ui/plan/fire-fighting-device'},
{name:'重点部位', url: '/ui/plan/key-site'},

2
src/app/ui/plan/collection-tools.component.html

@ -44,7 +44,7 @@
<img src="../../../assets/images/楼层区域2.png">
</div>
<div >
<div style="background-color: #2399f1;" class="sitePlanContent" *ngFor="let item of sitePlanData;let key = index" [ngClass]="{'isRefugeStorey':item.isRefugeStorey==true,'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'>
<div class="sitePlanContent" *ngFor="let item of sitePlanData;let key = index" [ngClass]="{'isRefugeStorey':item.isRefugeStorey==true,'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'>
<label class="overflowText" style="font-size: 18px;">{{item.name}}</label>
</div>
</div>

2
src/app/ui/plan/collection-tools.component.ts

@ -437,6 +437,7 @@ export class planComponent implements OnInit {
}
ngOnInit(): void {
// console.log('pppp')
this.canvasData.selectPanelPoint = {}
let that = this
window.setTimeout(()=>{
@ -914,6 +915,7 @@ export class planComponent implements OnInit {
if (this.canvasData.isChange) { //true 数据被改动
let isTrue = confirm('是否保存当前编辑数据')
if (isTrue) { //先保存数据 在切换
this.selectSitePlanIndex = index
// let isSuccess = this.saveSite()//true的时候 先保存数据
// if (isSuccess != false) {
// this.selectingSitePlan = item

2
src/app/ui/similar-plans/similar-plans.component.ts

@ -44,7 +44,7 @@ export class SimilarPlansComponent implements OnInit {
isResponsePlans = false //默认是否是处置预案
openDeatails(){
this.router.navigate(['similarPlans/details'])
this.router.navigate(['similarPlans'],{queryParams:{'usci':'B56498312911454698','planComponentId':'5fa3820af8eb762cb03c666d'}})
}
back(){
this.isResponsePlans = false

Loading…
Cancel
Save