Browse Source

[完善] 多选, 自定义处置预案底图角度 完善

zhuzhou
陈鹏飞 4 years ago
parent
commit
315cbba541
  1. 1
      src/app/canvas-share-data.service.ts
  2. 8
      src/app/ui/collection-tools-building/collection-tools.component.ts
  3. 8
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  4. 2
      src/app/ui/collection-tools/collection-tools.component.html
  5. 11
      src/app/ui/collection-tools/collection-tools.component.ts

1
src/app/canvas-share-data.service.ts

@ -20,7 +20,6 @@ export class CanvasShareDataService {
isChange:boolean = false; // 数据 是否改动
selectTemplateData:any; // 选择当前 模板数据
isMultiSelect:boolean = false; // 单选/多选 模板图标
// 总平面图/建筑 楼层
selectStorey: any = {area: '', details: ''}; // 选择当前 楼层 数据

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

@ -1806,14 +1806,14 @@ export class CollectionToolsBuildingComponent implements OnInit {
this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{
let isSuccess = this.renovateSitePlan()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
})
} else { //楼层/区域
this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{
let isSuccess = this.renovateBuilding()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
})
}
@ -1957,7 +1957,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{
let isSuccess = this.renovateSitePlan()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@ -1968,7 +1968,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{
let isSuccess = this.renovateBuilding()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';

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

@ -1816,14 +1816,14 @@ export class CollectionToolsPlanComponent implements OnInit {
this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{
let isSuccess = this.renovateSitePlan()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
})
} else { //楼层/区域
this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{
let isSuccess = this.renovateBuilding()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
})
}
@ -1967,7 +1967,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{
let isSuccess = this.renovateSitePlan()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@ -1978,7 +1978,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{
let isSuccess = this.renovateBuilding()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';

2
src/app/ui/collection-tools/collection-tools.component.html

@ -15,7 +15,7 @@
</span>
<span class="marginLeftRight">
<mat-checkbox color="primary" [(ngModel)]="canvasData.isMultiSelect"></mat-checkbox> 多选
<mat-checkbox color="primary" [(ngModel)]="isMultiSelect" (change)='changeMultiSelect($event)'></mat-checkbox> 多选
</span>
<span class="marginLeftRight">
<mat-checkbox color="primary" [(ngModel)]="isShowLegend" (change)='changeLegend($event)' [disabled]='this.canvasData.selectPanelPoint.BackgroundImageUrl'></mat-checkbox> 显示图例

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

@ -1569,6 +1569,8 @@ export class CollectionToolsComponent implements OnInit {
beforeOneCheckedBuildingIsShow:boolean = false; //想定作业下 建筑是否显示
togglebeforeOneCheckedBuilding () { this.beforeOneCheckedBuildingIsShow = !this.beforeOneCheckedBuildingIsShow }
isMultiSelect:boolean = false; // 多选/单选 切换
changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) }
isShowLegend:boolean = true; //图例是否显示
changeLegend (e) { this.canvasData.selectPanelPoint.BackgroundImageUrl? null : this.canvas.setLegendVisible(this.isShowLegend) }
@ -1842,14 +1844,14 @@ export class CollectionToolsComponent implements OnInit {
this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{
let isSuccess = this.renovateSitePlan()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
})
} else { //楼层/区域
this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{
let isSuccess = this.renovateBuilding()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
})
}
@ -1993,7 +1995,7 @@ export class CollectionToolsComponent implements OnInit {
this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{
let isSuccess = this.renovateSitePlan()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@ -2004,7 +2006,7 @@ export class CollectionToolsComponent implements OnInit {
this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{
let isSuccess = this.renovateBuilding()
isSuccess.then(res=>{
this.canvas.refreshBackgroundImage()
this.canvas.refreshBackgroundImage(item.imageUrl,item.imageAngle)
})
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@ -2399,6 +2401,7 @@ export class CollectionToolsComponent implements OnInit {
//自定义数据节点 时
async customizeNodes() {
this.canvasData.selectPanelPoint.BackgroundImageAngle = 0
await this.canvas.loadNoRelevantInformationDisposalPlan(this.canvasData.selectPanelPoint)
let other = {
children: [],

Loading…
Cancel
Save