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

Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

tangshan
陈敬瑜 3 years ago
parent
acb3584008 a1d2355e9f
commit
b335a4e6e9
4 changed files with 79 additions and 199 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. 4
      src/app/ui/collection-tools-plan/addPlaneFigure.html
  2. 132
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  3. 14
      src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
  4. 2
      src/app/working-area/working-area.component.ts

4
src/app/ui/collection-tools-plan/addPlaneFigure.html
Unescape View File

@ -12,9 +12,9 @@
</mat-form-field> </mat-form-field>
</div> </div>
<!-- <div class="keyMargin"> <div class="keyMargin">
<a href="javascript:;" class="uploadBackGround" (click)='toGIS()' [ngClass]="{'uploadBackGroundSelected': selectedType == 'gis'}">导入GIS地图</a> <a href="javascript:;" class="uploadBackGround" (click)='toGIS()' [ngClass]="{'uploadBackGroundSelected': selectedType == 'gis'}">导入GIS地图</a>
</div> --> </div>
<div class="keyMargin"> <div class="keyMargin">
<a href="javascript:;" class="uploadBackGround" [ngClass]="{'uploadBackGroundSelected': selectedType == 'image'}"> <a href="javascript:;" class="uploadBackGround" [ngClass]="{'uploadBackGroundSelected': selectedType == 'image'}">

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

