shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]更新采集工具文件

dev
邵佳豪 4 years ago
parent
32504a6f56
commit
17cb00bb7d
3 changed files with 318 additions and 263 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/app/ui/collection-tools-plan/collection-tools.component.html
  2. 2
      src/app/ui/collection-tools-plan/collection-tools.component.scss
  3. 564
      src/app/ui/collection-tools-plan/collection-tools.component.ts

5
src/app/ui/collection-tools-plan/collection-tools.component.html
Unescape View File

@ -41,7 +41,7 @@
</div> </div>
<span style="position: absolute;right: 60px;cursor: pointer;"> <span style="position: absolute;right: 60px;cursor: pointer;">
<mat-icon title="查看/编辑模式" (click)="lookpat()" *ngIf="isEditPattern">tv</mat-icon> <mat-icon title="查看/编辑模式" (click)="lookpat()" *ngIf="isEditPattern">tv</mat-icon>
<mat-icon title="查看/编辑模式" (click)="editpat()" *ngIf="!isEditPattern && isxxx">create</mat-icon> <mat-icon title="查看/编辑模式" (click)="editpat()" *ngIf="!isEditPattern && isediticon">create</mat-icon>
<mat-icon *ngIf="isEditPattern " style="margin-left: 12px;" title="保存" (click)="saveSite()">description</mat-icon> <mat-icon *ngIf="isEditPattern " style="margin-left: 12px;" title="保存" (click)="saveSite()">description</mat-icon>
</span> </span>
</div> </div>
@ -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">

2
src/app/ui/collection-tools-plan/collection-tools.component.scss
Unescape View File

@ -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;

564
src/app/ui/collection-tools-plan/collection-tools.component.ts
Unescape View File

