[完善]上传考题完善消防要素tree(增加上级消防要素模板)

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

@@ -903,7 +903,6 @@ export class CollectionToolsComponent implements OnInit {
     let data = JSON.parse(JSON.stringify(this.allFireElements))  //所有消防要素模板
     console.log(data)
     let treeData = [] //tree型 处理完成后的数据
-
     data.forEach(element => {
       element.key = element.id
       element.isTemplate = true //添加模板标识
@@ -964,7 +963,7 @@ export class CollectionToolsComponent implements OnInit {
     }
 
 
-    console.log(filterEmpty(treeData))
+    // console.log(filterEmpty(treeData))
     this.dataSource.data = filterEmpty(treeData)
 
     this.treeControl.expandAll()
@@ -1096,7 +1095,7 @@ export class CollectionToolsComponent implements OnInit {
     let treeData = JSON.parse( JSON.stringify(this.dataSource.data) )
     let nodes = JSON.parse( JSON.stringify( JSON.parse(sessionStorage.getItem('examNodeList')) ) )
     if (nodes) {
-      let data = { treeData: treeData, question: JSON.parse( JSON.stringify(this.examMsg) ), node: nodes }
+      let data = { treeData: treeData, question: JSON.parse( JSON.stringify(this.examMsg) ), node: nodes ,allFireElements:this.allFireElements}
       let dialogRef = this.dialog.open(uploadQuestions,{data});
     } else {
       const config = new MatSnackBarConfig();
@@ -1126,9 +1125,11 @@ export class CollectionToolsComponent implements OnInit {
     //     storeyData.data[key] = companyBuildingData.data[key]
     //   }
     // }
-    for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到   其他   数组
+    console.log(566,storeyData.data)
+    for(let key in storeyData.data){ //筛选数据 
       storeyData.data[key].key = storeyData.data[key].Id
       let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
+      //没有匹配全部放入到   其他   数组
       if (!noMatch) {
         this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key])
       }

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

@@ -55,9 +55,14 @@ export class examinationQuestions {
         }
       })
     }
+
+
     nzEvent($event){
       console.log($event)
     }
+
+
+
     //提交
     submit () {
 
@@ -161,15 +166,68 @@ export class uploadQuestions {
     ngOnInit(): void {
       let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId')))
       data ? data.forEach(item => {
-        item.children.forEach(i => {
+        let realData = item.children
-          i.isLeaf = true
+        item.children = this.processingData(this.data.allFireElements,realData)
-        })
       }) :null
       this.renderData = data
       this.getProfiles()
       this.nodeInit()
     }
 
+    //处理数据 将消防要素模板与真实素材结合
+    processingData(allFireElements,realData){
+      allFireElements[allFireElements.length-1].children = []
+      realData.forEach(item => {
+        item.isLeaf = true
+        let noMatch = allFireElements.find( every=> every.id === item.FireElementId )
+        if (!noMatch) {
+          allFireElements[allFireElements.length-1].children.push(item)
+        }
+      })
+      let treeData = [] //tree型 处理完成后的数据
+      allFireElements.forEach(element => {
+        element.key = element.id
+        element.name != '其他' ? element.children = [] : null
+        if(realData){
+          realData.forEach(item => {
+            if(element.id == item.FireElementId){
+              element.children.push(item)
+            }
+          })
+        }
+        allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} });
+      });
+      allFireElements.forEach(element => {
+        if (!element.parentId) { treeData.push(element) }
+      });
+      function recursionFilterEmpty(originalList, result) {
+              for(let i = 0, length = originalList.length; i < length; i++) {
+                  const item = originalList[i];
+                  if (item.PropertyInfos) {
+                      // 最内层
+                      result.push(item);
+                  } else if (item.children && item.children.length) {
+                      const newChildren = [];
+                      // 递归调用，底层的真实数据会全部 push 进 newChildren 中
+                      recursionFilterEmpty(item.children, newChildren);
+                      if (newChildren.length) {
+                          // 替换原始数据
+                          item.children = newChildren;
+                          // 子项有真实的数据，就保留这一项
+                          result.push(item);
+                      } // 如果没有这一项就会被删除
+                  }
+              }
+      }
+      function filterEmpty(listData) {
+          const result = [];
+          recursionFilterEmpty(listData, result);
+          return result;
+      }
+      return filterEmpty(treeData)
+    }
+
+
     //获取登录账号的个人资料
     Profiles:any 
     getProfiles(){