diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss
index be59497..8c43cd2 100644
--- a/src/app/ui/collection-tools/collection-tools.component.scss
+++ b/src/app/ui/collection-tools/collection-tools.component.scss
@@ -121,7 +121,7 @@
width: 400px;
top: 40px;
left: 240px;
- z-index: 1111;
+ z-index: 119;
display: flex;
}
.functionalDomainLeft {
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index cd4e9d3..2937762 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -16,7 +16,7 @@ import { delay } from 'rxjs/operators';
import { windows } from 'src/app/interface';
import { GameMode } from 'src/app/working-area/model/gameMode';
import { ActivatedRoute, Router } from '@angular/router';
-import { examinationQuestions,uploadQuestions } from './examinationQuestions'
+import { examinationQuestions,uploadDisposalNodes,uploadQuestions } from './examinationQuestions'
@@ -2032,17 +2032,13 @@ export class CollectionToolsComponent implements OnInit {
});
}
- //计算差异
+ //选择 考试节点
countValue (e) {
e.stopPropagation()
- let params = {disasterId: this.allFirePlan[0].id || ''}
- this.http.get('/api/DisasterData/Diffs',{params:params}).subscribe(data=>{
- this.canvasData.allNodeMarkers = data
- this.mateFireForce()
- const config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('计算差异完成','确定',config);
+ let data = {treeData: JSON.parse( JSON.stringify(this.treeData) ), oldTreeData: JSON.parse( JSON.stringify(this.canvasData.allDisposalNode) )}
+ let dialogRef = this.dialog.open(uploadDisposalNodes,{data});
+ dialogRef.afterClosed().subscribe(data=>{
+
})
}
diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts
index 03a2a91..00bf2ee 100644
--- a/src/app/ui/collection-tools/examinationQuestions.ts
+++ b/src/app/ui/collection-tools/examinationQuestions.ts
@@ -1,10 +1,11 @@
-import { Component, OnInit, Inject } from '@angular/core';
+import { Component, OnInit, Inject, ViewChild } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import {CanvasShareDataService,DisposalNodeData} from '../../canvas-share-data.service' //引入服务
import { FlatTreeControl } from '@angular/cdk/tree';
import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+import { NzFormatBeforeDropEvent, NzFormatEmitEvent,NzTreeComponent } from 'ng-zorro-antd/tree';
@Component({
selector: 'dialog-examination-questions',
@@ -84,4 +85,32 @@ export class uploadQuestions {
console.log(this.data.question)
}
+}
+
+@Component({
+ selector: 'dialog-disposal-nodes',
+ templateUrl: './uploadDisposalNodes.html',
+ styleUrls: ['./collection-tools.component.scss',]
+})
+export class uploadDisposalNodes {
+
+ constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef
,
+ @Inject(MAT_DIALOG_DATA) public data) {}
+ @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
+
+ ngOnInit(): void {
+ this.treeData = [...this.data.treeData]
+ }
+ treeData:any = []; //tree
+
+ //提交 保存考试节点
+ submit () {
+ let checkList = []
+ this.data.oldTreeData.forEach(element => {
+ let isChecked = (this.nzTreeComponent.getTreeNodeByKey(element.id)).isChecked
+ isChecked? checkList.push(element) : null
+ });
+ console.log(checkList)
+ }
+
}
\ No newline at end of file
diff --git a/src/app/ui/collection-tools/uploadDisposalNodes.html b/src/app/ui/collection-tools/uploadDisposalNodes.html
new file mode 100644
index 0000000..33bd90c
--- /dev/null
+++ b/src/app/ui/collection-tools/uploadDisposalNodes.html
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+