@ -811,6 +811,7 @@ export class CollectionToolsPlanComponent implements OnInit {
//遍历 建筑数据 删除多余数据 //遍历 建筑数据 删除多余数据
let object = this.canvasData.originalcompanyBuildingData.data let object = this.canvasData.originalcompanyBuildingData.data
let adjoinArr = [] //毗邻数组 let adjoinArr = [] //毗邻数组
console.log('平面图数据',this.sitePlanData)
Object.keys(object).forEach(key => { Object.keys(object).forEach(key => {
let isExist = this.sitePlanData.find(item => { return item.id === object[key].FloorId }) let isExist = this.sitePlanData.find(item => { return item.id === object[key].FloorId })
if (isExist === undefined) { if (isExist === undefined) {
@ -818,7 +819,7 @@ export class CollectionToolsPlanComponent implements OnInit {
delete object[key] delete object[key]
} }
}) })
//遍历 建筑数据 删除多余数据 //遍历 楼层数据 删除多余数据
this.saveNum = [] this.saveNum = []
let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData)); let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
for (const key in SitePlanData.data) { for (const key in SitePlanData.data) {
@ -837,9 +838,9 @@ export class CollectionToolsPlanComponent implements OnInit {
CompanyData.data = JSON.stringify(CompanyData.data) CompanyData.data = JSON.stringify(CompanyData.data)
if (this.pattern) {//如果是基本信息编辑模式 if (this.pattern) {//如果是基本信息编辑模式
console.log(1234, object)
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)
@ -857,7 +858,7 @@ export class CollectionToolsPlanComponent implements OnInit {
} else { } else {
//如果是单位 总平面图 //如果是单位 总平面图
if (this.checkedBuildingIndex == -1) { if (this.checkedBuildingIndex == -1) {
//保存中心点和层级
if (this.isGis) { if (this.isGis) {
let data = JSON.parse(JSON.stringify(this.selectingSitePlan)) let data = JSON.parse(JSON.stringify(this.selectingSitePlan))
data.zoomLevel = this.map.getZoom(), data.zoomLevel = this.map.getZoom(),
@ -1014,129 +1015,6 @@ export class CollectionToolsPlanComponent implements OnInit {
}) })
} else { //如果是建筑 } else { //如果是建筑
//建筑平面图数据
this.http.post("/api/BuildingAreaData", SitePlanData, {
params: {
companyId: this.params.companyId
}
}).subscribe(data => {
this.saveNum.push("1")
if (this.saveNum.length == 5) {
this.maskLayerService.sendMessage(false)
this.maskLayerService.sendMessage(false)
this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('保存成功', '确定', config);
this.tabbarService.sendMessage('changeScore');
}
}, err => {
this.maskLayerService.sendMessage(false)
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.canvasData.isChange = true
this.snackBar.open('平面图数据保存失败', '确定', config);
})
//建筑数据
this.http.post("/api/BuildingData", CompanyData, {
params: {
companyId: this.params.companyId
}
}).subscribe(data => {
this.saveNum.push("1")
if (this.saveNum.length == 5) {
this.maskLayerService.sendMessage(false)
this.canvasData.isChange = false
this.maskLayerService.sendMessage(false)
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('保存成功', '确定', config);
this.tabbarService.sendMessage('changeScore');
}
}, err => {
this.maskLayerService.sendMessage(false)
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.canvasData.isChange = true
this.snackBar.open('单位数据保存失败', '确定', config);
})
//批量保存建筑毗邻
let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo()
this.http.post(`/api/BuildingAdjoins/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingAdjoins).subscribe(data => {
this.saveNum.push("1")
if (this.saveNum.length == 5) {
this.maskLayerService.sendMessage(false)
this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('保存成功', '确定', config);
this.tabbarService.sendMessage('changeScore');
}
}, err => {
this.maskLayerService.sendMessage(false)
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.canvasData.isChange = true
if (err == 'infos 有重复方向！') {
this.snackBar.open('建筑毗邻同步失败,存在相同方向', '确定', config);
} else {
this.snackBar.open('建筑毗邻同步失败', '确定', config);
}
})
//批量保存建筑重点部位
let buildingImportantLocations = this.canvasData.getBuildingImportantLocations()
this.http.post(`/api/BuildingImportantLocations/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingImportantLocations).subscribe(data => {
this.saveNum.push("1")
if (this.saveNum.length == 5) {
this.maskLayerService.sendMessage(false)
this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('保存成功', '确定', config);
this.tabbarService.sendMessage('changeScore');
}
}, err => {
this.maskLayerService.sendMessage(false)
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.canvasData.isChange = true
this.snackBar.open('建筑重点部位同步失败', '确定', config);
})
//批量保存建筑消防设施素材
let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
this.http.post(`/api/BuildingFacilityAssets/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingFacilityAssets).subscribe(data => {
this.saveNum.push("1")
if (this.saveNum.length == 5) {
this.maskLayerService.sendMessage(false)
this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('保存成功', '确定', config);
this.tabbarService.sendMessage('changeScore');
}
}, err => {
this.maskLayerService.sendMessage(false)
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.canvasData.isChange = true
this.snackBar.open('建筑消防设施素材同步失败', '确定', config);
})
} }
} }
} }
@ -2344,7 +2222,9 @@ export class CollectionToolsPlanComponent implements OnInit {
//将图标数据添加 //将图标数据添加
let itemData = JSON.parse(JSON.stringify(this.selectImage)) let itemData = JSON.parse(JSON.stringify(this.selectImage))
console.log(6666,this.selectingSitePlan)
itemData.id = id itemData.id = id
itemData.FloorId = this.selectingSitePlan.id
itemData.point = { x: e.lnglat.lng, y: e.lnglat.lat } itemData.point = { x: e.lnglat.lng, y: e.lnglat.lat }
itemData = this.canvasData.deserialize(JSON.stringify(itemData))//反序列化为大写 itemData = this.canvasData.deserialize(JSON.stringify(itemData))//反序列化为大写
// 添加楼层数据 // 添加楼层数据

14
src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
Unescape View File

@ -60,13 +60,13 @@ export class leftFunctionalDomainComponentPlan implements OnInit {
//提交表单创建平面图 //提交表单创建平面图
onSubmit(e) { onSubmit(e) {
if (this.file && this.selectedType == 'image') { if (this.file && this.selectedType == 'image') {
    if (this.file.name.toLowerCase().indexOf('png') == -1 && this.file.name.toLowerCase().indexOf('jpg') == -1 && this.file.name.toLowerCase().indexOf('jpeg') == -1) { if (this.file.name.toLowerCase().indexOf('png') == -1 && this.file.name.toLowerCase().indexOf('jpg') == -1 && this.file.name.toLowerCase().indexOf('jpeg') == -1) {
      const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
      config.verticalPosition = 'top'; config.verticalPosition = 'top';
      config.duration = 3000 config.duration = 3000
      this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config); this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config);
      return return
  } }
this.maskLayerService.sendMessage(true) this.maskLayerService.sendMessage(true)
if (this.file.size <= 5 * 1024 * 1024) { //小于5MB if (this.file.size <= 5 * 1024 * 1024) { //小于5MB
let formData = new FormData() let formData = new FormData()

2
src/app/working-area/working-area.component.ts
Unescape View File

@ -1102,7 +1102,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
if (imageAngle === undefined || imageAngle === null) { if (imageAngle === undefined || imageAngle === null) {
imageAngle = 0; imageAngle = 0;
} }
this.backgroundImage.scale.set(1); this.backgroundImage.scale ? this.backgroundImage.scale.set(1) : null;
// this.backgroundImage.pivot.set(0); // this.backgroundImage.pivot.set(0);
if (imageUrl === undefined || imageUrl === null || imageUrl === '') { if (imageUrl === undefined || imageUrl === null || imageUrl === '') {
this.backgroundImage.texture = this.backgroundTexture; this.backgroundImage.texture = this.backgroundTexture;

Write Preview
Loading…
Cancel
Save