Browse Source

UI完善

dev
陈鹏飞 3 years ago
parent
commit
e1c629c632
  1. 11
      src/app/pages/plan/plan.component.html
  2. 1
      src/app/pages/plan/plan.component.scss
  3. 2
      src/app/pages/plan/plan.component.ts
  4. BIN
      src/assets/images/save3DPlan.png
  5. BIN
      src/assets/images/selectHeightFinding.png
  6. BIN
      src/assets/images/selectMeasuredArea.png
  7. BIN
      src/assets/images/selectRangeFinding.png

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

@ -13,9 +13,12 @@
<div class="rightFence"> <div class="rightFence">
<img src="../../../assets/images/awningShow.png" [hidden]="!isOpenAwning" (click)="toggleHeaderAwning(false)"> <img src="../../../assets/images/awningShow.png" [hidden]="!isOpenAwning" (click)="toggleHeaderAwning(false)">
<img src="../../../assets/images/awningHide.png" [hidden]="isOpenAwning" (click)="toggleHeaderAwning(true)"> <img src="../../../assets/images/awningHide.png" [hidden]="isOpenAwning" (click)="toggleHeaderAwning(true)">
<img src="../../../assets/images/rangeFinding.png" title="测量距离" (click)="toggleMeasure(1)" [ngClass]="{'selectRightTopFast': selectMeasure == 1}"> <img src="../../../assets/images/rangeFinding.png" title="测量距离" [hidden]="selectMeasure === 1" (click)="toggleMeasure(1)">
<img src="../../../assets/images/heightFinding.png" title="测量高度" (click)="toggleMeasure(2)" [ngClass]="{'selectRightTopFast': selectMeasure == 2}"> <img src="../../../assets/images/selectRangeFinding.png" title="测量距离" [hidden]="selectMeasure != 1" (click)="toggleMeasure(1)">
<img src="../../../assets/images/measuredArea.png" title="测量面积" (click)="toggleMeasure(3)" [ngClass]="{'selectRightTopFast': selectMeasure == 3}"> <img src="../../../assets/images/heightFinding.png" title="测量高度" [hidden]="selectMeasure === 2" (click)="toggleMeasure(2)">
<img src="../../../assets/images/selectHeightFinding.png" title="测量高度" [hidden]="selectMeasure != 2" (click)="toggleMeasure(2)">
<img src="../../../assets/images/measuredArea.png" title="测量面积" [hidden]="selectMeasure === 3" (click)="toggleMeasure(3)">
<img src="../../../assets/images/selectMeasuredArea.png" title="测量面积" [hidden]="selectMeasure != 3" (click)="toggleMeasure(3)">
</div> </div>
</div> </div>
@ -143,7 +146,7 @@
</div> </div>
<div class="save" *ngIf="editMode"> <div class="save" *ngIf="editMode">
<button (click)="preserve(false)" title="保存模块" *ngIf="userMode"><i nz-icon nzType="file-done" nzTheme="outline"></i></button> <button (click)="preserve(false)" title="保存模块" *ngIf="userMode"><i nz-icon nzType="file-done" nzTheme="outline"></i></button>
<button (click)="preserve(true)" title="保存"><i nz-icon nzType="save" nzTheme="outline"></i></button> <img src="../../../assets/images/save3DPlan.png" (click)="preserve(true)" title="保存">
</div> </div>
</div> </div>
<!-- 右上角快捷栏 --> <!-- 右上角快捷栏 -->

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

@ -294,6 +294,7 @@
button{ background-color: #0080FF; border-radius: 5px; } button{ background-color: #0080FF; border-radius: 5px; }
button:first-child{ margin-right: 10px; } button:first-child{ margin-right: 10px; }
.anticon{ font-size: 20px; line-height: 40px; } //字体图标 .anticon{ font-size: 20px; line-height: 40px; } //字体图标
img { cursor: pointer; width: 38px; height: 38px; }
} }
.publicFast { .publicFast {
padding: 0px 3px; padding: 0px 3px;

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

@ -481,6 +481,7 @@ export class PlanComponent implements OnInit {
selectChildNode(item: MarkPlanData) { selectChildNode(item: MarkPlanData) {
if (item.nodes.length) { if (item.nodes.length) {
this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器
this.isSuspend = false
this.nzCurrent = 0 this.nzCurrent = 0
this.beforeEmergencyPlan = item this.beforeEmergencyPlan = item
this.updateProgressList().then(res => { this.updateProgressList().then(res => {
@ -593,6 +594,7 @@ export class PlanComponent implements OnInit {
} }
this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器
this.updateProgressList().then(res => { this.updateProgressList().then(res => {
this.isSuspend = false
this.nzCurrent = 0 this.nzCurrent = 0
this.publicToggleNode() this.publicToggleNode()
}) })

BIN
src/assets/images/save3DPlan.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/assets/images/selectHeightFinding.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/assets/images/selectMeasuredArea.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/assets/images/selectRangeFinding.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Loading…
Cancel
Save