diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index c04401f..24d0ee1 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -1,4 +1,4 @@ -
+
着火单位: 高科技创业园
diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss index 1fec6a3..fd313a8 100644 --- a/src/app/navigation/navigation.component.scss +++ b/src/app/navigation/navigation.component.scss @@ -1,4 +1,4 @@ -.content { +#content { width: 100%; height: 100%; box-sizing: border-box; diff --git a/src/app/ui/plan/collection-tools.component.html b/src/app/ui/plan/collection-tools.component.html index 982bfb9..8e9ef91 100644 --- a/src/app/ui/plan/collection-tools.component.html +++ b/src/app/ui/plan/collection-tools.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/ui/plan/collection-tools.component.scss b/src/app/ui/plan/collection-tools.component.scss index 0b2b794..2e6d78a 100644 --- a/src/app/ui/plan/collection-tools.component.scss +++ b/src/app/ui/plan/collection-tools.component.scss @@ -2,9 +2,9 @@ .icongray{ color: #D9D0DC; } -.content { +.content111 { width: 100%; - height: 93%; + height: 100%; overflow: hidden; box-sizing: border-box; padding: 1px; @@ -79,9 +79,8 @@ } //左右两侧功能栏 统一样式 .publicCss { + overflow: hidden; border-radius: 5px; - // position: absolute; - height: 100%; top: 0; } .functionalDomain { @@ -92,6 +91,7 @@ width: 100%; height: 100%; display: flex; + overflow: hidden; } .canvas{ flex: 5; diff --git a/src/app/ui/plan/collection-tools.component.ts b/src/app/ui/plan/collection-tools.component.ts index 621f69c..d7b63f0 100644 --- a/src/app/ui/plan/collection-tools.component.ts +++ b/src/app/ui/plan/collection-tools.component.ts @@ -424,10 +424,6 @@ export class planComponent implements OnInit { } ngOnInit(): void { - - this.getAllLibrary() - this.getAllBuildings() - this.getAllFirePlan() let that = this window.setTimeout(()=>{ diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 75659d8..a32bf2d 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -111,7 +111,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // 根据ID 找到数据 //是否登录 - public verificationURL = '/ui/collectionTools' //验证url地址是否为验证页面 + public verificationURL = '/ui/plan' //验证url地址是否为验证页面 isLogin () { let token = sessionStorage.getItem('token') // 判断 是否登录状态 if (token) {