[合并]合并代码

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>([
     [ '消防水池', '消防水池'],

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}">

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;

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

@@ -2063,7 +2063,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);
+      }
     })
   }
 

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

@@ -182,7 +182,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);
+    }
   }
 
 }

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">

src/assets/css/ngZorroTree.css

@@ -350,6 +350,10 @@
 #uploadfiretree .ant-tree .ant-tree-switcher {
   line-height: 20px;
 }
+#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 {
   font-size: 10px;