-
+
+
{{unit.name}}
@@ -85,7 +85,7 @@ -
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 1d174d9..8aef403 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
@@ -1,4 +1,5 @@
import { SelectionModel } from '@angular/cdk/collections';
+import { HttpClient } from '@angular/common/http';
import { Component, Inject, OnInit } from '@angular/core';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatTableDataSource } from '@angular/material/table';
@@ -10,12 +11,16 @@ import { NzFormatEmitEvent } from 'ng-zorro-antd/tree';
})
export class CreateTestScoreComponent implements OnInit {
- constructor(public dialog: MatDialog) { }
+ constructor(public dialog: MatDialog,private http: HttpClient) { }
selectedTab:number = 1 //选中的选项卡
selectTab(index){
this.selectedTab = index
}
ngOnInit(): void {
+ this.unitId.forEach(item => {
+
+ })
+ this.getUnitData()
}
//模拟单位数据
@@ -69,17 +74,110 @@ export class CreateTestScoreComponent implements OnInit {
// {name:'富丽华大酒店2',score:0,basicInfoScore:0}
]
- unitId:any = [{name:'富丽华大酒店1'}]
+
+ //上个页面传过来的单位数据
+ unitId:any = [{name:'最最最最最',id:'5fb76c42919f2b44e464016f'},
+ // {name:'华南城集团有限公司',id:'5ee19fe06f91049f5e23e937'},
+ // {name:'贵港油库',id:'5fa35d68f8eb762cb03c662e'}
+ ]
+
//获取单位数据
getUnitData(){
+ this.unitId.forEach((element,index) => {
+ element.score = 0
+ element.basicInfoScore = 0
+ element.basicInfoItemScore = 0
+
+ this.http.get(`/api/Companies/${element.id}`).subscribe((data:any)=>{
+ console.log('单位信息',index,data)
+ let unitData = {
+ name: '单位信息',
+ type:'基本信息',
+ expanded: false,
+ key:element.id + '单位信息' + index,
+ children:[]
+ }
+ data.usci ? unitData.children.push({
+ name: '统一社会信用代码',key: element.id+'统一社会信用代码',isLeaf:true,value:data.usci
+ }) : null
+ data.buildingTypes[0].name ? unitData.children.push({
+ name: '单位类型',key: element.id+'单位类型',isLeaf:true,value:data.buildingTypes[0].name
+ }) : null
+ data.contacts ? unitData.children.push({
+ name: '联系人',key: element.id+'联系人',isLeaf:true,value:data.contacts
+ }) : null
+ data.phone ? unitData.children.push({
+ name: '联系电话',key: element.id+'联系电话',isLeaf:true,value:data.phone
+ }) : null
+ data.organizationName ? unitData.children.push({
+ name: '辖区中队',key: element.id+'辖区中队',isLeaf:true,value:data.organizationName
+ }) : null
+ data.address ? unitData.children.push({
+ name: '单位地址',key: element.id+'单位地址',isLeaf:true,value:data.address
+ }) : null
+
+ element.basicInfoNodes = []
+ element.basicInfoNodes.push(unitData)
+
+ var buildingsData:any
+ this.http.get("/api/Buildings",{
+ params:{
+ companyId:element.id
+ }
+ }).subscribe(async (data:any)=>{
+ buildingsData = data
+ for (let i = 0, length = data.length; i < length; i++){
+ const result = await new Promise((resolve) =>{
+ this.http.get("/api/BuildingBasicInfos",{ // 循环请求当前单位建筑每一个建筑的信息保存到数组中
+ params:{
+ companyId :element.id,
+ buildingId:data[i].id,
+ buildingType:data[i].buildingTypes[0].id
+ }
+ }).subscribe((buildingsData:any)=>{
+ console.log(1234,buildingsData)
+ buildingsData.name = data[i].name
+ buildingsData.buildingType = data[i].buildingTypes[0].name
+ let propertyInfosArr = []
+ buildingsData[0].buildingBasicGroups[0].propertyInfos.forEach((x,key) => {
+ if(x.propertyValue){
+ x.key = data[i].name + x.propertyName + key
+ x.isLeaf = true
+ x.name = x.propertyName
+ propertyInfosArr.push(x)
+ }
+ })
+ element.basicInfoNodes.push({
+ name: buildingsData.name,
+ type:'基本信息',
+ expanded: false,
+ key:buildingsData[0].id,
+ children:propertyInfosArr
+ })
+
+ element.basicInfoNodes = [...element.basicInfoNodes]
+ resolve(i)
+ })
+ })
+ }
+ console.log(987,this.unitId)
+ })
+
+ })
+
+ })
}
+ //获得建筑信息
+ getAllBuildingsInfo(unitId){
+
+
+ }
//阻止input事件冒泡
stopPropagation($event){
- console.log($event)
$event.stopPropagation()
}
//模拟预案数据
@@ -102,11 +200,11 @@ export class CreateTestScoreComponent implements OnInit {
//key代表第几个建筑
//计算整个单位的总分
- this.unitDatas[key].score = this.unitDatas[key].basicInfoScore + this.unitDatas[key].aroundScore
+ this.unitId[key].score = this.unitId[key].basicInfoScore + 0
//计算整个试卷的总分
let examScore = 0
- this.unitDatas.forEach(element => {
+ this.unitId.forEach(element => {
examScore += Number(element.score)
})
this.examScore = examScore
@@ -116,30 +214,31 @@ export class CreateTestScoreComponent implements OnInit {
nzEvent(event: NzFormatEmitEvent,key): void {
if(event.node.origin.type == '基本信息' || (event.node.parentNode && event.node.parentNode.origin.type == '基本信息')){
+
let selectedNum = []
- this.unitDatas[key].basicInfoNodes.forEach(item => {
+ this.unitId[key].basicInfoNodes.forEach(item => {
item.children.forEach(i => {
i.checked ? selectedNum.push(i) : ''
})
})
if(selectedNum.length != 0 ){
- this.unitDatas[key].basicInfoScore ? this.unitDatas[key].basicInfoItemScore = this.unitDatas[key].basicInfoScore / selectedNum.length : null
+ this.unitId[key].basicInfoScore ? this.unitId[key].basicInfoItemScore = this.unitId[key].basicInfoScore / selectedNum.length : null
}else{
- this.unitDatas[key].basicInfoItemScore = 0
+ this.unitId[key].basicInfoItemScore = 0
}
}
if(event.node.origin.type == '四周毗邻' || (event.node.parentNode && event.node.parentNode.origin.type == '四周毗邻')){
let selectedNum = []
- this.unitDatas[key].aroundNodes.forEach(item => {
+ this.unitId[key].aroundNodes.forEach(item => {
item.children.forEach(i => {
i.checked ? selectedNum.push(i) : ''
})
})
console.log(7894,selectedNum)
if(selectedNum.length != 0 ){
- this.unitDatas[key].aroundScore ? this.unitDatas[key].aroundItemScore = this.unitDatas[key].aroundScore / selectedNum.length : null
+ this.unitId[key].aroundScore ? this.unitId[key].aroundItemScore = this.unitId[key].aroundScore / selectedNum.length : null
}else{
- this.unitDatas[key].aroundItemScore = 0
+ this.unitId[key].aroundItemScore = 0
}
}
}
@@ -149,29 +248,29 @@ export class CreateTestScoreComponent implements OnInit {
//key代表第几个建筑 type代表哪个部分
if(type == '基本信息'){
let selectedNum = 0
- this.unitDatas[key].basicInfoNodes.forEach(item => {
+ this.unitId[key].basicInfoNodes.forEach(item => {
item.children.forEach(i => {
i.checked ? selectedNum++ : ''
})
})
if(selectedNum != 0){
- this.unitDatas[key].basicInfoItemScore = this.unitDatas[key].basicInfoScore / selectedNum
+ this.unitId[key].basicInfoItemScore = this.unitId[key].basicInfoScore / selectedNum
}else{
- this.unitDatas[key].basicInfoItemScore = 0
+ this.unitId[key].basicInfoItemScore = 0
}
}
if(type == '四周毗邻'){
let selectedNum = 0
- this.unitDatas[key].aroundNodes.forEach(item => {
+ this.unitId[key].aroundNodes.forEach(item => {
item.children.forEach(i => {
i.checked ? selectedNum++ : ''
})
})
if(selectedNum != 0){
- this.unitDatas[key].aroundItemScore = this.unitDatas[key].aroundScore / selectedNum
+ this.unitId[key].aroundItemScore = this.unitId[key].aroundScore / selectedNum
}else{
- this.unitDatas[key].aroundItemScore = 0
+ this.unitId[key].aroundItemScore = 0
}
}