shaojiahao
/
AX.Angular9DataCollection
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'develop' of http://39.106.78.171:3000/shaojiahao/AX.Angular9DataCollection into develop

develop
邵佳豪 4 years ago
parent
56df89c953 c25a9a4a99
commit
b9a0d1bfa1
4 changed files with 46 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      debug.log
  2. 30
      src/app/canvas-share-data.service.ts
  3. 2
      src/app/ui/collection-tools/collection-tools.component.ts
  4. 88
      src/app/working-area/working-area.component.ts

1
debug.log
Unescape View File

@ -1,3 +1,4 @@
[1214/094922.722:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
[1215/082617.914:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
[1215/093432.367:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
[1217/083219.853:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

30
src/app/canvas-share-data.service.ts
Unescape View File

@ -81,14 +81,20 @@ export class CanvasShareDataService {
const returnData = this.allDisposalNode.find(item => item.id === parentId);
return returnData;
}
}
/**
* 更新建筑数据
*/
public updateBuildingData() {
}
/**
* 获取单位毗邻信息
*/
public getCompanyAdjoinInfo(): CompanyAdjoinInfo[] {
const list: CompanyAdjoinInfo[] = [];
Object.keys(this.originaleveryStoreyData.data).forEach((key) => {
const item = this.originaleveryStoreyData.data[key];
Object.keys(this.originalcompanyBuildingData.data).forEach((key) => {
const item = this.originalcompanyBuildingData.data[key];
if (item.Name === '毗邻') {
const adjoin = new CompanyAdjoinInfo();
adjoin.AssetId = item.Id;
@ -114,8 +120,8 @@ export class CanvasShareDataService {
*/
public getBuildingAdjoinInfo(): BuildingAdjoinInfo[] {
const list: BuildingAdjoinInfo[] = [];
Object.keys(this.originaleveryStoreyData.data).forEach((key) => {
const item = this.originaleveryStoreyData.data[key];
Object.keys(this.originalcompanyBuildingData.data).forEach((key) => {
const item = this.originalcompanyBuildingData.data[key];
if (item.Name === '毗邻') {
const adjoin = new BuildingAdjoinInfo();
adjoin.AssetId = item.Id;
@ -141,8 +147,8 @@ export class CanvasShareDataService {
*/
public getCompanyImportantLocations(): CompanyImportantLocationInfo[] {
const list: CompanyImportantLocationInfo[] = [];
Object.keys(this.originaleveryStoreyData.data).forEach((key) => {
const item = this.originaleveryStoreyData.data[key];
Object.keys(this.originalcompanyBuildingData.data).forEach((key) => {
const item = this.originalcompanyBuildingData.data[key];
if (item.Name === '重点部位') {
const important = new CompanyImportantLocationInfo();
important.AssetId = item.Id;
@ -174,8 +180,8 @@ export class CanvasShareDataService {
*/
public getBuildingImportantLocations(): BuildingImportantLocationInfo[] {
const list: BuildingImportantLocationInfo[] = [];
Object.keys(this.originaleveryStoreyData.data).forEach((key) => {
const item = this.originaleveryStoreyData.data[key];
Object.keys(this.originalcompanyBuildingData.data).forEach((key) => {
const item = this.originalcompanyBuildingData.data[key];
if (item.Name === '重点部位') {
const important = new BuildingImportantLocationInfo();
important.AssetId = item.Id;
@ -207,8 +213,8 @@ export class CanvasShareDataService {
*/
public getAllCompanyFacilityAssetInfo(): CompanyFacilityAssetInfo[] {
const list: CompanyFacilityAssetInfo[] = [];
Object.keys(this.originaleveryStoreyData.data).forEach((key) => {
const item = this.originaleveryStoreyData.data[key];
Object.keys(this.originalcompanyBuildingData.data).forEach((key) => {
const item = this.originalcompanyBuildingData.data[key];
if (this.facilityAssetsName.has(item.Name)) {
const facility = new CompanyFacilityAssetInfo();
facility.CompanyId = sessionStorage.getItem('companyId');
@ -228,8 +234,8 @@ export class CanvasShareDataService {
*/
public getAllBuildingFacilityAssetInfo(): BuildingFacilityAssetInfo[] {
const list: BuildingFacilityAssetInfo[] = [];
Object.keys(this.originaleveryStoreyData.data).forEach((key) => {
const item = this.originaleveryStoreyData.data[key];
Object.keys(this.originalcompanyBuildingData.data).forEach((key) => {
const item = this.originalcompanyBuildingData.data[key];
if (this.facilityAssetsName.has(item.Name)) {
const facility = new BuildingFacilityAssetInfo();
facility.BuildingId = this.selectStorey.buildingId;

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

@ -715,7 +715,7 @@ export class CollectionToolsComponent implements OnInit {
//批量保存建筑消防设施素材
let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
this.http.post(`/api/CompanyAccount/BuildingFacilityAssets/Batch?buildingId=${this.canvasData.selectStorey.buildingId}&buildingAreaId=${this.canvasData.selectStorey.id}`,buildingFacilityAssets).subscribe(data => {
this.http.post(`/api/CompanyAccount/BuildingFacilityAssets/Batch?buildingId=${this.canvasData.selectStorey.buildingId}`,buildingFacilityAssets).subscribe(data => {
this.saveNum.push("1")
if(this.saveNum.length == 5){
this.canvasData.isChange = false

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

@ -159,66 +159,26 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.selection.objects.forEach(item => {
if (this.allowEdit
&& this.canvasData.gameMode === item.assetData.GameMode) {
console.log(this.canvasData.gameMode);
switch (this.canvasData.gameMode) {
case 0:
delete this.canvasData.originaleveryStoreyData.data[item.assetData.Id];
this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id));
this.canvasData.isChange = true;
break;
case 1:
delete this.canvasData.selectPanelPoint.Data.DefinedIncrement[item.assetData.Id];
delete this.canvasData.selectPanelPoint.Data.Increment[item.assetData.Id];
delete this.canvasData.selectPanelPoint.Data.Stock[item.assetData.Id];
this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id));
this.canvasData.isChange = true;
break;
switch (this.canvasData.gameMode) {
case 0:
delete this.canvasData.originaleveryStoreyData.data[item.assetData.Id];
this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id));
this.canvasData.isChange = true;
break;
case 1:
delete this.canvasData.selectPanelPoint.Data.DefinedIncrement[item.assetData.Id];
delete this.canvasData.selectPanelPoint.Data.Increment[item.assetData.Id];
delete this.canvasData.selectPanelPoint.Data.Stock[item.assetData.Id];
this.backgroundImage.removeChild(this.backgroundImage.getChildByName(item.assetData.Id));
this.canvasData.isChange = true;
break;
}
this.selection.deselectAll();
}
}
});
this.selection.deselectAll();
this.emit('deleteIcon');
}
});
// 打印当前工作区信息
this.eventManager.addGlobalEventListener('window', 'keypress', (event: any) => {
// console.log(event.keyCode);
if (event.keyCode === 32) {
switch (this.paintMode) {
case 0:
console.log(`当前的绘制模式是：单点图标`);
break;
case 1:
console.log(`当前的绘制模式是：线段图标`);
break;
case 2:
console.log(`当前的绘制模式是：自定义多边形`);
break;
case 3:
console.log(`当前的绘制模式是：水带多边形`);
break;
case 4:
console.log(`当前的绘制模式是：暂无`);
break;
case 5:
console.log(`当前的绘制模式是：暂无`);
break;
case 6:
console.log(`当前的绘制模式是：结束绘制`);
break;
default:
break;
}
console.log('当前楼层的数据：');
console.log(this.canvasData.originaleveryStoreyData.data);
console.log('绘制中的管线：');
console.log(this.paintingPipeline);
console.log('处置预案数据：');
console.log(this.canvasData.selectPanelPoint.Data);
}
});
}
/**
* 页面初始化
@ -321,6 +281,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.circleShadow.position = this.backgroundImage.toLocal(this.mousePosition);
this.refreshPreviewLineSegment(this.currentClickPoint.position, this.circleShadow.position);
}
/**
* 显示框选
*/
if (this.rectToolGraphics.visible === true) {
const init = this.initialScreenMousePos;
@ -339,18 +302,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.rectToolGraphics.drawRect(final.x, final.y, init.x - final.x, init.y - final.y);
}
this.rectToolGraphics.endFill();
// this.rectToolGraphics.closePath();
}
// if (this.paintingArrows !== null) {
// this.paintingArrows.assetData.pointB = new PIXI.Point(this.circleShadow.position.x, this.circleShadow.position.y);
// this.paintingArrows.refresh();
// }
});
/**
* 选中事件
*/
this.on('select', obj => {
// this.moveIconToScreenCenter(obj);
if (this.allowEdit) {
if (obj instanceof MultipointIcon) {
if (obj.assetData.GameMode === this.canvasData.gameMode) {
@ -388,6 +345,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
obj.filters = [];
}
});
/**
* 根据背景缩放事件
*/
this.on('backgroundScale', scale => {
this.backgroundImage?.children.forEach(item => {
if (item instanceof AxImageShape) {
@ -414,9 +374,13 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
});
});
/**
* 创建图标事件
*/
this.on('createIcon', obj => {
if (obj.assetData.GameMode === GameMode.BasicInformation) {
this.canvasData.originaleveryStoreyData.data[obj.assetData.Id] = obj.assetData;
// 添加楼层数据
this.canvasData.originaleveryStoreyData.data[obj.assetData.Id] = obj.assetData;
} else {
if (this.canvasData.selectPanelPoint.Data === undefined
|| this.canvasData.selectPanelPoint.Data === null) {

Write Preview
Loading…
Cancel
Save