Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/left-domain/left-domain.component.html

@@ -66,7 +66,10 @@
     <!-- 油罐设备 -->
     <!-- 消防设施 -->
     <div class="publicBox fireFacilities" *ngIf="beforeFence === 3">
-      <nz-tree #nzTreeComponent [nzData]="treeData"></nz-tree>
+      <nz-tree [nzData]="treeData" [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
+      <ng-template #nzTreeTemplate let-node let-origin="origin">
+        <div class="treeRow"><p>{{node.title}}</p><p>{{node.children.length}}</p></div>
+      </ng-template>
     </div>
     <!-- 消防设施 -->
   </div>

src/app/pages/left-domain/left-domain.component.scss

@@ -69,9 +69,8 @@
 }
 .fireFacilities{ //消防设施
   .ant-tree{
-    height: 32px;
-    line-height: 32px;
     background-color: transparent;
     color: #C4E2FC;
   }
+  .treeRow{ width: 100%; display: flex; height: 30px; line-height: 30px; p:first-child{ flex: 1; }; p{ margin: 0; padding: 0; } }
 }

src/app/pages/plan/plan.component.html

@@ -1,5 +1,5 @@
 <div class="loading" *ngIf="isShowLoading"><nz-spin nzSimple [nzSize]="'large'"></nz-spin></div>
-<div class="content">
+<div class="content" id="threeDimensional">
 
   <div class="header">
     <button *ngFor="let item of allFence; let key = index;" [ngClass]="{'selectFence': selectFence === key}" (click)="toggleHeaderFence(key)">{{item}}</button>

src/styles.scss

@@ -102,15 +102,19 @@ h1 {
   font-size: 16px;
 }
 
-//滚动条样式	
-::-webkit-scrollbar {
-  width: 5px;	
-}
-::-webkit-scrollbar-thumb {
-  background-image: linear-gradient(#2495f8,#1c73c2,#02233f,);	
-}
-::-webkit-scrollbar-track {
-  background-color: #0d4070;	
+//三维场景
+#threeDimensional {
+  .ant-tree-node-content-wrapper { width: 100%; }
+  //滚动条样式	
+  ::-webkit-scrollbar {
+    width: 5px;	
+  }
+  ::-webkit-scrollbar-thumb {
+    background-image: linear-gradient(#2495f8,#1c73c2,#02233f,);	
+  }
+  ::-webkit-scrollbar-track {
+    background-color: #0d4070;	
+  }
 }