-
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 bf8e027..7745752 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
@@ -79,7 +79,7 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
line-height: 46px;
width: 100px;
text-align: center;
- color: #1E2323;
+ color: #788080;
border-radius: 0;
border-top: 2px solid #fff;
cursor: pointer;
@@ -94,9 +94,69 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
}
}
.maincontantbox{
- flex: 1;
+ flex: 0px;
overflow-y: auto;
padding: 18px;
+ .basicinfodiv{
+ .treeNodeTemplate{
+ .scoreDiv{
+ display: inline-block;
+ input{
+ text-align: center;
+ width: 40px;
+ margin: 0 3px;
+ }
+ .lookitem{
+ margin: 0 20px;
+ }
+ .item{
+ cursor: default;
+ margin: 0 10px;
+ }
+ }
+ }
+ }
+ .fightdeploydiv{
+ .addPlan{
+ width: 130px;
+ height: 36px;
+ line-height: 36px;
+ background: #07CDCF;
+ opacity: 1;
+ border-radius: 8px;
+ color: #fff;
+ text-align: center;
+ cursor: pointer;
+ font-size: 16px;
+ margin-bottom: 15px;
+ }
+ .planList{
+ table{
+ width: 100%;
+ tr{
+ height: 42px;
+ font-size: 15px;
+ td{
+ input{
+ width: 62px;
+ height: 26px;
+ background: #F2F5F6;
+ border: none;
+ border-radius: 5px;
+ text-align: center;
+ }
+ span{
+ margin: 0 5px;
+ cursor: pointer;
+ }
+ }
+ }
+ tr:nth-child(1){
+ background: #F5FDFE;
+ }
+ }
+ }
+ }
}
}
}
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 848c829..f2fcd8f 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,5 +1,8 @@
-import { Component, OnInit } from '@angular/core';
-
+import { SelectionModel } from '@angular/cdk/collections';
+import { Component, Inject, OnInit } from '@angular/core';
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatTableDataSource } from '@angular/material/table';
+import { NzFormatEmitEvent } from 'ng-zorro-antd/tree';
@Component({
selector: 'app-create-test-score',
templateUrl: './create-test-score.component.html',
@@ -7,7 +10,7 @@ import { Component, OnInit } from '@angular/core';
})
export class CreateTestScoreComponent implements OnInit {
- constructor() { }
+ constructor(public dialog: MatDialog) { }
selectedTab:number = 1 //选中的选项卡
selectTab(index){
this.selectedTab = index
@@ -15,4 +18,249 @@ export class CreateTestScoreComponent implements OnInit {
ngOnInit(): void {
}
+ //模拟预案数据
+ planDatas:any = [
+ {name:'5楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',scroe:0},
+ {name:'6楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',scroe:0},
+ {name:'7楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',scroe:0}
+ ]
+
+ defaultCheckedKeys = []; //指定选中复选框的树节点 key值
+ defaultExpandedKeys = []; //展开指定的树节点 key值
+ defaultSelectedKeys = []; //指定选中的树节点 key值
+
+ examScore:any = 0//整个试卷的总分
+
+ //模拟单位数据
+ unitDatas:any = [
+ {name:'富丽华大酒店1',score:0,basicInfoScore:0,basicInfoNodes : [
+ {
+ title: '单位信息',
+ key: '0-0',
+ expanded: true,
+ zIndex : '0',
+ itemScore: 0,
+ sumScore: 0,
+ children: [
+ {title: '统一社会信用代码',key: '1',isLeaf:true},
+ {title: '单位类型',key: '2',isLeaf:true},
+ {title: '联系人',key: '3',isLeaf:true},
+ {title: '联系电话',key: '4',isLeaf:true},
+ {title: '辖区中队',key: '5',isLeaf:true},
+ {title: '单位地址',key: '6',isLeaf:true}
+ ]
+ },
+ {
+ title: '建筑信息',
+ key: '0-1',
+ expanded: true,
+ zIndex : '0',
+ itemScore: 0,
+ sumScore: 0,
+ children: [
+ { title: '面积', key: '0-1-0-0',isLeaf:true},
+ { title: '高度', key: '0-1-0-1',isLeaf:true},
+ { title: '层数', key: '0-1-0-2',isLeaf:true}
+ ]
+ },
+ ],aroundScore:0,aroundNodes :[
+ {
+ title: '单位四周毗邻',
+ key: '11',
+ expanded: true,
+ zIndex : '0',
+ itemScore: 0,
+ sumScore: 0,
+ children: [
+ {title: '东方向',key: '55',isLeaf:true},
+ ]
+ },
+ {
+ title: '建筑四周毗邻',
+ key: '22',
+ expanded: true,
+ zIndex : '0',
+ itemScore: 0,
+ sumScore: 0,
+ children: [
+ {title: '东方向',key: '55',isLeaf:true},
+ ]
+ },
+ ]},
+ {name:'富丽华大酒店2',score:0,basicInfoScore:0}
+ ]
+
+
+ calculateScore(key){//计算分数
+ //key代表第几个建筑
+ //计算当前建筑基本信息分数
+ var basicInfoScore = 0
+ this.unitDatas[key].basicInfoNodes.forEach(element => {
+ basicInfoScore += Number(element.sumScore)
+ })
+ this.unitDatas[key].basicInfoScore = basicInfoScore
+ //计算当前建筑四周毗邻分数
+ var aroundScore = 0
+ this.unitDatas[key].aroundNodes.forEach(element => {
+ aroundScore += Number(element.sumScore)
+ })
+ this.unitDatas[key].aroundScore = aroundScore
+
+
+ //计算整个单位的总分
+ var unitScore = 0
+ this.unitDatas[key].score = basicInfoScore + aroundScore + 0
+
+ //计算整个试卷的总分
+ let examScore = 0
+ this.unitDatas.forEach(element => {
+ examScore += Number(element.score)
+ })
+ this.examScore = examScore
+ }
+
+ //tree的选择事件
+ nzEvent(event: NzFormatEmitEvent,key): void {
+ if(event.node.level == 0){//如果点击第一层
+ let itemTrue = []
+ event.node.origin.children.forEach(item => {
+ if(item.checked){
+ itemTrue.push(item)
+ }
+ })
+ event.node.origin.sumScore = event.node.origin.itemScore * itemTrue.length
+
+ this.calculateScore(key)//更新标题栏分数
+
+ }else{
+ let itemTrue = []
+ event.node.parentNode.origin.children.forEach(item => {
+ if(item.checked){
+ itemTrue.push(item)
+ }
+ })
+ event.node.parentNode.origin.sumScore = event.node.parentNode.origin.itemScore * itemTrue.length
+ this.calculateScore(key)//更新标题栏分数
+ }
+
+ }
+
+ //每项分数动态计算
+ itemScore(node,key){
+ let itemTrue = []
+ node.origin.children.forEach(item => {
+ if(item.checked){
+ itemTrue.push(item)
+ }
+ })
+ node.origin.sumScore = node.origin.itemScore * itemTrue.length
+ this.calculateScore(key)//更新标题栏分数
+ }
+ //总分数动态计算
+ sumScore(node,key){
+ //key代表第几个建筑
+ let itemTrue = []
+ node.origin.children.forEach(item => {
+ if(item.checked){
+ itemTrue.push(item)
+ }
+ })
+ node.origin.itemScore = node.origin.sumScore / itemTrue.length
+ this.calculateScore(key)//更新标题栏分数
+
+ }
+
+ //添加预案
+ addPlan(){
+ const dialogRef = this.dialog.open(AddPlanDialog, {
+ width: '380px',
+ height: '136px',
+ data: {}
+ });
+
+ dialogRef.afterClosed().subscribe(result => {
+ console.log('The dialog was closed');
+ });
+ }
+ //每条预案分数增加在试卷分数
+ planItemScore(item){
+ this.examScore += item.score
+ }
+}
+
+//添加预案1
+@Component({
+ selector: 'addplan-dialog',
+ templateUrl: 'addPlan.html',
+ styleUrls: ['addPlan.scss']
+})
+export class AddPlanDialog {
+
+ constructor(public dialog: MatDialog,public dialogRef: MatDialogRef
+
-
-
+
- 基本信息30分
+ 基本信息
+ {{unit.basicInfoScore ? unit.basicInfoScore : 0}}分
-
宇宙无敌酒店
+{{unit.name}}
+
- xxxxx
+
+
+
+
+ 四周毗邻
+ {{unit.aroundScore ? unit.aroundScore : 0}}分
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 单项分
+ 总共分
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 单项分
+ 总共分
+
+
+
- 作战部署
+
+ add_circle_outline 添加预案
+
+
+
+
+
| 预案名称 | +添加人 | +修改时间 | +是否公开 | +编制级别 | +设置分数 | +操作 | +
| {{item.name}} | +{{item.or}} | +{{item.time}} | +{{item.isOpen}} | +{{item.level}} | ++ + | ++ 编辑 + 删除 + | +