[新增]完成查看消防要素和已标注消防要素

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

@@ -12,7 +12,7 @@
         需要标记的消防设施
       </button>
       <button (click)="saveSite()"><mat-icon>description</mat-icon>保存</button>
-      <button (click)="openUploadQuestions()"><mat-icon>open_in_browser</mat-icon>上传</button>
+      <button (click)="openUploadQuestions()"><mat-icon>open_in_browser</mat-icon>提交</button>
     </div>
   </div>
   <!-- header头部 -->

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

@@ -469,7 +469,10 @@ export class CollectionToolsExamineeComponent implements OnInit {
     })
   }
 
-  //获得所有素材库
+  //
+  /**
+   * 获得所有素材库
+   */
   basicAssetLibraries:any = []//基本信息素材库
   getAllAssetLibraries(Facilitiesitem){
   
@@ -492,6 +495,7 @@ export class CollectionToolsExamineeComponent implements OnInit {
         await new Promise ((resolve,reject)=>{
           this.http.get('/api/Assets',{params:params})
           .subscribe((data:any) => {
+           
             if(data && data.length != 0){
               data.forEach(item => {
                 item.tag = 1
@@ -504,6 +508,7 @@ export class CollectionToolsExamineeComponent implements OnInit {
             resolve(1)
           })
         }) 
+        
       }
       this.allLibrary = [...this.originalallLibrary,...this.basicAssetLibraries]
     })
@@ -602,8 +607,6 @@ export class CollectionToolsExamineeComponent implements OnInit {
             resolve(1)
           })
         }) 
