Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/plan/plan.component.html

@@ -37,6 +37,10 @@
 
   <!-- 右上角快捷栏 -->
   <div class="rightTopFast">
+    <div class="publicFast leftFunction">
+      <button title="获取设备" (click)="getDevice()">获</button>
+      <button title="清空设备" (click)="clearDevice()">清</button>
+    </div>
     <div class="publicFast leftFast">
       <button title="平移" (click)="translation()" [ngClass]="{'selectRightTopFast': selectRightTopFast == 0}"></button>
       <button title="旋转" (click)="revolve()" [ngClass]="{'selectRightTopFast': selectRightTopFast == 1}"></button>
@@ -44,7 +48,7 @@
       <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 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>
   <!-- 右上角快捷栏 -->
 

src/app/pages/plan/plan.component.scss

@@ -110,11 +110,11 @@
 
 //右上角快捷栏
 .rightTopFast{
-  width: 250px;
+  width: 340px;
   height: 38px;
   position: absolute;
   right: 1px;
-  top: 1%;
+  top: 3%;
   overflow: hidden;
   box-sizing: border-box;
   display: flex;
@@ -130,7 +130,7 @@
   }
   .publicFast {
     box-sizing: border-box;
-    padding: 1px 5px;
+    padding: 1px 3px;
     background-color: rgba(0,0,0,0.5);
   }
   .leftFast {
@@ -141,5 +141,8 @@
     :nth-child(5){ background: url(../../../assets/images/verticalView.png) no-repeat center; }
     .leftFastIsTure { border: 1px solid #fff; } //吸附样式
   }
+  .leftFunction {
+    margin: 0 10px;
+  }
   .selectRightTopFast { border: 1px solid #fff; } //选种样式
 }

src/app/pages/plan/plan.component.ts

@@ -183,6 +183,16 @@ export class PlanComponent implements OnInit {
   selectAdsorb: boolean = false; //吸附状态
   topLevelView: boolean = false; //顶视图状态
 
+  //获取设备
+  getDevice() {
+    ToolbarWindow.instance.getModelAndCreateFacilityData()
+  }
+
+  //清空设备
+  clearDevice() {
+    ToolbarWindow.instance.clearHomeLessFacilityData()
+  }
+
   //平移
   translation() {
     this.selectRightTopFast = 0