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

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

@@ -1082,7 +1082,6 @@ export class CollectionToolsComponent implements OnInit {
 
   //打开消防设施考题设定
   openFireExamination () {
-    console.log(1,this.beforeOneCheckedBuilding)
     let treeData = JSON.parse( JSON.stringify(this.dataSource.data) )
     let buildFloorData = {
       buildingData:this.beforeOneCheckedBuilding,

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

@@ -157,7 +157,7 @@ export class uploadQuestions {
     defaultExpandedKeys = []; //展开指定的树节点 key值
     defaultSelectedKeys = []; //指定选中的树节点 key值
     renderData:any
-    
+
     ngOnInit(): void {
       let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId')))
       data ? data.forEach(item => {
@@ -167,12 +167,13 @@ export class uploadQuestions {
       }) :null
       this.renderData = data
       this.getProfiles()
+      this.nodeInit()
     }
+
     //获取登录账号的个人资料
     Profiles:any 
     getProfiles(){
       this.http.get('/api/ExamAccounts/Profiles').subscribe(data => {
-        console.log(data)
         this.Profiles = data
       })
     }