Browse Source

[更新]更新编制工具文件

dev
邵佳豪 4 years ago
parent
commit
32504a6f56
  1. 5
      src/app/ui/collection-tools/collection-tools.component.html
  2. 2
      src/app/ui/collection-tools/collection-tools.component.scss
  3. 539
      src/app/ui/collection-tools/collection-tools.component.ts

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

@ -135,8 +135,7 @@
</div> </div>
<div [hidden]="!togglePlane" > <div [hidden]="!togglePlane" >
<div class="sitePlanContent" *ngFor="let item of sitePlanData;let key = index" [ngClass]="{'isRefugeStorey':item.isRefugeStorey==true,'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'> <div class="sitePlanContent" *ngFor="let item of sitePlanData;let key = index" [ngClass]="{'isRefugeStorey':item.isRefugeStorey==true,'selectSitePlan': selectSitePlanIndex==key}" (click)='selectSitePlan(item,key)'>
<mat-icon *ngIf="!item.imageUrl" class="matIcons">broken_image</mat-icon> <label class="overflowText" style="display:inline-block; max-width: 160px;"><mat-icon *ngIf="!item.imageUrl" class="matIcons">broken_image</mat-icon>{{item.name}}</label>
<label class="overflowText">{{item.name}}</label>
<a href="javascript:;" class="fireForce" *ngIf="isEditPattern && !pattern"> <a href="javascript:;" class="fireForce" *ngIf="isEditPattern && !pattern">
<img src="../../../assets/images/fire.png" *ngIf="item.fire && item.fire==2"> <img src="../../../assets/images/fire.png" *ngIf="item.fire && item.fire==2">
<img src="../../../assets/images/noFire.png" *ngIf="item.fire && item.fire==1"> <img src="../../../assets/images/noFire.png" *ngIf="item.fire && item.fire==1">
@ -218,7 +217,7 @@
<ng-template #nzTreeTemplate let-node let-origin="origin"> <ng-template #nzTreeTemplate let-node let-origin="origin">
<div id="terrNodePublic" (click)='selectanelPoint(node.origin)' [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}"> <div id="terrNodePublic" (click)='selectanelPoint(node.origin)' [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}">
<label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label> <label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label>
<div class="planIconDiv" *ngIf="isEditPattern"> <div class="scoreDiv" *ngIf="isEditPattern">
<mat-icon *ngIf="!node.origin.sitePlanId && !node.origin.buildingAreaId" (click)='editPanelPoint($event,node)'>edit</mat-icon> <mat-icon *ngIf="!node.origin.sitePlanId && !node.origin.buildingAreaId" (click)='editPanelPoint($event,node)'>edit</mat-icon>
<mat-icon *ngIf="node.level===0" (click)='addPanelPoint($event,node.origin,null)'>add</mat-icon> <mat-icon *ngIf="node.level===0" (click)='addPanelPoint($event,node.origin,null)'>add</mat-icon>
<mat-icon *ngIf="!node.origin.sitePlanId && !node.origin.buildingAreaId" (click)='copyPanelPoint($event,node,treeData)'>library_books</mat-icon> <mat-icon *ngIf="!node.origin.sitePlanId && !node.origin.buildingAreaId" (click)='copyPanelPoint($event,node,treeData)'>library_books</mat-icon>

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

