Browse Source

[完善] 处置节点保存

master
陈鹏飞 4 years ago
parent
commit
f2554e596c
  1. 3
      src/app/canvas-share-data.service.ts
  2. 2
      src/app/ui/collection-tools/collection-tools.component.html
  3. 7
      src/app/ui/collection-tools/collection-tools.component.scss
  4. 8
      src/app/ui/collection-tools/collection-tools.component.ts
  5. 9
      src/app/ui/collection-tools/examinationQuestions.ts
  6. 2
      src/app/ui/collection-tools/uploadDisposalNodes.html
  7. 3
      src/assets/css/ngZorroTree.css

3
src/app/canvas-share-data.service.ts

@ -8,7 +8,6 @@ import { GameMode } from './working-area/model/gameMode';
export class CanvasShareDataService {
constructor() { }
private _sendMessage: ReplaySubject<any> = new ReplaySubject<any>(1);
GameMode: any;
isChange = false; // 数据 是否改动
@ -29,7 +28,7 @@ export class CanvasShareDataService {
/**
*
*/
gameMode: GameMode = GameMode.BasicInformation;
gameMode: GameMode = GameMode.Assignment;
facilityAssetsName = new Map<string, string>([
[ '消防水池', '消防水池'],

2
src/app/ui/collection-tools/collection-tools.component.html

@ -27,7 +27,7 @@
{{item.name}}
</div>
</div>
<div style="flex: 2%;opacity: 0;" [hidden]="!beforeOneCheckedBuildingIsShow"></div>
<div style="width: 5px;height: 100%;opacity: 0;" [hidden]="!beforeOneCheckedBuildingIsShow"></div>
<div class="centerTotal" [hidden]="!beforeOneCheckedBuildingIsShow">
<div class="everyTotal" (click)="checkedBuilding({name:'总平面图'},-1)" [ngClass]="{'buildingbtnchecked': checkedBuildingIndex==-1}">总平面图</div>
<div class="everyTotal overflowText" *ngFor="let item of allBuildings;let key = index" (click)="checkedBuilding(item,key)"[ngClass]="{'buildingbtnchecked': checkedBuildingIndex==key}">

7
src/app/ui/collection-tools/collection-tools.component.scss

@ -121,10 +121,10 @@
}
.centerBuildingDiv {
position: absolute;
width: 400px;
max-width: 400px;
top: 40px;
left: 240px;
z-index: 119;
z-index: 150;
display: flex;
}
.functionalDomainLeft {
@ -171,8 +171,7 @@
//中间建筑/楼层
.centerTotal {
max-width: 199px;
flex: 49%;
width: 197px;
background-color: #fff;
box-shadow: 0px 0px 5px 3px rgb(165, 163, 163);
border-radius: 5px;

8
src/app/ui/collection-tools/collection-tools.component.ts

@ -2080,7 +2080,13 @@ export class CollectionToolsComponent implements OnInit {
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=>{
if (data) {
sessionStorage.setItem('examNodeList',JSON.stringify(data))
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('节点保存成功','确定',config);
}
})
}

9
src/app/ui/collection-tools/examinationQuestions.ts

@ -96,7 +96,14 @@ export class uploadDisposalNodes {
let isChecked = (this.nzTreeComponent.getTreeNodeByKey(element.id)).isChecked
isChecked? checkList.push(element) : null
});
console.log(checkList)
if (checkList.length) {
this.dialogRef.close(checkList);
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('请选择节点','确定',config);
}
}
}

2
src/app/ui/collection-tools/uploadDisposalNodes.html

@ -1,4 +1,4 @@
<div>
<div id="disposalNodeTree">
<div style="max-height: 500px;overflow-x: hidden;overflow-y: auto;margin-bottom: 25px;width: 330px;padding-right: 10px;">
<nz-tree #nzTreeComponent [nzData]="treeData" nzCheckable nzMultiple [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin">

3
src/assets/css/ngZorroTree.css

@ -347,6 +347,9 @@
#createtestscore,#nodeTree .ant-tree .ant-tree-switcher {
line-height: 22px;
}
#disposalNodeTree .ant-tree-checkbox {
margin-top: 10px;
}
.ant-tree .ant-tree-switcher .ant-select-tree-switcher-icon,
.ant-tree .ant-tree-switcher .ant-tree-switcher-icon {

Loading…
Cancel
Save