From 8b6ca8a897de73ea3d3d1d85e2228bfa237738c3 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Mon, 21 Dec 2020 13:52:32 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E8=80=83=E6=A0=B8?=
=?UTF-8?q?=E5=A4=84=E7=BD=AE=E8=8A=82=E7=82=B9=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../collection-tools.component.ts | 8 +++--
.../collection-tools/examinationQuestions.ts | 34 +++++++++++++++++++
.../ui/collection-tools/uploadQuestions.html | 19 ++++++++++-
3 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index bc026a5..4cc7633 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -1080,7 +1080,6 @@ export class CollectionToolsComponent implements OnInit {
}
-
//打开消防设施考题设定
openFireExamination () {
console.log(1,this.beforeOneCheckedBuilding)
@@ -1096,8 +1095,11 @@ export class CollectionToolsComponent implements OnInit {
//上传考题
openUploadQuestions () {
let treeData = JSON.parse( JSON.stringify(this.dataSource.data) )
- let data = { treeData: treeData, question: JSON.parse( JSON.stringify(this.examMsg) ) }
- let dialogRef = this.dialog.open(uploadQuestions,{data});
+ let nodes = JSON.parse( JSON.stringify( JSON.parse(sessionStorage.getItem('examNodeList')) ) )
+ if (treeData && nodes) {
+ let data = { treeData: treeData, question: JSON.parse( JSON.stringify(this.examMsg) ), node: nodes }
+ let dialogRef = this.dialog.open(uploadQuestions,{data});
+ }
}
//封装 刷新 tree 数据
diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts
index ce064fc..162ed3b 100644
--- a/src/app/ui/collection-tools/examinationQuestions.ts
+++ b/src/app/ui/collection-tools/examinationQuestions.ts
@@ -146,7 +146,9 @@ export class uploadQuestions {
defaultExpandedKeys = []; //展开指定的树节点 key值
defaultSelectedKeys = []; //指定选中的树节点 key值
renderData:any
+
ngOnInit(): void {
+ this.nodeInit()
let data = JSON.parse(sessionStorage.getItem("试卷id"))
data.forEach(item => {
item.children.forEach(i => {
@@ -155,6 +157,32 @@ export class uploadQuestions {
})
this.renderData = data
}
+
+ nodeTreeData:any = []; //处置节点tree
+ //节点初始化
+ nodeInit () {
+ let treeData = []
+ this.data.node.forEach(element => {
+ element.title = element.name //name
+ element.key = element.id //id
+ element.children = [] //children
+ if (element.sitePlanId || element.buildingAreaId) { //是数据节点
+ element.isLeaf = true
+ element.isDataNode = true
+ } else { //不是数据节点
+ element.isLeaf = false
+ element.isDataNode = false
+ }
+ this.data.node.forEach(item=>{
+ item.parentId === element.id? element.children.push(item) : null
+ })
+ });
+ this.data.node.forEach(element=>{
+ !element.parentId? treeData.push(element) : null
+ })
+ this.nodeTreeData = [...treeData]
+ }
+
nzEvent($event){
console.log($event)
}
@@ -188,6 +216,12 @@ export class uploadDisposalNodes {
let isChecked = (this.nzTreeComponent.getTreeNodeByKey(element.id)).isChecked
isChecked? checkList.push(element) : null
});
+ let galfList = this.nzTreeComponent.getHalfCheckedNodeList()
+ this.data.oldTreeData.forEach(element => {
+ galfList.forEach(elements => {
+ element.id == elements.origin.id? checkList.push(element) : null
+ });
+ });
if (checkList.length) {
this.dialogRef.close(checkList);
} else {
diff --git a/src/app/ui/collection-tools/uploadQuestions.html b/src/app/ui/collection-tools/uploadQuestions.html
index a8d57c7..a891755 100644
--- a/src/app/ui/collection-tools/uploadQuestions.html
+++ b/src/app/ui/collection-tools/uploadQuestions.html
@@ -5,7 +5,7 @@
<textarea style="width: 100%;background-color: #dfe0e0;border: none;outline: none;height: 50px;border-radius: 5px;resize: none;" placeholder="请填写考试要点" [(ngModel)]="data.question.keynote"></textarea>
</div>
<div style="padding-left: 10px; font-size: 14px; font-weight: 550;margin: 5px 0;">考核消防设施</div>
- <div style="height: 200px;overflow-y: auto;margin-bottom: 25px;">
+ <div style="max-height: 200px;overflow-y: auto;margin-bottom: 25px;">
<!-- 消防列表树 -->
<nz-tree
#nzTreeComponent
@@ -27,6 +27,23 @@
</ng-template>
<!-- 消防列表树 -->
</div>
+ <div style="padding-left: 10px; font-size: 14px; font-weight: 550;margin: 5px 0;">考核处置节点</div>
+ <div style="max-height: 200px;overflow-y: auto;margin-bottom: 25px;">
+ <!-- 消防列表树 -->
+ <nz-tree
+ #nzTreeComponent
+ [nzData]="nodeTreeData"
+ nzMultiple
+ [nzTreeTemplate]="nzTreeTemplate"
+ >
+ </nz-tree>
+ <ng-template #nzTreeTemplate let-node let-origin="origin">
+ <div class="treeNodeTemplate">
+ <label class="overflowText textNode">{{node.origin.name || node.origin.Name}}</label>
+ </div>
+ </ng-template>
+ <!-- 消防列表树 -->
+ </div>
<div style="text-align: center;">
<button mat-stroked-button style="margin-right: 15px;border: none;background: #07CDCF;color: #fff;" (click)='submit()'>确定</button>
<button mat-stroked-button style="margin-left: 15px;border: none;background: #dfe0e0;" mat-dialog-close>取消</button>