@ -4,7 +4,7 @@
} }
.content { .content {
width: 100%; width: 100%;
height: 93%; height: 100%;
overflow: hidden; overflow: hidden;
box-sizing: border-box; box-sizing: border-box;
padding: 1px; padding: 1px;

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

@ -587,6 +587,13 @@ export class CollectionToolsComponent implements OnInit {
this.gallery.update() this.gallery.update()
}, 0); }, 0);
//将上传的input框显示出来
this.isImgNumCss = true;
//清除图片缓存
if((<HTMLInputElement>document.getElementById('inputimg'))){
(<HTMLInputElement>document.getElementById('inputimg')).value = null //清空input框缓存
}
this.canvasData.isChange = true this.canvasData.isChange = true
} }
} }
@ -649,7 +656,7 @@ export class CollectionToolsComponent implements OnInit {
let that = this let that = this
window.setTimeout(()=>{ window.setTimeout(()=>{
document.getElementById("functionalDomainContent").oncontextmenu = function (event) { document.getElementById("functionalDomainContent").oncontextmenu = function (event) {
that.canvas.cancelPaint() // that.canvas.cancelPaint()
that.selectImageIndex = -1 that.selectImageIndex = -1
event.preventDefault(); event.preventDefault();
}; };
@ -736,268 +743,275 @@ export class CollectionToolsComponent implements OnInit {
//保存平面图 //保存平面图
saveNum :any = [] saveNum :any = []
saveSite(){ saveSite(){
console.log(this.beforeOneCheckedBuilding) if (this.selectingSitePlan && this.selectingSitePlan.id) {
this.saveNum = [] this.saveNum = []
let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData)); let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
SitePlanData.data = JSON.stringify(SitePlanData.data) SitePlanData.data = JSON.stringify(SitePlanData.data)
let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData)); let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
CompanyData.data = JSON.stringify(CompanyData.data) CompanyData.data = JSON.stringify(CompanyData.data)
let object = this.canvasData.originalcompanyBuildingData.data let object = this.canvasData.originalcompanyBuildingData.data
let adjoinArr = [] //毗邻数组 let adjoinArr = [] //毗邻数组
if(this.pattern){//如果是基本信息编辑模式 if(this.pattern){//如果是基本信息编辑模式
for (const key in object) { for (const key in object) {
if (object[key].Name == "毗邻") {//如果是相同楼层,则筛选出毗邻 if (object[key].Name == "毗邻") {//如果是相同楼层,则筛选出毗邻
object[key].PropertyInfos.forEach(element => { object[key].PropertyInfos.forEach(element => {
if(element.PropertyName == "方向"){ if(element.PropertyName == "方向"){
adjoinArr.push(element.PropertyValue) adjoinArr.push(element.PropertyValue)
} }
}); });
}
} }
}
if((new Set(adjoinArr)).size != adjoinArr.length){
if((new Set(adjoinArr)).size != adjoinArr.length){ let config = new MatSnackBarConfig();
let config = new MatSnackBarConfig(); config.verticalPosition = 'top';
config.verticalPosition = 'top'; config.duration = 3000
config.duration = 3000 this.snackBar.open('保存失败,毗邻存在相同方向','确定',config);
this.snackBar.open('保存失败,毗邻存在相同方向','确定',config); return false
return false }else{
}else{ //如果是单位 总平面图
//如果是单位 总平面图 if(this.checkedBuildingIndex==-1){
if(this.checkedBuildingIndex==-1){ //保存平面图数据
//保存平面图数据 this.http.post("/api/SitePlanData",SitePlanData,{
this.http.post("/api/SitePlanData",SitePlanData,{ params:{
params:{ companyId:this.params.companyId
companyId:this.params.companyId }
} }).subscribe(data => {
}).subscribe(data => { this.saveNum.push("1")
this.saveNum.push("1") if(this.saveNum.length == 5){
if(this.saveNum.length == 5){ this.canvasData.isChange = false
this.canvasData.isChange = false let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('保存成功','确定',config);
}
},err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('平面图数据保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; //保存建筑数据
config.duration = 3000 this.http.post("/api/CompanyData",CompanyData,{
this.canvasData.isChange = true params:{
this.snackBar.open('平面图数据保存失败','确定',config); companyId:this.params.companyId
}) }
}).subscribe(data => {
//保存建筑数据 this.saveNum.push("1")
this.http.post("/api/CompanyData",CompanyData,{ if(this.saveNum.length == 5){
params:{ this.canvasData.isChange = false
companyId:this.params.companyId let config = new MatSnackBarConfig();
} config.verticalPosition = 'top';
}).subscribe(data => { config.duration = 3000
this.saveNum.push("1") this.snackBar.open('保存成功','确定',config);
if(this.saveNum.length == 5){ }
this.canvasData.isChange = false },err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('单位数据保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; //批量保存单位毗邻
config.duration = 3000 let CompanyAdjoins = this.canvasData.getCompanyAdjoinInfo()
this.canvasData.isChange = true this.http.post("/api/CompanyAdjoins/Batch",CompanyAdjoins,{
this.snackBar.open('单位数据保存失败','确定',config); params:{
}) companyId:this.params.companyId
}
//批量保存单位毗邻 }).subscribe(data => {
let CompanyAdjoins = this.canvasData.getCompanyAdjoinInfo() this.saveNum.push("1")
this.http.post("/api/CompanyAdjoins/Batch",CompanyAdjoins,{ if(this.saveNum.length == 5){
params:{ this.canvasData.isChange = false
companyId:this.params.companyId let config = new MatSnackBarConfig();
} config.verticalPosition = 'top';
}).subscribe(data => { config.duration = 3000
this.saveNum.push("1") this.snackBar.open('保存成功','确定',config);
if(this.saveNum.length == 5){ }
this.canvasData.isChange = false },err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('单位毗邻保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; //批量保存单位重点部位
config.duration = 3000 let CompanyImportantLocations = this.canvasData.getCompanyImportantLocations()
this.canvasData.isChange = true this.http.post("/api/CompanyImportantLocations/Batch",CompanyImportantLocations,{
this.snackBar.open('单位毗邻保存失败','确定',config); params:{
}) companyId:this.params.companyId
}
//批量保存单位重点部位 }).subscribe(data => {
let CompanyImportantLocations = this.canvasData.getCompanyImportantLocations() this.saveNum.push("1")
this.http.post("/api/CompanyImportantLocations/Batch",CompanyImportantLocations,{ if(this.saveNum.length == 5){
params:{ this.canvasData.isChange = false
companyId:this.params.companyId let config = new MatSnackBarConfig();
} config.verticalPosition = 'top';
}).subscribe(data => { config.duration = 3000
this.saveNum.push("1") this.snackBar.open('保存成功','确定',config);
if(this.saveNum.length == 5){ }
this.canvasData.isChange = false },err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('单位重点部位保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; //批量保存单位消防设施素材
config.duration = 3000 let CompanyFacilityAssets = this.canvasData.getAllCompanyFacilityAssetInfo()
this.canvasData.isChange = true this.http.post("/api/CompanyFacilityAssets/Batch",CompanyFacilityAssets,{
this.snackBar.open('单位重点部位保存失败','确定',config); params:{
}) companyId:this.params.companyId
}
//批量保存单位消防设施素材 }).subscribe(data => {
let CompanyFacilityAssets = this.canvasData.getAllCompanyFacilityAssetInfo() this.saveNum.push("1")
this.http.post("/api/CompanyFacilityAssets/Batch",CompanyFacilityAssets,{ if(this.saveNum.length == 5){
params:{ this.canvasData.isChange = false
companyId:this.params.companyId let config = new MatSnackBarConfig();
} config.verticalPosition = 'top';
}).subscribe(data => { config.duration = 3000
this.saveNum.push("1") this.snackBar.open('保存成功','确定',config);
if(this.saveNum.length == 5){ }
this.canvasData.isChange = false },err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('单位消防设施素材保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; }else{ //如果是建筑
config.duration = 3000
this.canvasData.isChange = true //建筑平面图数据
this.snackBar.open('单位消防设施素材保存失败','确定',config); this.http.post("/api/BuildingAreaData",SitePlanData,{
}) params:{
companyId:this.params.companyId
}else{ //如果是建筑 }
}).subscribe(data => {
//建筑平面图数据 this.saveNum.push("1")
this.http.post("/api/BuildingAreaData",SitePlanData,{ if(this.saveNum.length == 5){
params:{ this.canvasData.isChange = false
companyId:this.params.companyId let config = new MatSnackBarConfig();
} config.verticalPosition = 'top';
}).subscribe(data => { config.duration = 3000
this.saveNum.push("1") this.snackBar.open('保存成功','确定',config);
if(this.saveNum.length == 5){ }
this.canvasData.isChange = false },err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('平面图数据保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; //建筑数据
config.duration = 3000 this.http.post("/api/BuildingData",CompanyData,{
this.canvasData.isChange = true params:{
this.snackBar.open('平面图数据保存失败','确定',config); companyId:this.params.companyId
}) }
}).subscribe(data => {
//建筑数据 this.saveNum.push("1")
this.http.post("/api/BuildingData",CompanyData,{ if(this.saveNum.length == 5){
params:{ this.canvasData.isChange = false
companyId:this.params.companyId let config = new MatSnackBarConfig();
} config.verticalPosition = 'top';
}).subscribe(data => { config.duration = 3000
this.saveNum.push("1") this.snackBar.open('保存成功','确定',config);
if(this.saveNum.length == 5){ }
this.canvasData.isChange = false },err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('单位数据保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; //批量保存建筑毗邻
config.duration = 3000 let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo()
this.canvasData.isChange = true this.http.post(`/api/BuildingAdjoins/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`,buildingAdjoins).subscribe(data => {
this.snackBar.open('单位数据保存失败','确定',config); this.saveNum.push("1")
}) if(this.saveNum.length == 5){
this.canvasData.isChange = false
//批量保存建筑毗邻 let config = new MatSnackBarConfig();
let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo() config.verticalPosition = 'top';
this.http.post(`/api/BuildingAdjoins/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`,buildingAdjoins).subscribe(data => { config.duration = 3000
this.saveNum.push("1") this.snackBar.open('保存成功','确定',config);
if(this.saveNum.length == 5){ }
this.canvasData.isChange = false },err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('建筑毗邻保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; //批量保存建筑重点部位
config.duration = 3000 let buildingImportantLocations = this.canvasData.getBuildingImportantLocations()
this.canvasData.isChange = true this.http.post(`/api/BuildingImportantLocations/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`,buildingImportantLocations).subscribe(data => {
this.snackBar.open('建筑毗邻保存失败','确定',config); this.saveNum.push("1")
}) if(this.saveNum.length == 5){
this.canvasData.isChange = false
//批量保存建筑重点部位 let config = new MatSnackBarConfig();
let buildingImportantLocations = this.canvasData.getBuildingImportantLocations() config.verticalPosition = 'top';
this.http.post(`/api/BuildingImportantLocations/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`,buildingImportantLocations).subscribe(data => { config.duration = 3000
this.saveNum.push("1") this.snackBar.open('保存成功','确定',config);
if(this.saveNum.length == 5){ }
this.canvasData.isChange = false },err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('建筑重点部位保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; //批量保存建筑消防设施素材
config.duration = 3000 let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
this.canvasData.isChange = true this.http.post(`/api/BuildingFacilityAssets/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`,buildingFacilityAssets).subscribe(data => {
this.snackBar.open('建筑重点部位保存失败','确定',config); this.saveNum.push("1")
}) if(this.saveNum.length == 5){
this.canvasData.isChange = false
//批量保存建筑消防设施素材 let config = new MatSnackBarConfig();
let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo() config.verticalPosition = 'top';
this.http.post(`/api/BuildingFacilityAssets/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`,buildingFacilityAssets).subscribe(data => { config.duration = 3000
this.saveNum.push("1") this.snackBar.open('保存成功','确定',config);
if(this.saveNum.length == 5){ }
this.canvasData.isChange = false },err=>{
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('保存成功','确定',config); this.canvasData.isChange = true
} this.snackBar.open('建筑消防设施素材保存失败','确定',config);
},err=>{ })
let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; }
config.duration = 3000
this.canvasData.isChange = true
this.snackBar.open('建筑消防设施素材保存失败','确定',config);
})
} }
}else{//如果是想定作业编辑模式
const dialogRef = this.dialog.open(saveOneDialog, {
data: {allDisposalNode: this.canvasData.allDisposalNode,
selectedBuildingData:this.beforeOneCheckedBuilding,
selectedSiteData:this.selectingSitePlan,
siteOrbuilding:this.checkedBuildingIndex,
disasterId: this.allFirePlan[0].id || ''
}
});
dialogRef.afterClosed().subscribe(result => {
console.log('The dialog was closed');
});
} }
}else{//如果是想定作业编辑模式
const dialogRef = this.dialog.open(saveOneDialog, { } else { //if
data: {allDisposalNode: this.canvasData.allDisposalNode, const config = new MatSnackBarConfig();
selectedBuildingData:this.beforeOneCheckedBuilding, config.verticalPosition = 'top';
selectedSiteData:this.selectingSitePlan, config.duration = 3000
siteOrbuilding:this.checkedBuildingIndex, this.snackBar.open('暂无楼层数据','确定',config);
disasterId: this.allFirePlan[0].id || ''
}
});
dialogRef.afterClosed().subscribe(result => {
console.log('The dialog was closed');
});
} }
} }
@ -1046,14 +1060,40 @@ export class CollectionToolsComponent implements OnInit {
//选择建筑 //选择建筑
checkedBuilding(item,index){ checkedBuilding(item,index){
if (this.checkedBuildingIndex!=index) { if (this.checkedBuildingIndex!=index) {
this.beforeOneCheckedBuilding = item
this.checkedBuildingIndex = index if (this.canvasData.isChange) { //true 数据被改动
if (index==-1) { //总平面图数据 let isTrue = confirm('是否保存当前编辑数据')
this.getSitePlan() if (isTrue) { //先保存数据 在切换
} else { //建筑楼层/区域数据 let isSuccess = this.saveSite()//true的时候 先保存数据
this.getBuildingSitePlan(item) if (isSuccess != false) {
} this.beforeOneCheckedBuilding = item
} this.checkedBuildingIndex = index
if (index==-1) { //总平面图数据
this.getSitePlan()
} else { //建筑楼层/区域数据
this.getBuildingSitePlan(item)
}
}
} else {
this.beforeOneCheckedBuilding = item
this.checkedBuildingIndex = index
if (index==-1) { //总平面图数据
this.getSitePlan()
} else { //建筑楼层/区域数据
this.getBuildingSitePlan(item)
}
}
} else { //flase 数据未被改动
this.beforeOneCheckedBuilding = item
this.checkedBuildingIndex = index
if (index==-1) { //总平面图数据
this.getSitePlan()
} else { //建筑楼层/区域数据
this.getBuildingSitePlan(item)
}
} //if
} //if
} }
//编辑建筑 //编辑建筑
@ -1219,8 +1259,23 @@ export class CollectionToolsComponent implements OnInit {
     }      }
const nodes = this.treeControl.dataNodes;
const expandNodes = [];
nodes.forEach((item) => {
if(item.expandable && this.treeControl.isExpanded(item)){
expandNodes.push(item.id);
}
});
this.dataSource.data = [...this.dataSource.data] this.dataSource.data = [...this.dataSource.data]
this.treeControl.expandAll()
let newNodes = this.treeControl.dataNodes;
newNodes = newNodes.filter(n => {
return expandNodes.indexOf(n.id) >= 0;
});
newNodes.forEach(item => {
this.treeControl.expand(item);
});
//canvas上的素材显隐 //canvas上的素材显隐
let iconVisibleArr:any = [] let iconVisibleArr:any = []
@ -1468,8 +1523,11 @@ export class CollectionToolsComponent implements OnInit {
this.canvasData.selectStorey = item //服务中 存一份数据 this.canvasData.selectStorey = item //服务中 存一份数据
if (this.checkedBuildingIndex==-1) { //总平面图时 if (this.checkedBuildingIndex==-1) { //总平面图时
this.getSitePlanStorey(item) //获取 平面图 楼层数据 this.getSitePlanStorey(item) //获取 平面图 楼层数据
this.getSitePlanCompanyData()
} else { //楼层/区域时 } else { //楼层/区域时
this.getBuildingStorey(item) //获取 建筑 楼层数据 this.getBuildingStorey(item) //获取 建筑 楼层数据
let params = { buildingId: this.beforeOneCheckedBuilding.id }
this.getBuildingData(params)
} }
} }
@ -1644,6 +1702,7 @@ export class CollectionToolsComponent implements OnInit {
this.selectingSitePlan = this.sitePlanData[0] || {} this.selectingSitePlan = this.sitePlanData[0] || {}
this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据 this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
this.selectSitePlanIndex = 0 this.selectSitePlanIndex = 0
this.canvasData.isChange = false
if (isCompany===-1) { if (isCompany===-1) {
this.http.post("/api/CompanyData",newData).subscribe(data => {}) this.http.post("/api/CompanyData",newData).subscribe(data => {})
this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
@ -1791,7 +1850,7 @@ export class CollectionToolsComponent implements OnInit {
}); });
this.allLibrary = data this.allLibrary = data
this.selectImageIndex = -1 this.selectImageIndex = -1
this.canvas.cancelPaint() // this.canvas.cancelPaint()
}) })
} }

Loading…
Cancel
Save