-
-  
       }else{ //如果是建筑
         SitePlanData.buildingAreaId = this.selectingSitePlan.id
         //建筑平面图数据
@@ -848,29 +851,20 @@ export class CollectionToolsExamineeComponent implements OnInit {
 
   //打开消防设施考题设定
   openFireExamination () {
-    console.log(this.selectingSitePlan)
+
-    let treeData = JSON.parse( JSON.stringify(this.dataSource.data) )
     let buildFloorData = {
       buildingData:this.beforeOneCheckedBuilding,
       floorData:this.selectingSitePlan
     }
-    let data = { treeData: treeData,oldRealData:this.storeyData ,buildFloorData:buildFloorData}
+    let data = { oldRealData:this.storeyData ,buildFloorData:buildFloorData,Facilities:this.Facilities,allFireElements:this.allFireElements}
     let dialogRef = this.dialog.open(examinationQuestionsExaminee,{data});
   }
 
   //上传考题
   openUploadQuestions () {
-    let treeData = JSON.parse( JSON.stringify(this.dataSource.data) )
+
-    let nodes = JSON.parse( JSON.stringify( JSON.parse(sessionStorage.getItem('examNodeList')) ) )
+    let data = {allFireElements:this.allFireElements,Facilities:this.Facilities}
-    if (nodes) {
-      let data = { treeData: treeData, question: JSON.parse( JSON.stringify(this.examMsg) ), node: nodes ,allFireElements:this.allFireElements}
     let dialogRef = this.dialog.open(uploadQuestionsExaminee,{data});
-    } else {
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
-      this.snackBar.open('未选择考核处置节点','确定',config);
-    }
   }
 
   //封装 刷新 tree 数据
@@ -892,7 +886,7 @@ export class CollectionToolsExamineeComponent implements OnInit {
       item.key == this.selectingSitePlan.id ? 
       this.getAllAssetLibraries(item) :
       this.canvas.loadExamineeData()
-    }) :  this.canvas.loadExamineeData()
+    }) :  this.canvas.loadExamineeData();this.allLibrary = this.originalallLibrary
    
     for(let key in storeyData.data){ //筛选数据 
       storeyData.data[key].key = storeyData.data[key].Id
@@ -954,7 +948,6 @@ export class CollectionToolsExamineeComponent implements OnInit {
     this.http.get('/api/SitePlans',{params:this.params}).subscribe(data=>{
       this.sitePlanData = data
       console.log('建筑楼层数据',this.sitePlanData)
-      console.log('看看什么万一',this.Facilities)
       this.Facilities ? this.sitePlanData.forEach(item => {
         this.Facilities.forEach(i =>{
           if(item.id == i.key){
@@ -981,6 +974,13 @@ export class CollectionToolsExamineeComponent implements OnInit {
     this.http.get('/api/BuildingAreas',{params}).subscribe(data=>{
       this.sitePlanData = data
       console.log('预案平台当前有哪些楼层',this.sitePlanData)
+      this.Facilities ? this.sitePlanData.forEach(item => {
+        this.Facilities.forEach(i =>{
+          if(item.id == i.key){
+            item.isLabel = true 
+          }
+        })
+      }) : null
       this.selectingSitePlan = this.sitePlanData[0] || {}
       this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
       this.selectSitePlanIndex = 0

src/app/ui/collection-tools-examinee/examinationQuestions.html

@@ -1,15 +1,12 @@
 <div style="min-width: 240px;" >
-  <div style="text-align: center;font-weight: 550;">消防设施考题设定</div>
+  <div style="text-align: center;font-weight: 550;">需要标记的消防设施</div>
   <div id="nodeTree" style="max-height: 300px;overflow-y: auto; margin: 25px 0;">
     <!-- 消防列表树 -->
     <nz-tree
     #nzTreeComponent
     [nzData]="renderData"
-    nzCheckable
+    nzExpandAll
     nzMultiple
-    [nzCheckedKeys]="defaultCheckedKeys"
-    [nzExpandedKeys]="defaultExpandedKeys"
-    [nzSelectedKeys]="defaultSelectedKeys"
     (nzClick)="nzEvent($event)"
     (nzExpandChange)="nzEvent($event)"
     (nzCheckBoxChange)="nzEvent($event)"
@@ -24,7 +21,6 @@
     <!-- 消防列表树 -->
   </div>
   <div style="text-align: center;">
-    <button mat-stroked-button style="margin-right: 15px;border: none;background: #07CDCF;color: #fff;" (click)='submit()'>确定</button>
     <button mat-stroked-button style="margin-left: 15px;border: none;background: #dfe0e0;" mat-dialog-close>取消</button>
   </div>
 </div>

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

@@ -7,7 +7,7 @@ import { FlatTreeControl } from '@angular/cdk/tree';
 import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
 import { NzFormatBeforeDropEvent, NzFormatEmitEvent,NzTreeComponent } from 'ng-zorro-antd/tree';
 import { ActivatedRoute } from '@angular/router';
-
+//查看需要标记的消防设施按钮
 @Component({
   selector: 'dialog-examination-questions',
   templateUrl: './examinationQuestions.html',
@@ -20,129 +20,77 @@ export class examinationQuestionsExaminee {
 
     @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
 
-    defaultCheckedKeys = []; //指定选中复选框的树节点 key值
-    defaultExpandedKeys = []; //展开指定的树节点 key值
-    defaultSelectedKeys = []; //指定选中的树节点 key值
     renderData:any
     ngOnInit(): void {
-      this.renderData = this.data.treeData
+      let data = JSON.parse(JSON.stringify(this.data.Facilities))
-      if(JSON.parse(sessionStorage.getItem('tree型数据')) && JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]){
+      data ? data.forEach(item => {
-        this.defaultCheckedKeys = JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]
+        let realData = item.children
-      }
+        let allFireElements = JSON.parse(JSON.stringify(this.data.allFireElements))
-      this.data.treeData.forEach(element => {
+        item.children = this.processingData(allFireElements,realData)
-        if(element.isTemplate){
+      }) :null
-          element.isLeaf = false
+      this.renderData = data
-        }else{
-          element.isLeaf = true
-        }
-        if(element.children && element.children.length != 0){
-          element.children.forEach(ele => {
-            if(ele.isTemplate){
-              ele.isLeaf = false
-            }else{
-              ele.isLeaf = true
-            }
-            if(ele.children && ele.children.length != 0){
-              ele.children.forEach(item => {
-                if(item.isTemplate){
-                  item.isLeaf = false
-                }else{
-                  item.isLeaf = true
-                }
-                
-              });
-          }})
-        }
-      })
     }
+    //处理数据 将消防要素模板与真实素材结合
+    processingData(allFireElements,realData){
+      allFireElements[allFireElements.length-1].children = []
      
-
+      realData.forEach(item => {
-    nzEvent($event){
+        item.isLeaf = true
-      console.log($event)
+        let noMatch = allFireElements.find( every=> every.id === item.FireElementId)
+        if (!noMatch) {
+          allFireElements[allFireElements.length-1].children.push(item)
         }
-
-
-
-    //提交
-    submit () {
-
-      let oldTreeData = this.nzTreeComponent.getCheckedNodeList()
-
-      let alltreedata = JSON.parse(sessionStorage.getItem("tree型数据")) 
-      let keyArr = []
-      oldTreeData.forEach(element => {
-        keyArr.push(element.origin.key)
       })
-      if(alltreedata){
+      let treeData = [] //tree型 处理完成后的数据
-        //如果已经保存过当前楼层则替换
+      allFireElements.forEach(element => {
-        alltreedata[this.data.buildFloorData.floorData.id] = keyArr
+        element.key = element.id
-        sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata))
+        element.name != '其他' ? element.children = [] : null
-      }else{
+        if(realData && realData.length != 0){
-        alltreedata = {} 
+          realData.forEach(item => {
-        alltreedata[this.data.buildFloorData.floorData.id] = keyArr
+            if(element.id == item.FireElementId){
-        sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata))
+              element.children.push(item)
-      }
-      
-
-      let checkList = []  //只存真实素材
-      for (const key in this.data.oldRealData.data) {
-        let element = this.data.oldRealData.data[key]
-        let isChecked = (this.nzTreeComponent.getTreeNodeByKey(key)).isChecked
-        isChecked? checkList.push(element) : null
             }
-      //存储真实素材数据
-      let basicAssetsId = []
-      if(checkList && checkList.length != 0){
-        checkList.forEach(item => {
-          basicAssetsId.push(item.TemplateId)
           })
         }
-      basicAssetsId = Array.from(new Set(basicAssetsId))
+        allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} });
-      console.log(123,this.data.buildFloorData)
+      });
-      let obj = {
+      allFireElements.forEach(element => {
-        name:this.data.buildFloorData.buildingData.name + '-' + this.data.buildFloorData.floorData.name,
+        if (!element.parentId) { treeData.push(element) }
-        key:this.data.buildFloorData.floorData.id,
+      });
-        buildingId:this.data.buildFloorData.buildingData.id,
+      function recursionFilterEmpty(originalList, result) {
-        children:checkList,
+        for(let i = 0, length = originalList.length; i < length; i++) {
-        basicAssetsId:basicAssetsId
+            const item = originalList[i];
-      }
+            if (item.PropertyInfos) {
-
+                // 最内层
-      let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId'))) 
+                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)
 
-      if(data && data.length != 0){
-        console.log(1)
-        let ind = null
-        data.forEach((item,index) => {
-          if(item.key == obj.key){
-            ind = index + 1
-          }
-        })
-        if(ind){
-          if(checkList.length != 0){
-            data[ind - 1].children = checkList
-          }else{
-            data.splice(ind - 1,1)
     }
 
-        }else{
-          data.push(obj)
-        }
-        sessionStorage.setItem("消防设施"+sessionStorage.getItem('paperId'),JSON.stringify(data))
 
-      }else{
+    nzEvent($event){
-        console.log(2)
+      console.log($event)
-        data = []
-        data[0] = obj
-        sessionStorage.setItem("消防设施"+sessionStorage.getItem('paperId'),JSON.stringify(data))
     }
 
 
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
-      this.snackBar.open('当层消防设施考题设置完成','确定',config);
-      this.dialogRef.close()
-    }
 
 }
 
@@ -158,28 +106,80 @@ export class uploadQuestionsExaminee {
     constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef<any>,
     @Inject(MAT_DIALOG_DATA) public data,private route:ActivatedRoute) {}
 
-    defaultCheckedKeys = []; //指定选中复选框的树节点 key值
+
-    defaultExpandedKeys = []; //展开指定的树节点 key值
+
-    defaultSelectedKeys = []; //指定选中的树节点 key值
+
     renderData:any
+    labeledOfBasicIcon:any //当前页面各建筑各楼层已标注的基本信息集合
+    async ngOnInit(): Promise<void> {
+      let params = {
+        examinationId : this.route.snapshot.queryParams.examId,
+        planComponentId : this.route.snapshot.queryParams.planComponentId
+      }
+      let SitePlanData
+      let BuildingPlanData
+      await new Promise((resolve,reject) => {
+        this.http.get('/api/ExamSitePlanData/ExamData',{params}).subscribe(data => {
+          SitePlanData = data
+          resolve(1)
+        })
+      }) 
+      await new Promise((resolve,reject) => {
+        this.http.get('/api/ExamBuildingAreaData/ExamData',{params}).subscribe(data => {
+          BuildingPlanData = data
+          resolve(2)
+        })
+      }) 
+      this.labeledOfBasicIcon = [...SitePlanData,...BuildingPlanData]
 
-    ngOnInit(): void {
+
-      let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId')))
+      let data = JSON.parse(JSON.stringify(this.data.Facilities))
+      console.log('一共有哪几层需要标注',data)
       data ? data.forEach(item => {
         let realData = item.children
-        item.children = this.processingData(this.data.allFireElements,realData)
+        let allFireElements = JSON.parse(JSON.stringify(this.data.allFireElements))
+        item.children = this.processingData(allFireElements,realData,item.key)
       }) :null
+
       this.renderData = data
-      this.getProfiles()
-      this.nodeInit()
     }
 
+
+
     //处理数据 将消防要素模板与真实素材结合
-    processingData(allFireElements,realData){
+    processingData(allFireElements,realData,key){
+
+      //key为当前处理数据的层id
+
+
       allFireElements[allFireElements.length-1].children = []
+    
+      //数组根据某个属性去重 （一类素材只保留一个）
+      const res = new Map();
+      realData = realData.filter((a) => !res.has(a.TemplateId) && res.set(a.TemplateId, 1))
+      console.log('当层需要标记的',realData)
+      this.labeledOfBasicIcon.forEach(item => {
+        if(item.sitePlanId == key || item.buildingAreaId == key ){
+          let data = JSON.parse(item.data) 
+          console.log('当层已经标记的',data)
+          let arr = []
+          for (const key in data) {
+            arr.push(data[key])
+          }
+          realData.forEach(i => {
+            let isexist = arr.some((ele)=>{
+              return ele.TemplateId == i.TemplateId
+            })
+            isexist ? i.xxx = true : null
+            console.log(666,isexist)
+          })
+        }
+      })
+
+
       realData.forEach(item => {
         item.isLeaf = true
-        let noMatch = allFireElements.find( every=> every.id === item.FireElementId )
+        let noMatch = allFireElements.find( every=> every.id === item.FireElementId)
         if (!noMatch) {
           allFireElements[allFireElements.length-1].children.push(item)
         }
@@ -188,7 +188,7 @@ export class uploadQuestionsExaminee {
       allFireElements.forEach(element => {
         element.key = element.id
         element.name != '其他' ? element.children = [] : null
-        if(realData){
+        if(realData && realData.length != 0){
           realData.forEach(item => {
             if(element.id == item.FireElementId){
               element.children.push(item)
@@ -225,40 +225,7 @@ export class uploadQuestionsExaminee {
           return result;
       }
       return filterEmpty(treeData)
-    }
-
 
-    //获取登录账号的个人资料
-    Profiles:any 
-    getProfiles(){
-      this.http.get('/api/ExamAccounts/Profiles').subscribe(data => {
-        this.Profiles = data
-      })
-    }
-
-    nodeTreeData:any = []; //处置节点tree
-    //节点初始化
-    nodeInit () {
-      let treeData = []
-      this.data.node.forEach(element => {
-        element.title = element.name //name
-        element.key = element.id //id
-        element.children = [] //children
-        if (element.sitePlanId || element.buildingAreaId) { //是数据节点
-          element.isLeaf = true
-          element.isDataNode = true
-        } else { //不是数据节点
-          element.isLeaf = false
-          element.isDataNode = false
-        }
-        this.data.node.forEach(item=>{
-          item.parentId === element.id? element.children.push(item) : null
-        })
-      });
-      this.data.node.forEach(element=>{
-        !element.parentId? treeData.push(element) : null
-      })
-      this.nodeTreeData = [...treeData]
     }
 
     nzEvent($event){
@@ -266,36 +233,8 @@ export class uploadQuestionsExaminee {
     }
     //上传
     submit () {
-      console.log(this.data.question)
-      let body:any = {
-        id: this.route.snapshot.queryParams.paperplanId,
-        paperId: sessionStorage.getItem('paperId'),
-        planComponentId: sessionStorage.getItem('planId'),
-        examPlanType: this.route.snapshot.queryParams.openType == 1 ? 0 : 1,
-        creatorId: this.Profiles.id,
-        modifiedTime: new Date(),
-        isPublic: true,
-        title: this.route.snapshot.queryParams.planName,
-        mainPoint: this.data.question.keynote,
-        score: 0,
-        examFacilityAssetsData: sessionStorage.getItem('消防设施' + sessionStorage.getItem('paperId')) ? sessionStorage.getItem('消防设施' + sessionStorage.getItem('paperId')) : null,
-        examDisposalNodesData: sessionStorage.getItem('examNodeList') ? sessionStorage.getItem('examNodeList') : null,
-        companyId:sessionStorage.getItem('companyId')
-      }
    
 
-      this.http.put(`/api/PaperPlans/${this.route.snapshot.queryParams.paperplanId}`,body).subscribe(data => {
-        
-        const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
-        config.duration = 3000
-        this.snackBar.open('设置完成,页面将于一秒后关闭','确定',config);
-        setTimeout(() => {
-          window.close()
-        }, 1000);
-        
-      })
-
       
     }
 

src/app/ui/collection-tools-examinee/uploadQuestions.html

@@ -1,19 +1,14 @@
 <div style="min-width: 260px;" id="uploadfiretree">
-  <div style="text-align: center;font-weight: 550;">上传</div>
+  <div style="text-align: center;font-weight: 550;">提交</div>
-  <div style="padding-left: 10px; font-size: 14px; font-weight: 550;margin: 5px 0;">考试要点</div>
+  <div style="font-size: 14px; font-weight: 550;margin: 5px 0;">考核消防设施:</div>
-  <div style="margin-bottom: 25px;">
+
-    <textarea style="width: 100%;background-color: #dfe0e0;border: none;outline: none;height: 50px;border-radius: 5px;resize: none;" placeholder="请填写考试要点" [(ngModel)]="data.question.keynote"></textarea>
-  </div>
-  <div style="padding-left: 10px; font-size: 14px; font-weight: 550;margin: 5px 0;">考核消防设施</div>
   <div style="max-height: 200px;overflow-y: auto;margin-bottom: 25px;">
     <!-- 消防列表树 -->
     <nz-tree
-    #nzTreeComponent
+    *ngIf="renderData"
     [nzData]="renderData"
     nzMultiple
-    [nzCheckedKeys]="defaultCheckedKeys"
+    nzExpandAll
-    [nzExpandedKeys]="defaultExpandedKeys"
-    [nzSelectedKeys]="defaultSelectedKeys"
     (nzClick)="nzEvent($event)"
     (nzExpandChange)="nzEvent($event)"
     (nzCheckBoxChange)="nzEvent($event)"
@@ -22,24 +17,9 @@
     </nz-tree>
     <ng-template #nzTreeTemplate let-node let-origin="origin">
         <div class="treeNodeTemplate">
-            <label class="overflowText textNode">{{node.origin.name || node.origin.Name}}</label>
+            <label class="overflowText textNode">{{node.origin.name || node.origin.Name}}
-        </div>
+              <span *ngIf="node.origin.xxx" style="color: #FF8678;">(已标注)</span>
-    </ng-template>
+            </label>
-    <!-- 消防列表树 -->
-  </div>
-  <div style="padding-left: 10px; font-size: 14px; font-weight: 550;margin: 5px 0;">考核处置节点</div>
-  <div style="max-height: 200px;overflow-y: auto;margin-bottom: 25px;">
-    <!-- 消防列表树 -->
-    <nz-tree
-    #nzTreeComponent
-    [nzData]="nodeTreeData"
-    nzMultiple
-    [nzTreeTemplate]="nzTreeTemplate"
-    >
-    </nz-tree>
-    <ng-template #nzTreeTemplate let-node let-origin="origin">
-        <div class="treeNodeTemplate">
-            <label class="overflowText textNode">{{node.origin.name || node.origin.Name}}</label>
         </div>
     </ng-template>
     <!-- 消防列表树 -->

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

@@ -169,7 +169,8 @@ export class uploadQuestions {
       let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId')))
       data ? data.forEach(item => {
         let realData = item.children
-        item.children = this.processingData(this.data.allFireElements,realData)
+        let allFireElements = JSON.parse(JSON.stringify(this.data.allFireElements))
+        item.children = this.processingData(allFireElements,realData)
       }) :null
       this.renderData = data
       this.getProfiles()

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

@@ -521,8 +521,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
    * 处理隐藏数据
    */
   public processinghiddenData() {
-    console.log(1,this.canvasData.originaleveryStoreyData.data)
-    console.log(2,this.canvasData.hiddenBasicInfoFacilities)
     for (let key in this.canvasData.originaleveryStoreyData.data){
       if (this.canvasData.hiddenBasicInfoFacilities.indexOf(key)!==-1) {
         delete this.canvasData.originaleveryStoreyData.data[key];