@ -149,10 +149,6 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
pattern:boolean = true//默认为基本信息编辑 pattern:boolean = true//默认为基本信息编辑
yyy(){
console.log(this.canvasData.selectPanelPoint)
}
//基本信息编辑模式 //基本信息编辑模式
baseInfo(){ baseInfo(){
if (!this.pattern) { if (!this.pattern) {
@ -223,14 +219,11 @@ export class CollectionToolsPlanComponent implements OnInit {
targetNodeData.forEach(i => { targetNodeData.forEach(i => {
idArr.push(i.id) idArr.push(i.id)
}) })
console.log(6666666666666,event);
if(this.pos == 0 && event.node.origin.children.length == 1){ if(this.pos == 0 && event.node.origin.children.length == 1){
console.log("移入,没有兄弟")
let key = event.dragNode.key let key = event.dragNode.key
orders[key] = 0 orders[key] = 0
parentId = event.node.key parentId = event.node.key
}else{ }else{
console.log("移入,多个兄弟")
let array = [] let array = []
targetNodeData.forEach(item => { targetNodeData.forEach(item => {
if(item.id != event.dragNode.key){ //将拖动项先移除掉 if(item.id != event.dragNode.key){ //将拖动项先移除掉
@ -238,13 +231,10 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
}) })
if(event.dragNode.isEnd[event.dragNode.isEnd.length - 1]){ //如果移入到最后一个 if(event.dragNode.isEnd[event.dragNode.isEnd.length - 1]){ //如果移入到最后一个
console.log("最后")
array.push(event.dragNode.origin) array.push(event.dragNode.origin)
}else if(event.dragNode.isStart[event.dragNode.isStart.length - 1]){//如果移入到第一个 }else if(event.dragNode.isStart[event.dragNode.isStart.length - 1]){//如果移入到第一个
console.log("第一")
array.unshift(event.dragNode.origin) array.unshift(event.dragNode.origin)
}else{//如果移入中间位置 }else{//如果移入中间位置
console.log("中间")
array.splice(event.node.origin.order, 0, event.dragNode.origin) array.splice(event.node.origin.order, 0, event.dragNode.origin)
} }
array.forEach((item,key) => { array.forEach((item,key) => {
@ -580,6 +570,13 @@ export class CollectionToolsPlanComponent 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
} }
} }
@ -614,11 +611,9 @@ export class CollectionToolsPlanComponent implements OnInit {
isSixShow = true isSixShow = true
isSixbtn = true //控制想定作业编辑按钮 isSixbtn = true //控制想定作业编辑按钮
isxxx = true //控制查看编辑模式的编辑模式按钮 isediticon = true //控制查看编辑模式的编辑模式小笔按钮
ngOnInit(): void { ngOnInit(): void {
console.log(this.route,2,this.router.url)
if(this.router.url.indexOf("keyUnit/viewunitinfo") != -1 || this.router.url.indexOf("keyUnit/editplaninfo")!= -1){ if(this.router.url.indexOf("keyUnit/viewunitinfo") != -1 || this.router.url.indexOf("keyUnit/editplaninfo")!= -1){
this.isSixbtn = false this.isSixbtn = false
} }
@ -628,17 +623,22 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
if(!this.isSixbtn && sessionStorage.getItem("six") == "look"){ if(!this.isSixbtn && sessionStorage.getItem("six") == "look"){
this.isEditPattern = false this.isEditPattern = false
this.isxxx = false this.isediticon = false
}
//gis模块平面图
if(this.router.url.indexOf("gis") != -1 && sessionStorage.getItem("gisplan") == "look"){
this.isEditPattern = false
this.isediticon = false
this.canvasData.gameMode = GameMode.Assignment
} else {
this.getAllLibrary() //获取素材库
this.getAllBuildings() //获取所有建筑
} }
this.getAllLibrary() //获取素材库
this.getAllBuildings() //获取所有建筑
// this.getAllFirePlan() //获取当前单位灾情
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();
}; };
@ -654,7 +654,10 @@ export class CollectionToolsPlanComponent implements OnInit {
ngAfterViewInit(): void { ngAfterViewInit(): void {
this.getSitePlan() //gis模块平面图
if(this.router.url.indexOf("gis") == -1) {
this.getSitePlan()
}
// 监听canvas组件选中素材事件 // 监听canvas组件选中素材事件
this.canvas.on("select",obj=>{ this.canvas.on("select",obj=>{
//选中素材属性注入函数 //选中素材属性注入函数
@ -723,268 +726,276 @@ export class CollectionToolsPlanComponent implements OnInit {
//保存平面图 //保存平面图
saveNum :any = [] saveNum :any = []
saveSite(){ saveSite(){
console.log(this.beforeOneCheckedBuilding) if (this.selectingSitePlan && this.selectingSitePlan.id) {
this.saveNum = []
let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData)); this.saveNum = []
SitePlanData.data = JSON.stringify(SitePlanData.data) let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData)); SitePlanData.data = JSON.stringify(SitePlanData.data)
CompanyData.data = JSON.stringify(CompanyData.data) let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
CompanyData.data = JSON.stringify(CompanyData.data)
let object = this.canvasData.originalcompanyBuildingData.data
let adjoinArr = [] //毗邻数组 let object = this.canvasData.originalcompanyBuildingData.data
let adjoinArr = [] //毗邻数组
if(this.pattern){//如果是基本信息编辑模式
for (const key in object) { if(this.pattern){//如果是基本信息编辑模式
if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻 for (const key in object) {
if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻
object[key].PropertyInfos.forEach(element => {
if(element.PropertyName == "方向"){ object[key].PropertyInfos.forEach(element => {
adjoinArr.push(element.PropertyValue) if(element.PropertyName == "方向"){
} 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';
config.duration = 3000
this.canvasData.isChange = true
this.snackBar.open('单位消防设施素材保存失败','确定',config);
})
}else{ //如果是建筑 }else{ //如果是建筑
//建筑平面图数据 //建筑平面图数据
this.http.post("/api/BuildingAreaData",SitePlanData,{ this.http.post("/api/BuildingAreaData",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/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(saveOneDialogPlan, {
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(saveOneDialogPlan, {
data: {allDisposalNode: this.canvasData.allDisposalNode,
selectedBuildingData:this.beforeOneCheckedBuilding,
selectedSiteData:this.selectingSitePlan,
siteOrbuilding:this.checkedBuildingIndex,
disasterId: this.allFirePlan[0].id || ''
}
});
dialogRef.afterClosed().subscribe(result => { } else { //if
console.log('The dialog was closed'); const config = new MatSnackBarConfig();
}); config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('暂无楼层数据','确定',config);
} }
} }
@ -1033,14 +1044,40 @@ export class CollectionToolsPlanComponent 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
} }
//编辑建筑 //编辑建筑
@ -1206,8 +1243,23 @@ export class CollectionToolsPlanComponent 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 = []
@ -1456,8 +1508,11 @@ export class CollectionToolsPlanComponent 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)
} }
} }
@ -1632,6 +1687,7 @@ export class CollectionToolsPlanComponent 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) //获取 平面图 楼层数据
@ -1779,7 +1835,7 @@ export class CollectionToolsPlanComponent implements OnInit {
}); });
this.allLibrary = data this.allLibrary = data
this.selectImageIndex = -1 this.selectImageIndex = -1
this.canvas.cancelPaint() // this.canvas.cancelPaint()
}) })
} }

Write Preview
Loading…
Cancel
Save