-
-
-
-
-
-
- 基本信息
-
-
- 总分值: 分,
- 单项
-
- {{unit.basicInfoItemScore ? unit.basicInfoItemScore : 0}}
- 分
-
-
-
-
-
{{unit.name}}
- -
-
-
-
-
-
-
- 查看
+
+
-
-
-
- 四周毗邻
-
- 总分值: 分,
- 单项
- {{unit.aroundItemScore ? unit.aroundItemScore : 0}}
- 分
-
-
-
-
-
+
+
+
+
+
+ 基本信息
+
+
+ 总分值: 分,
+ 单项
+
+ {{unit.basicInfoItemScore ? unit.basicInfoItemScore : 0}}
+ 分
+
+
+
+
+
-
-
-
- {{unit.name}}
+ +
+
+
+
+
-
-
+
+
-
-
+ 查看
+
+
-
-
-
-
-
-
-
- 重点部位
-
- 总分值: 分,
- 单项
- {{unit.keySiteItemScore ? unit.keySiteItemScore : 0}}
- 分
-
-
-
-
-
-
-
+
+
+
+ 四周毗邻
+
+ 总分值: 分,
+ 单项
+ {{unit.aroundItemScore ? unit.aroundItemScore : 0}}
+ 分
+
+
+
+
+
-
-
-
-
- 查看
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+ 查看
+
+
-
-
-
-
-
-
-
- 功能分区
-
- 总分值: 分,
- 单项
- {{unit.funDivItemScore ? unit.funDivItemScore : 0}}
- 分
-
-
-
-
-
-
-
+
+
+
+ 重点部位
+
+ 总分值: 分,
+ 单项
+ {{unit.keySiteItemScore ? unit.keySiteItemScore : 0}}
+ 分
+
+
+
+
+
-
-
-
-
- 查看
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+ 查看
+
+
-
-
-
-
-
-
-
- 数据核验
-
- 总分值: 分,
- 单项
- {{unit.fireFacItemScore ? unit.fireFacItemScore : 0}}
- 分
-
-
-
-
-
+
+
+
-
-
+
+
+
+ 功能分区
+
+ 总分值: 分,
+ 单项
+ {{unit.funDivItemScore ? unit.funDivItemScore : 0}}
+ 分
+
+
+
+
+
-
-
-
-
- 查看
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+ 查看
+
+
-
-
-
-
+
+
-
-
+
+
+
+ 数据核验
+
+ 总分值: 分,
+ 单项
+ {{unit.fireFacItemScore ? unit.fireFacItemScore : 0}}
+ 分
+
+
+
+
+
-
-
+
- 查看
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+ 查看
+
+
@@ -290,7 +293,7 @@
-
+
上一步
diff --git a/src/app/examiner/create-test-score/create-test-score.component.scss b/src/app/examiner/create-test-score/create-test-score.component.scss
index 2378a17..a4422c6 100644
--- a/src/app/examiner/create-test-score/create-test-score.component.scss
+++ b/src/app/examiner/create-test-score/create-test-score.component.scss
@@ -59,6 +59,13 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
tr:nth-child(1){
background: #F5FDFE;
}
+ .selectedLi{
+ background-color: #07CDCF;
+ color: #fff;
+ .colorspan{
+ color: #fff;
+ }
+ }
}
}
}
diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts
index 78a3f2e..afa12e9 100644
--- a/src/app/examiner/create-test-score/create-test-score.component.ts
+++ b/src/app/examiner/create-test-score/create-test-score.component.ts
@@ -23,7 +23,11 @@ export class CreateTestScoreComponent implements OnInit {
this.getFunDiv()
this.getFireFac()
}
-
+ //当前选中的单位
+ selectedUnitIndex = 0
+ clickUnitName(key){
+ this.selectedUnitIndex = key
+ }
//模拟单位数据
unitDatas:any = [
{name:'富丽华大酒店1',score:0,basicInfoScore:0,basicInfoItemScore:0,basicInfoNodes : [
@@ -76,11 +80,11 @@ export class CreateTestScoreComponent implements OnInit {
]
//上个页面传过来的单位数据
- unitId:any = [{name:'最最最最最',id:'5fb76c42919f2b44e464016f'},
- {name:'华南城集团有限公司',id:'5ee19fe06f91049f5e23e937'},
- {name:'贵港油库',id:'5fa35d68f8eb762cb03c662e'}
- ]
-
+ // unitId:any = [{name:'最最最最最',id:'5fb76c42919f2b44e464016f'},
+ // {name:'华南城集团有限公司',id:'5ee19fe06f91049f5e23e937'},
+ // {name:'贵港油库',id:'5fa35d68f8eb762cb03c662e'}
+ // ]
+ unitId:any = JSON.parse(localStorage.getItem('checkedWork'))
//获取单位基本信息
getUnitData(){
this.unitId.forEach((element,index) => {
@@ -732,7 +736,7 @@ export class CreateTestScoreComponent implements OnInit {
})
this.examScore = examScore + examScore2
}
- @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
+
//保存
save(){
let copyDatas = JSON.parse(JSON.stringify(this.unitId))
@@ -996,14 +1000,32 @@ export class CreateTestScoreComponent implements OnInit {
//循环每个建筑处理数据
console.log(copyDatas)
- // copyDatas.forEach(item =>{
- // //建筑的基本信息模块处理
- // item.basicInfoNodes.forEach((i,key) => {
-
- // })
+
+ let paperDataInfo = []
+ copyDatas.forEach((item,key) =>{
+ paperDataInfo[key] = {}
+ paperDataInfo[key].id = ''
+ paperDataInfo[key].paperId = ''
+ paperDataInfo[key].companyId = item.id
+ paperDataInfo[key].basicInfoData = item.basicInfoNodes
+ paperDataInfo[key].basicInfoScore = item.basicInfoScore
+ paperDataInfo[key].adjoinData = item.aroundNodes
+ paperDataInfo[key].adjoinScore = item.aroundScore
+ paperDataInfo[key].importLocationData = item.keySiteNodes
+ paperDataInfo[key].importLocationScore = item.keySiteScore
+ paperDataInfo[key].functionalDivisionData = item.funDivNodes
+ paperDataInfo[key].functionalDivisionScore = item.funDivScore
+ paperDataInfo[key].facilityData = item.fireFacNodes
+ paperDataInfo[key].facilityScore = item.fireFacScore
+ })
+ console.log(paperDataInfo)
- // })
+
+ }
+ //上一步
+ goBack(){
+ window.history.back();
}
}
diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.html b/src/app/examiner/examiner-new-one/examiner-new-one.component.html
index 2b6a73d..48ff7bf 100644
--- a/src/app/examiner/examiner-new-one/examiner-new-one.component.html
+++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.html
@@ -23,7 +23,7 @@
- 包含下级
+ 包含下级
clear
@@ -59,7 +59,7 @@
-