|
|
|
@ -2,10 +2,10 @@ import { Component, OnInit, Inject, ViewChild } from '@angular/core'; |
|
|
|
import { HttpClient, HttpHeaders } from '@angular/common/http'; |
|
|
|
import { HttpClient, HttpHeaders } from '@angular/common/http'; |
|
|
|
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; |
|
|
|
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; |
|
|
|
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; |
|
|
|
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; |
|
|
|
import {CanvasShareDataService,DisposalNodeData} from '../../canvas-share-data.service' //引入服务
|
|
|
|
import { CanvasShareDataService, DisposalNodeData } from '../../canvas-share-data.service' //引入服务
|
|
|
|
import { FlatTreeControl } from '@angular/cdk/tree'; |
|
|
|
import { FlatTreeControl } from '@angular/cdk/tree'; |
|
|
|
import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; |
|
|
|
import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; |
|
|
|
import { NzFormatBeforeDropEvent, NzFormatEmitEvent,NzTreeComponent } from 'ng-zorro-antd/tree'; |
|
|
|
import { NzFormatBeforeDropEvent, NzFormatEmitEvent, NzTreeComponent } from 'ng-zorro-antd/tree'; |
|
|
|
import { ActivatedRoute } from '@angular/router'; |
|
|
|
import { ActivatedRoute } from '@angular/router'; |
|
|
|
|
|
|
|
|
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
@ -15,137 +15,138 @@ import { ActivatedRoute } from '@angular/router'; |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class examinationQuestions { |
|
|
|
export class examinationQuestions { |
|
|
|
|
|
|
|
|
|
|
|
constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef<any>, |
|
|
|
constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef<any>, |
|
|
|
@Inject(MAT_DIALOG_DATA) public data) {} |
|
|
|
@Inject(MAT_DIALOG_DATA) public data) { } |
|
|
|
|
|
|
|
|
|
|
|
@ViewChild('nzTreeComponent3', { static: false }) nzTreeComponent!: NzTreeComponent; |
|
|
|
@ViewChild('nzTreeComponent3', { static: false }) nzTreeComponent!: NzTreeComponent; |
|
|
|
|
|
|
|
|
|
|
|
defaultCheckedKeys = []; //指定选中复选框的树节点 key值
|
|
|
|
defaultCheckedKeys = []; //指定选中复选框的树节点 key值
|
|
|
|
defaultExpandedKeys = []; //展开指定的树节点 key值
|
|
|
|
defaultExpandedKeys = []; //展开指定的树节点 key值
|
|
|
|
defaultSelectedKeys = []; //指定选中的树节点 key值
|
|
|
|
defaultSelectedKeys = []; //指定选中的树节点 key值
|
|
|
|
renderData:any |
|
|
|
renderData: any |
|
|
|
ngOnInit(): void { |
|
|
|
ngOnInit(): void { |
|
|
|
this.renderData = this.data.treeData |
|
|
|
this.renderData = this.data.treeData |
|
|
|
if(JSON.parse(sessionStorage.getItem('tree型数据')) && JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]){ |
|
|
|
if (JSON.parse(sessionStorage.getItem('tree型数据')) && JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]) { |
|
|
|
this.defaultCheckedKeys = JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id] |
|
|
|
this.defaultCheckedKeys = JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id] |
|
|
|
} |
|
|
|
|
|
|
|
this.data.treeData.forEach(element => { |
|
|
|
|
|
|
|
if(element.isTemplate){ |
|
|
|
|
|
|
|
element.isLeaf = false |
|
|
|
|
|
|
|
}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 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
this.data.treeData.forEach(element => { |
|
|
|
|
|
|
|
if (element.isTemplate) { |
|
|
|
|
|
|
|
element.isLeaf = false |
|
|
|
|
|
|
|
} 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 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
nzEvent($event){ |
|
|
|
nzEvent($event) { |
|
|
|
console.log($event) |
|
|
|
console.log($event) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//提交
|
|
|
|
//提交
|
|
|
|
submit () { |
|
|
|
submit() { |
|
|
|
|
|
|
|
|
|
|
|
let oldTreeData = this.nzTreeComponent.getCheckedNodeList() |
|
|
|
let oldTreeData = this.nzTreeComponent.getCheckedNodeList() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// console.log(oldTreeData)
|
|
|
|
// console.log(oldTreeData)
|
|
|
|
let alltreedata = JSON.parse(sessionStorage.getItem("tree型数据"))
|
|
|
|
let alltreedata = JSON.parse(sessionStorage.getItem("tree型数据")) |
|
|
|
let keyArr = [] |
|
|
|
let keyArr = [] |
|
|
|
oldTreeData.forEach(element => { |
|
|
|
oldTreeData.forEach(element => { |
|
|
|
keyArr.push(element.origin.key) |
|
|
|
keyArr.push(element.origin.key) |
|
|
|
}) |
|
|
|
}) |
|
|
|
if(alltreedata){ |
|
|
|
if (alltreedata) { |
|
|
|
//如果已经保存过当前楼层则替换
|
|
|
|
//如果已经保存过当前楼层则替换
|
|
|
|
alltreedata[this.data.buildFloorData.floorData.id] = keyArr |
|
|
|
alltreedata[this.data.buildFloorData.floorData.id] = keyArr |
|
|
|
sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata)) |
|
|
|
sessionStorage.setItem('tree型数据', JSON.stringify(alltreedata)) |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
alltreedata = {}
|
|
|
|
alltreedata = {} |
|
|
|
alltreedata[this.data.buildFloorData.floorData.id] = keyArr |
|
|
|
alltreedata[this.data.buildFloorData.floorData.id] = keyArr |
|
|
|
sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata)) |
|
|
|
sessionStorage.setItem('tree型数据', JSON.stringify(alltreedata)) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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)) |
|
|
|
|
|
|
|
console.log(123,this.data.buildFloorData) |
|
|
|
|
|
|
|
let obj = { |
|
|
|
|
|
|
|
name:this.data.buildFloorData.buildingData.name + '-' + this.data.buildFloorData.floorData.name, |
|
|
|
|
|
|
|
key:this.data.buildFloorData.floorData.id, |
|
|
|
|
|
|
|
buildingId:this.data.buildFloorData.buildingData.id, |
|
|
|
|
|
|
|
children:checkList, |
|
|
|
|
|
|
|
basicAssetsId:basicAssetsId |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId')))
|
|
|
|
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)) |
|
|
|
|
|
|
|
console.log(123, this.data.buildFloorData) |
|
|
|
|
|
|
|
let obj = { |
|
|
|
|
|
|
|
name: this.data.buildFloorData.buildingData.name + '-' + this.data.buildFloorData.floorData.name, |
|
|
|
|
|
|
|
key: this.data.buildFloorData.floorData.id, |
|
|
|
|
|
|
|
buildingId: this.data.buildFloorData.buildingData.id, |
|
|
|
|
|
|
|
children: checkList, |
|
|
|
|
|
|
|
basicAssetsId: basicAssetsId |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let data = JSON.parse(sessionStorage.getItem("消防设施" + sessionStorage.getItem('paperId'))) |
|
|
|
|
|
|
|
|
|
|
|
if(data && data.length != 0){ |
|
|
|
if (data && data.length != 0) { |
|
|
|
console.log(1) |
|
|
|
console.log(1) |
|
|
|
let ind = null |
|
|
|
let ind = null |
|
|
|
data.forEach((item,index) => { |
|
|
|
data.forEach((item, index) => { |
|
|
|
if(item.key == obj.key){ |
|
|
|
if (item.key == obj.key) { |
|
|
|
ind = index + 1 |
|
|
|
ind = index + 1 |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
if(ind){ |
|
|
|
if (ind) { |
|
|
|
if(checkList.length != 0){ |
|
|
|
if (checkList.length != 0) { |
|
|
|
data[ind - 1].children = checkList |
|
|
|
data[ind - 1].children = checkList |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
data.splice(ind - 1,1) |
|
|
|
data.splice(ind - 1, 1) |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
data.push(obj) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
sessionStorage.setItem("消防设施"+sessionStorage.getItem('paperId'),JSON.stringify(data)) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
console.log(2) |
|
|
|
data.push(obj) |
|
|
|
data = [] |
|
|
|
|
|
|
|
data[0] = obj |
|
|
|
|
|
|
|
sessionStorage.setItem("消防设施"+sessionStorage.getItem('paperId'),JSON.stringify(data)) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
sessionStorage.setItem("消防设施" + sessionStorage.getItem('paperId'), JSON.stringify(data)) |
|
|
|
|
|
|
|
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
} else { |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
console.log(2) |
|
|
|
config.duration = 3000 |
|
|
|
data = [] |
|
|
|
this.snackBar.open('当层消防设施考题设置完成','确定',config); |
|
|
|
data[0] = obj |
|
|
|
this.dialogRef.close() |
|
|
|
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() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -157,150 +158,150 @@ export class examinationQuestions { |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class uploadQuestions { |
|
|
|
export class uploadQuestions { |
|
|
|
|
|
|
|
|
|
|
|
constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef<any>, |
|
|
|
constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef<any>, |
|
|
|
@Inject(MAT_DIALOG_DATA) public data,private route:ActivatedRoute) {} |
|
|
|
@Inject(MAT_DIALOG_DATA) public data, private route: ActivatedRoute) { } |
|
|
|
|
|
|
|
|
|
|
|
defaultCheckedKeys = []; //指定选中复选框的树节点 key值
|
|
|
|
|
|
|
|
defaultExpandedKeys = []; //展开指定的树节点 key值
|
|
|
|
|
|
|
|
defaultSelectedKeys = []; //指定选中的树节点 key值
|
|
|
|
|
|
|
|
renderData:any |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ngOnInit(): void { |
|
|
|
|
|
|
|
let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId'))) |
|
|
|
|
|
|
|
data ? data.forEach(item => { |
|
|
|
|
|
|
|
let realData = item.children |
|
|
|
|
|
|
|
let allFireElements = JSON.parse(JSON.stringify(this.data.allFireElements)) |
|
|
|
|
|
|
|
item.children = this.processingData(allFireElements,realData) |
|
|
|
|
|
|
|
}) :null |
|
|
|
|
|
|
|
this.renderData = data |
|
|
|
|
|
|
|
this.getProfiles() |
|
|
|
|
|
|
|
this.nodeInit() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//处理数据 将消防要素模板与真实素材结合
|
|
|
|
defaultCheckedKeys = []; //指定选中复选框的树节点 key值
|
|
|
|
processingData(allFireElements,realData){ |
|
|
|
defaultExpandedKeys = []; //展开指定的树节点 key值
|
|
|
|
allFireElements[allFireElements.length-1].children = [] |
|
|
|
defaultSelectedKeys = []; //指定选中的树节点 key值
|
|
|
|
realData.forEach(item => { |
|
|
|
renderData: any |
|
|
|
item.isLeaf = true |
|
|
|
|
|
|
|
let noMatch = allFireElements.find( every=> every.id === item.FireElementId ) |
|
|
|
ngOnInit(): void { |
|
|
|
if (!noMatch) { |
|
|
|
let data = JSON.parse(sessionStorage.getItem("消防设施" + sessionStorage.getItem('paperId'))) |
|
|
|
allFireElements[allFireElements.length-1].children.push(item) |
|
|
|
data ? data.forEach(item => { |
|
|
|
} |
|
|
|
let realData = item.children |
|
|
|
}) |
|
|
|
let allFireElements = JSON.parse(JSON.stringify(this.data.allFireElements)) |
|
|
|
let treeData = [] //tree型 处理完成后的数据
|
|
|
|
item.children = this.processingData(allFireElements, realData) |
|
|
|
allFireElements.forEach(element => { |
|
|
|
}) : null |
|
|
|
element.key = element.id |
|
|
|
this.renderData = data |
|
|
|
element.name != '其他' ? element.children = [] : null |
|
|
|
this.getProfiles() |
|
|
|
if(realData){ |
|
|
|
this.nodeInit() |
|
|
|
realData.forEach(item => { |
|
|
|
} |
|
|
|
if(element.id == item.FireElementId){ |
|
|
|
|
|
|
|
element.children.push(item) |
|
|
|
//处理数据 将消防要素模板与真实素材结合
|
|
|
|
} |
|
|
|
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); |
|
|
|
|
|
|
|
} // 如果没有这一项就会被删除
|
|
|
|
} |
|
|
|
} |
|
|
|
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) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
function filterEmpty(listData) { |
|
|
|
|
|
|
|
const result = []; |
|
|
|
|
|
|
|
recursionFilterEmpty(listData, result); |
|
|
|
|
|
|
|
return result; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return filterEmpty(treeData) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//获取登录账号的个人资料
|
|
|
|
//获取登录账号的个人资料
|
|
|
|
Profiles:any
|
|
|
|
Profiles: any |
|
|
|
getProfiles(){ |
|
|
|
getProfiles() { |
|
|
|
this.http.get('/api/ExamAccounts/Profiles').subscribe(data => { |
|
|
|
this.http.get('/api/ExamAccounts/Profiles').subscribe(data => { |
|
|
|
this.Profiles = data |
|
|
|
this.Profiles = data |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
nodeTreeData:any = []; //处置节点tree
|
|
|
|
nodeTreeData: any = []; //处置节点tree
|
|
|
|
//节点初始化
|
|
|
|
//节点初始化
|
|
|
|
nodeInit () { |
|
|
|
nodeInit() { |
|
|
|
let treeData = [] |
|
|
|
let treeData = [] |
|
|
|
this.data.node.forEach(element => { |
|
|
|
this.data.node.forEach(element => { |
|
|
|
element.title = element.name //name
|
|
|
|
element.title = element.name //name
|
|
|
|
element.key = element.id //id
|
|
|
|
element.key = element.id //id
|
|
|
|
element.children = [] //children
|
|
|
|
element.children = [] //children
|
|
|
|
if (element.sitePlanId || element.buildingAreaId) { //是数据节点
|
|
|
|
if (element.sitePlanId || element.buildingAreaId) { //是数据节点
|
|
|
|
element.isLeaf = true |
|
|
|
element.isLeaf = true |
|
|
|
element.isDataNode = true |
|
|
|
element.isDataNode = true |
|
|
|
} else { //不是数据节点
|
|
|
|
} else { //不是数据节点
|
|
|
|
element.isLeaf = false |
|
|
|
element.isLeaf = false |
|
|
|
element.isDataNode = false |
|
|
|
element.isDataNode = false |
|
|
|
} |
|
|
|
} |
|
|
|
this.data.node.forEach(item=>{ |
|
|
|
this.data.node.forEach(item => { |
|
|
|
item.parentId === element.id? element.children.push(item) : null |
|
|
|
item.parentId === element.id ? element.children.push(item) : null |
|
|
|
}) |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
this.data.node.forEach(element=>{ |
|
|
|
|
|
|
|
!element.parentId? treeData.push(element) : null |
|
|
|
|
|
|
|
}) |
|
|
|
}) |
|
|
|
this.nodeTreeData = [...treeData] |
|
|
|
}); |
|
|
|
} |
|
|
|
this.data.node.forEach(element => { |
|
|
|
|
|
|
|
!element.parentId ? treeData.push(element) : null |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
this.nodeTreeData = [...treeData] |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
nzEvent($event){ |
|
|
|
nzEvent($event) { |
|
|
|
console.log($event) |
|
|
|
console.log($event) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//上传
|
|
|
|
|
|
|
|
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') |
|
|
|
} |
|
|
|
} |
|
|
|
//上传
|
|
|
|
|
|
|
|
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 => { |
|
|
|
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); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
} |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
|
|
|
config.duration = 3000 |
|
|
|
|
|
|
|
this.snackBar.open('设置完成,页面将于一秒后关闭', '确定', config); |
|
|
|
|
|
|
|
setTimeout(() => { |
|
|
|
|
|
|
|
window.close() |
|
|
|
|
|
|
|
}, 1000); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -314,26 +315,26 @@ export class uploadQuestions { |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class uploadDisposalNodes { |
|
|
|
export class uploadDisposalNodes { |
|
|
|
|
|
|
|
|
|
|
|
constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef<any>, |
|
|
|
constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef<any>, |
|
|
|
@Inject(MAT_DIALOG_DATA) public data) {} |
|
|
|
@Inject(MAT_DIALOG_DATA) public data) { } |
|
|
|
@ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; |
|
|
|
@ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; |
|
|
|
|
|
|
|
|
|
|
|
ngOnInit(): void { |
|
|
|
ngOnInit(): void { |
|
|
|
this.treeData = [...this.data.treeData] |
|
|
|
this.treeData = [...this.data.treeData] |
|
|
|
} |
|
|
|
} |
|
|
|
treeData:any = []; //tree
|
|
|
|
treeData: any = []; //tree
|
|
|
|
|
|
|
|
|
|
|
|
//提交 保存考试节点
|
|
|
|
//提交 保存考试节点
|
|
|
|
submit () { |
|
|
|
submit() { |
|
|
|
let checkList = [] |
|
|
|
let checkList = [] |
|
|
|
this.data.oldTreeData.forEach(element => { |
|
|
|
this.data.oldTreeData.forEach(element => { |
|
|
|
let isChecked = (this.nzTreeComponent.getTreeNodeByKey(element.id)).isChecked |
|
|
|
let isChecked = (this.nzTreeComponent.getTreeNodeByKey(element.id)).isChecked |
|
|
|
isChecked? checkList.push(element) : null |
|
|
|
isChecked ? checkList.push(element) : null |
|
|
|
}); |
|
|
|
}); |
|
|
|
let galfList = this.nzTreeComponent.getHalfCheckedNodeList() |
|
|
|
let galfList = this.nzTreeComponent.getHalfCheckedNodeList() |
|
|
|
this.data.oldTreeData.forEach(element => { |
|
|
|
this.data.oldTreeData.forEach(element => { |
|
|
|
galfList.forEach(elements => { |
|
|
|
galfList.forEach(elements => { |
|
|
|
element.id == elements.origin.id? checkList.push(element) : null |
|
|
|
element.id == elements.origin.id ? checkList.push(element) : null |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}); |
|
|
|
if (checkList.length) { |
|
|
|
if (checkList.length) { |
|
|
|
@ -342,7 +343,7 @@ export class uploadDisposalNodes { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000 |
|
|
|
this.snackBar.open('请选择节点','确定',config); |
|
|
|
this.snackBar.open('请选择节点', '确定', config); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
