From 4da00987ea7e7de5bce1f119b0a90b3b6dea004c Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Tue, 9 Nov 2021 15:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/plan/plan.component.html |  9 ++++++---
 src/app/pages/plan/plan.component.scss | 20 ++++++++++++--------
 src/app/pages/plan/plan.component.ts   | 18 +++++++++++++-----
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html
index d626cd2..d872530 100644
--- a/src/app/pages/plan/plan.component.html
+++ b/src/app/pages/plan/plan.component.html
@@ -59,7 +59,7 @@
       <div class="autoScroll"><i nz-icon nzType="right" nzTheme="outline" (click)="bottomScroll(1)"></i></div>
     </div>
     <!-- 底部图标栏 -->
-  
+
     <!-- 右上角快捷栏 -->
     <div class="rightTopFast">
       <div class="publicFast leftFunction">
@@ -73,10 +73,13 @@
         <button title="吸附" (click)="adsorb()" [ngClass]="{'leftFastIsTure': selectAdsorb }"></button>
         <button title="切换至顶视图" (click)="toggleTopLevelView()" [ngClass]="{'leftFastIsTure': topLevelView }"></button>
       </div>
-      <div style="margin: 0 10px;background-color: #0080FF;" title="保存"><button (click)="preserve()"><i nz-icon nzType="save" nzTheme="outline" style="font-size: 20px;"></i></button></div>
+      <div class="save">
+        <button (click)="preserve(false)" title="保存模块"><i nz-icon nzType="file-done" nzTheme="outline"></i></button>
+        <button (click)="preserve(true)" title="保存"><i nz-icon nzType="save" nzTheme="outline"></i></button>
+      </div>
     </div>
     <!-- 右上角快捷栏 -->
-  
+
     <!-- 新增/编辑左侧建筑弹窗 -->
     <nz-modal [(nzVisible)]="addBuildingPop || editBuildingPop" nzTitle="创建/编辑建筑" (nzOnCancel)="addBuildingPop = false; editBuildingPop = null;" (nzOnOk)="addModelBuilding(form.value)" [nzOkDisabled]='name.invalid||modelType.invalid'>
       <form nz-form #form='ngForm'>
diff --git a/src/app/pages/plan/plan.component.scss b/src/app/pages/plan/plan.component.scss
index c98eb3c..789ec7e 100644
--- a/src/app/pages/plan/plan.component.scss
+++ b/src/app/pages/plan/plan.component.scss
@@ -212,27 +212,31 @@
 
 //右上角快捷栏
 .rightTopFast{
-  width: 340px;
+  width: 400px;
   height: 38px;
   position: absolute;
   right: 1px;
   top: 3%;
-  overflow: hidden;
-  box-sizing: border-box;
   display: flex;
   >div { height: 38px; border-radius: 5px; }
   button {
-    width: 36px;
-    height: 36px;
+    width: 38px;
+    height: 38px;
     border: none;
     outline: none;
     background-color: transparent;
     color: #fff;
     cursor: pointer;
+    padding: 0;
+  }
+  .save{
+    margin: 0 10px;
+    button{ background-color: #0080FF; border-radius: 5px; }
+    button:first-child{ margin-right: 10px; }
+    .anticon{ font-size: 20px; line-height: 40px; } //字体图标
   }
   .publicFast {
-    box-sizing: border-box;
-    padding: 1px 3px;
+    padding: 0px 3px;
     background-color: rgba(0,0,0,0.5);
   }
   .leftFast {
@@ -244,7 +248,7 @@
     .leftFastIsTure { border: 1px solid #fff; } //吸附样式
   }
   .leftFunction {
-    margin: 0 10px;
+    margin-right: 10px;
   }
   .selectRightTopFast { border: 1px solid #fff; } //选种样式
 }
\ No newline at end of file
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index 2bd0841..c87e627 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -110,18 +110,20 @@ export class PlanComponent implements OnInit {
       this.isShowChildComponent && this.leftDomain ? this.leftDomain.initComponent(type) : null; //手动初始化子组件
       this.selectFence = type
       this.isShowChildComponent = true
-      type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, true) : null
+      buildingWindow.showJYZInfoModel(fenceType, true)
     } else { //取消选中
       this.selectFence = -1
       this.isShowChildComponent = false
-      type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, false) : null
+      buildingWindow.showJYZInfoModel(fenceType, false)
     }
   }
 
   //获取 头部功能栏Type
   getFenceType(type: number): JYZInfoMoudleType {
     let fenceType
-    if (type === 1) {
+    if (type === 0) {
+      fenceType = JYZInfoMoudleType.JBXX
+    } else if (type === 1) {
       fenceType = JYZInfoMoudleType.JYJ
     } else if (type === 2) {
       fenceType = JYZInfoMoudleType.YG
@@ -133,6 +135,8 @@ export class PlanComponent implements OnInit {
       fenceType = JYZInfoMoudleType.SYG
     } else if (type === 6) {
       fenceType = JYZInfoMoudleType.YQHSGX
+    } else if (type === 7) {
+      fenceType = JYZInfoMoudleType.YJCZ
     }
     return fenceType
   }
@@ -324,8 +328,12 @@ export class PlanComponent implements OnInit {
   }
 
   //保存
-  preserve() {
-    ToolbarWindow.instance.onBtnSave();
+  preserve(type: boolean) {
+    if (type) {
+      ToolbarWindow.instance.onBtnSave();
+    } else {
+      ToolbarWindow.instance.saveShowMoudleData();
+    }
   }
 
   //通用 消息通知栏