Browse Source

[新增]采集工具增加多选按钮

zhuzhou
邵佳豪 4 years ago
parent
commit
714da1862f
  1. 2
      src/app/key-unit/basicinfo/basicinfo.component.ts
  2. 4
      src/app/ui/collection-tools-building/collection-tools.component.html
  3. 3
      src/app/ui/collection-tools-building/collection-tools.component.ts
  4. 3
      src/app/ui/collection-tools-plan/collection-tools.component.html
  5. 3
      src/app/ui/collection-tools-plan/collection-tools.component.ts

2
src/app/key-unit/basicinfo/basicinfo.component.ts

@ -2152,7 +2152,7 @@ export class BasicinfoComponent implements OnInit {
this.snackBar.open('请检查输入数据是否有误','确定',config); this.snackBar.open('请检查输入数据是否有误','确定',config);
}) })
} }
if(item.buildtype == "地铁类"){ if(item.buildtype.indexOf('地铁') != -1){
let newObj = _.cloneDeep(item) let newObj = _.cloneDeep(item)
delete newObj.username delete newObj.username
delete newObj.name delete newObj.name

4
src/app/ui/collection-tools-building/collection-tools.component.html

@ -16,10 +16,12 @@
<button (click)="copyAsset()" class="copytobutn marginLeftRight" mat-button title="复制" style="margin:0 5px;" *ngIf="isEditPattern"> <button (click)="copyAsset()" class="copytobutn marginLeftRight" mat-button title="复制" style="margin:0 5px;" *ngIf="isEditPattern">
复制<mat-icon>library_books</mat-icon> 复制<mat-icon>library_books</mat-icon>
</button> </button>
<button (click)="pasteAsset()" class="copytobutn marginLeftRight" mat-button title="粘贴" *ngIf="isEditPattern"> <button (click)="pasteAsset()" class="copytobutn marginLeftRight" mat-button title="粘贴" *ngIf="isEditPattern">
粘贴<mat-icon>screen_share</mat-icon> 粘贴<mat-icon>screen_share</mat-icon>
</button> </button>
<span class="marginLeftRight">
<mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
</span>
<span title="适应缩放" class="zoom" (click)="adaptZoom()"> <span title="适应缩放" class="zoom" (click)="adaptZoom()">
<img src="/assets/images/适应缩放.png" alt=""> <img src="/assets/images/适应缩放.png" alt="">
适应缩放 适应缩放

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

@ -830,7 +830,8 @@ export class CollectionToolsBuildingComponent implements OnInit {
this.canvas.paste(companyId,buildingId,floorId) this.canvas.paste(companyId,buildingId,floorId)
this.renovateTreeData(false) this.renovateTreeData(false)
} }
isMultiSelect:boolean = false; // 多选/单选 切换
changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) }
basicInfo:boolean = true //基本信息名称显隐 basicInfo:boolean = true //基本信息名称显隐
wantToWork:boolean = true //想定作业名称显隐 wantToWork:boolean = true //想定作业名称显隐
//点击基本信息名称 //点击基本信息名称

3
src/app/ui/collection-tools-plan/collection-tools.component.html

@ -20,6 +20,9 @@
<button (click)="pasteAsset()" class="copytobutn marginLeftRight" mat-button title="粘贴" *ngIf="isEditPattern"> <button (click)="pasteAsset()" class="copytobutn marginLeftRight" mat-button title="粘贴" *ngIf="isEditPattern">
粘贴<mat-icon>screen_share</mat-icon> 粘贴<mat-icon>screen_share</mat-icon>
</button> </button>
<span class="marginLeftRight">
<mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
</span>
<span title="适应缩放" class="zoom" (click)="adaptZoom()"> <span title="适应缩放" class="zoom" (click)="adaptZoom()">
<img src="/assets/images/适应缩放.png" alt=""> <img src="/assets/images/适应缩放.png" alt="">
适应缩放 适应缩放

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

@ -833,7 +833,8 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvas.paste(companyId,buildingId,floorId) this.canvas.paste(companyId,buildingId,floorId)
// this.renovateTreeData(false) // this.renovateTreeData(false)
} }
isMultiSelect:boolean = false; // 多选/单选 切换
changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) }
basicInfo:boolean = true //基本信息名称显隐 basicInfo:boolean = true //基本信息名称显隐
wantToWork:boolean = true //想定作业名称显隐 wantToWork:boolean = true //想定作业名称显隐
//点击基本信息名称 //点击基本信息名称

Loading…
Cancel
Save