[新增]查看模式下的消防要素树

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

@@ -302,15 +302,16 @@
           <div class="firecategoriesTree">
             <!-- 消防列表树写在这里 -->
             <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
-              <mat-tree-node *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)">
+              
+              <mat-tree-node [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" >
                 <button mat-icon-button disabled></button>
-                {{node.name}}
+                {{node.name}}       
                 <span *ngIf="node.isTemplate">({{node.children.length}})</span>
                 <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
               </mat-tree-node>
             
             
-              <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)">
+              <mat-tree-node [ngClass]="{'isLookPattern': !node.isLookPattern && !isEditPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)">
                 <button mat-icon-button 
                         matTreeNodeToggle
                         [attr.aria-label]="'toggle ' + node.name">
@@ -318,7 +319,7 @@
                     {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
                   </mat-icon>
                 </button>
-                {{node.name}} 
+                {{node.name}}   
                 <span *ngIf="node.isTemplate && node.isNewElement">({{node.children.length}})</span>
                 <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
               </mat-tree-node>

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

@@ -298,4 +298,7 @@ div:focus {
 }
 .mat-tree-node:hover{
   background-color: #ccebf8;
+}
+.isLookPattern{
+  display: none;
 }

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

@@ -30,6 +30,7 @@ export class CollectionToolsComponent implements OnInit {
       isTemplate:node.isTemplate,
       isNewElement:node.isNewElement,
       isLook:node.isLook,
+      isLookPattern:node.isLookPattern || null,
       node:node
     };
   }
@@ -243,7 +244,6 @@ export class CollectionToolsComponent implements OnInit {
     let imgFile = e.target.files[0] || null //上传的文件
     this.startUploading(imgFile)
   }
-
   objectName:any //上传对象名
   startUploading (imgFile) {
     let _this = this
@@ -456,7 +456,6 @@ export class CollectionToolsComponent implements OnInit {
     CompanyData.data = JSON.stringify(CompanyData.data)
 
     if(this.checkedBuildingIndex==-1){
-      console.log(SitePlanData)
       this.http.post("/api/CompanyAccount/SitePlanData",SitePlanData).subscribe(data => {
         let config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
@@ -597,18 +596,33 @@ export class CollectionToolsComponent implements OnInit {
   handleTreeData (storeyData) {
     this.storeyData = storeyData
 
-    let data = this.allFireElements //所有消防要素
+    let data = this.allFireElements //所有消防要素模板
     let treeData = [] //tree型 处理完成后的数据
     data.forEach(element => {
       element.isTemplate = true //添加模板标识
       element.isLook = true //添加是否可见标识
+      // element.isLookPattern = false
+
       element.children = []
       if(storeyData){
         for(let key in storeyData.data){
           if(element.id == storeyData.data[key].FireElementId){
             storeyData.data[key].isTemplate = false
             storeyData.data[key].isLook = true
-            element.isNewElement = true
+            storeyData.data[key].isLookPattern = true
+            element.isNewElement = true //该节点children是否存在新添加的真实素材 标识
+
+            //定义查看模式下能看到的元素
+            element.isLookPattern = true
+            if(element.parentId){
+              data.forEach(i => {
+                if(i.id == element.parentId){
+                  i.isLookPattern = true
+                }
+              })
+            }
+            //
+
             element.children.push(storeyData.data[key])
           }
         }
@@ -624,9 +638,11 @@ export class CollectionToolsComponent implements OnInit {
 
   //点击树节点
   clickTreeNode(node){
+    // console.log(node)
     if(node.node.Point){ 
       this.setAssetsProperty(node.node)
     }
+
   }
 
   //点击数节点的显示隐藏icon