|
|
|
|
@ -127,6 +127,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
buildingsData.name = data[i].name |
|
|
|
|
buildingsData.buildingType = data[i].buildingTypes[0].name |
|
|
|
|
buildingsData[0].buildingBasicGroups.forEach((y,m) => { |
|
|
|
|
|
|
|
|
|
let propertyInfosArr = [] |
|
|
|
|
let tabledata |
|
|
|
|
if(y.type == 1){//如果是表格类
|
|
|
|
|
@ -158,6 +159,28 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
}) |
|
|
|
|
y.tabledata = dest |
|
|
|
|
tabledata = dest |
|
|
|
|
if(y.tabledata[0].propertyName == '罐区'){ |
|
|
|
|
|
|
|
|
|
if(y.tabledata[1].propertyName != '储罐编号'){ |
|
|
|
|
let index
|
|
|
|
|
y.tabledata.forEach((element,key) => { |
|
|
|
|
if(element.propertyName == '储罐编号'){ |
|
|
|
|
index = key |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
y.tabledata[1] = y.tabledata.splice(index, 1, y.tabledata[1])[0]; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
y.tabledata[0].data.forEach((x,key) => { |
|
|
|
|
|
|
|
|
|
if(x.propertyValue){ |
|
|
|
|
x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5) |
|
|
|
|
x.isLeaf = true |
|
|
|
|
x.name = x.propertyValue + '-' + y.tabledata[1].data[key].propertyValue |
|
|
|
|
propertyInfosArr.push(x) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}else{ |
|
|
|
|
y.tabledata[0].data.forEach((x,key) => { |
|
|
|
|
if(x.propertyValue){ |
|
|
|
|
x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5) |
|
|
|
|
@ -166,6 +189,8 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
propertyInfosArr.push(x) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|
y.propertyInfos.forEach((x,key) => { |
|
|
|
|
if(x.propertyValue){ |
|
|
|
|
@ -581,6 +606,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
}else{ |
|
|
|
|
this.unitId[key].basicInfoItemScore = 0 |
|
|
|
|
} |
|
|
|
|
this.unitId[key].basicInfoSelectedNum = selectedNum.length |
|
|
|
|
} |
|
|
|
|
if(event.node.origin.type == '四周毗邻' || (event.node.parentNode && event.node.parentNode.origin.type == '四周毗邻')){ |
|
|
|
|
let selectedNum = [] |
|
|
|
|
@ -594,6 +620,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
}else{ |
|
|
|
|
this.unitId[key].aroundItemScore = 0 |
|
|
|
|
} |
|
|
|
|
this.unitId[key].aroundSelectedNum = selectedNum.length |
|
|
|
|
} |
|
|
|
|
if(event.node.origin.type == '重点部位' || (event.node.parentNode && event.node.parentNode.origin.type == '重点部位')){ |
|
|
|
|
let selectedNum = [] |
|
|
|
|
@ -607,6 +634,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
}else{ |
|
|
|
|
this.unitId[key].keySiteItemScore = 0 |
|
|
|
|
} |
|
|
|
|
this.unitId[key].keySiteSelectedNum = selectedNum.length |
|
|
|
|
} |
|
|
|
|
if(event.node.origin.type == '功能分区' || (event.node.parentNode && event.node.parentNode.origin.type == '功能分区')){ |
|
|
|
|
let selectedNum = [] |
|
|
|
|
@ -620,6 +648,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
}else{ |
|
|
|
|
this.unitId[key].funDivItemScore = 0 |
|
|
|
|
} |
|
|
|
|
this.unitId[key].funDivSelectedNum = selectedNum.length |
|
|
|
|
} |
|
|
|
|
if(event.node.origin.type == '消防设施' || (event.node.parentNode && event.node.parentNode.origin.type == '消防设施')){ |
|
|
|
|
let selectedNum = [] |
|
|
|
|
@ -633,6 +662,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
}else{ |
|
|
|
|
this.unitId[key].fireFacItemScore = 0 |
|
|
|
|
} |
|
|
|
|
this.unitId[key].fireFacSelectedNum = selectedNum.length |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -730,6 +760,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//每条预案分数增加在试卷分数
|
|
|
|
|
planItemScore(item){ |
|
|
|
|
//计算整个试卷的总分
|
|
|
|
|
@ -750,6 +781,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
}) |
|
|
|
|
this.examScore = examScore + examScore2 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//编辑每条预案试卷
|
|
|
|
|
edit(item){ |
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
@ -757,6 +789,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
config.duration = 3000 |
|
|
|
|
this.snackBar.open('暂不能编辑','确定',config); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//删除每条预案试卷
|
|
|
|
|
deletePlan(item){ |
|
|
|
|
this.unitId[this.selectedUnitIndex].planList.forEach((element,key)=>{ |
|
|
|
|
@ -772,7 +805,6 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
//保存
|
|
|
|
|
save(){ |
|
|
|
|
let copyDatas = JSON.parse(JSON.stringify(this.unitId)) |
|
|
|
|
|
|
|
|
|
//循环每个建筑处理数据筛选出选中数据
|
|
|
|
|
copyDatas.forEach(item => { |
|
|
|
|
//建筑的基本信息模块处理
|
|
|
|
|
@ -1031,9 +1063,7 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
}) : null |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
//循环每个建筑处理数据
|
|
|
|
|
console.log(copyDatas)
|
|
|
|
|
|
|
|
|
|
//将筛选出来的数据变为服务器提交数据
|
|
|
|
|
let paperDataInfo = [] |
|
|
|
|
copyDatas.forEach((item,key) =>{ |
|
|
|
|
paperDataInfo[key] = {} |
|
|
|
|
@ -1052,18 +1082,47 @@ export class CreateTestScoreComponent implements OnInit {
|
|
|
|
|
paperDataInfo[key].facilityScore = item.fireFacScore |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
console.log(paperDataInfo)
|
|
|
|
|
|
|
|
|
|
// console.log(123456,paperDataInfo)
|
|
|
|
|
//判断是否存在总分填写后没有勾选 或者勾选了没有填写总分的情况
|
|
|
|
|
paperDataInfo.forEach(element => { |
|
|
|
|
//判断存在总分填写后没有勾选题目
|
|
|
|
|
if( (element.basicInfoScore != 0 && JSON.parse(element.basicInfoData).length == 0) || |
|
|
|
|
(element.adjoinScore != 0 && JSON.parse(element.adjoinData).length == 0) || |
|
|
|
|
(element.importLocationScore != 0 && JSON.parse(element.importLocationData).length == 0) || |
|
|
|
|
(element.functionalDivisionScore != 0 && JSON.parse(element.functionalDivisionData).length == 0) || |
|
|
|
|
(element.facilityScore != 0 && JSON.parse(element.facilityData).length == 0) ){ |
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
config.duration = 3000 |
|
|
|
|
this.snackBar.open('存在填写过总分,但未勾选题目的分组','确定',config); |
|
|
|
|
return
|
|
|
|
|
}else
|
|
|
|
|
//勾选了题目存在没有填写总分
|
|
|
|
|
if( |
|
|
|
|
(element.basicInfoScore == 0 && JSON.parse(element.basicInfoData).length != 0) || |
|
|
|
|
(element.adjoinScore == 0 && JSON.parse(element.adjoinData).length != 0) || |
|
|
|
|
(element.importLocationScore == 0 && JSON.parse(element.importLocationData).length != 0) || |
|
|
|
|
(element.functionalDivisionScore == 0 && JSON.parse(element.functionalDivisionData).length != 0) || |
|
|
|
|
(element.facilityScore == 0 && JSON.parse(element.facilityData).length != 0) ){ |
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
config.duration = 3000 |
|
|
|
|
this.snackBar.open('存在勾选过题目,但未填写总分的分组','确定',config); |
|
|
|
|
return
|
|
|
|
|
}else{ |
|
|
|
|
const dialogRef = this.dialog.open(FinishDialog, { |
|
|
|
|
width: '650px', |
|
|
|
|
data: paperDataInfo |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
dialogRef.afterClosed().subscribe(result => { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
//上一步
|
|
|
|
|
goBack(){ |
|
|
|
|
window.history.back();
|
|
|
|
|
@ -1142,7 +1201,8 @@ export class AddPlanTwoDialog {
|
|
|
|
|
companyId:this.data.companyData.companyData.id |
|
|
|
|
}}).subscribe((data:any) => { |
|
|
|
|
data.items.forEach(item => { |
|
|
|
|
item.planType == 1 ? planArr.push(item) : null |
|
|
|
|
//二维预案并且审核通过
|
|
|
|
|
(item.planType == 1 && item.auditStatus == 2) ? planArr.push(item) : null |
|
|
|
|
}) |
|
|
|
|
this.dataSource = planArr |
|
|
|
|
}) |
|
|
|
|
@ -1161,12 +1221,17 @@ export class AddPlanTwoDialog {
|
|
|
|
|
sessionStorage.setItem('buildingTypeId',this.data.companyData.companyData.buildingTypes[0].id) |
|
|
|
|
sessionStorage.setItem('companyId',this.data.companyData.companyData.id) |
|
|
|
|
window.open('/canvasTool') |
|
|
|
|
}else{ |
|
|
|
|
if(this.dataSource.length == 0){ |
|
|
|
|
this.dialogRef.close(); |
|
|
|
|
}else{ |
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
config.duration = 3000 |
|
|
|
|
this.snackBar.open('请选择要添加的预案','确定',config); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
}else{//如果选择的是自定义预案
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
