Merge branch 'develop' of http://39.106.78.171:3000/shaojiahao/AX.Angular9DataCollection into develop

src/app/navigation/navigation.component.html

@@ -9,8 +9,8 @@
                 <!-- basicinfo -->
                 <li [routerLink]="['/datacollection/basicinfo']" routerLinkActive="router-link-active">基本信息</li>
                 <!-- plan -->
-                <!-- <li [routerLink]="['/datacollection/plan']" routerLinkActive="router-link-active">平面图</li> -->
-                <li [routerLink]="['/datacollection/collectionTools']" routerLinkActive="router-link-active">平面图</li>
+                <li [routerLink]="['/datacollection/plan']" routerLinkActive="router-link-active">平面图</li>
+                <li [routerLink]="['/datacollection/collectionTools']" routerLinkActive="router-link-active">H5平面图</li>
                 <!-- allaround -->
                 <li [routerLink]="['/datacollection/allaround']" routerLinkActive="router-link-active">四周毗邻</li>
                 <!-- fire-fighting-device -->
@@ -32,8 +32,12 @@
     </button>
 
     <div class="example-sidenav-content">
+      <div style="height: 64px;">
         <app-tabbar (toggleDarkTheme)="switchTheme($event)" (defaulttheme)="defaulttheme()" (redtheme)="redtheme()"></app-tabbar>
+      </div>
+      <div style="flex: 1; overflow: hidden;">
         <router-outlet></router-outlet>
+      </div>
     </div>
 
 </mat-sidenav-container>

src/app/navigation/navigation.component.scss

@@ -3,7 +3,7 @@
     width: 100%;
     height:100%;
     border: 1px solid rgba(0, 0, 0, 0.5);
-    
+    overflow: hidden;
   }
   mat-accordion{
       height: 100%;
@@ -145,4 +145,6 @@ mat-sidenav{
 .example-sidenav-content{
     height: 100%;
     overflow: hidden;
+    display: flex;
+    flex-direction: column;
 }

src/app/ui/allaround/allaround.component.scss

@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   padding: 10px;
   overflow-y: auto;
 }

src/app/ui/basicinfo/basicinfo.component.html

@@ -1,4 +1,4 @@
-<div style="height: 100%;display: flex; flex-direction: column;">
+<div style="height: 100%;display: flex; flex-direction: column;overflow: hidden;">
     <!-- header -->
     <mat-accordion>
         <mat-expansion-panel expanded>

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: 3px;

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

@@ -426,8 +426,6 @@ export class CollectionToolsComponent implements OnInit {
     this.getAllLibrary()
     this.getAllBuildings()
 
-    this.getSitePlan()
-
     let that = this
     window.setTimeout(()=>{
       document.getElementById("functionalDomainContent").oncontextmenu = function (event) {
@@ -439,9 +437,8 @@ export class CollectionToolsComponent implements OnInit {
   
   }
 
-
-
   ngAfterViewInit(): void {
+    this.getSitePlan()
     // 监听canvas组件选中素材事件
     this.canvas.on("select",obj=>{
       //选中素材属性注入函数

src/app/ui/fire-fighting-device/fire-fighting-device.component.scss

@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   padding: 10px;
   overflow-y: auto;
   .contentBox {

src/app/ui/function-division/function-division.component.scss

@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   overflow-y: auto;
   padding: 10px 0 0 10px;
   display: flex;

src/app/ui/key-site/key-site.component.scss

@@ -1,6 +1,6 @@
 .content {
   width: 100%;
-  height: 90%;
+  height: 100%;
   padding: 10px;
   overflow-y: auto;
   .contentBox{

src/app/ui/realistic-picture/realistic-picture.component.scss

@@ -1,7 +1,7 @@
 .content {
   margin: 0 0 0 10px;
   width: 100%;
-  height: 90%;
+  height: 100%;
   overflow-y: auto;
   display: flex;
   .leftBox {

src/app/ui/uploading-cad/uploading-cad.component.html

@@ -18,7 +18,7 @@
 
 </div>
 
-<div style="overflow-y: auto;height: 90%;">
+<div style="overflow-x: hidden;overflow-y: auto;height: 90%;">
   <table mat-table [dataSource]="CADList">
 
     <ng-container matColumnDef="checked">

src/app/working-area/working-area.component.ts

@@ -501,8 +501,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     this.setPaintMode(PaintMode.endPaint);
     this.resetCanvas();
     this.destroyBackgroundImage();
-    if (this.canvasData.selectStorey.imageUrl === null
-    ||this.canvasData.selectStorey.imageUrl === undefined) {
+    if (!this.canvasData.selectStorey.imageUrl) {
       return;
     }
 

src/styles.scss

@@ -4,6 +4,7 @@ html,body{
   height: 100%;
   margin:0 auto;
   padding:0;
+  overflow: hidden;
 }
 ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{
 	margin:0;