diff --git a/src/app/babylon/controller/serve-manager.ts b/src/app/babylon/controller/serve-manager.ts index 12c7167..0ad6725 100644 --- a/src/app/babylon/controller/serve-manager.ts +++ b/src/app/babylon/controller/serve-manager.ts @@ -1,5 +1,6 @@ import { HttpErrorResponse } from "@angular/common/http"; import { classToPlain } from "class-transformer"; +import { PlanComponent } from "src/app/pages/plan/plan.component"; import { BuildingBasicInfosService } from "src/app/service/babylon/building-basic-infos.service"; import { ObjectsService } from "src/app/service/objects.service"; import { InsitutionDataSimple } from "../model/data/institution/institution-data-simple"; @@ -134,7 +135,7 @@ export class ServeManager { if (onSuccess) { onSuccess(allMarkPlanData.institutionID, data.result); } - // ThreeDimensionalHomeComponent.instance.openSnackBar("保存标绘信息成功"); + //PlanComponent.instance.openSnackBar("保存标绘信息成功"); // alert("保存标绘信息成功"); //暂时没有失败的回调 onError diff --git a/src/app/babylon/view/facility-window/facility-window.ts b/src/app/babylon/view/facility-window/facility-window.ts index 727d0c8..d985c3d 100644 --- a/src/app/babylon/view/facility-window/facility-window.ts +++ b/src/app/babylon/view/facility-window/facility-window.ts @@ -316,7 +316,7 @@ export class FacilityWindow extends UIBase { createNewFacilityByMesh(mesh: AbstractMesh, type: FacilityType) { let facilityData = this.createFacilityDataFromMesh(mesh, type); //let facilityInfo = this.createFacilityInfoFromMesh(facilityData, mesh, buildingInfo); - + console.log("获取到干粉灭火器", mesh); this.createNewFacility(facilityData, mesh); } @@ -330,7 +330,7 @@ export class FacilityWindow extends UIBase { let currentBuidngItem = StatusManager.getStatus(BuildingStatus) .buildingWindow.currentBuidngItem; if (currentBuidngItem == null) { - // alert("请先选中目标建筑"); + alert("请先选中目标建筑"); // ThreeDimensionalHomeComponent.instance.openSnackBar("请先选中目标建筑"); return } @@ -412,8 +412,16 @@ export class FacilityWindow extends UIBase { } - let defaultMesh = MeshBuilder.CreateBox(facilityData.key, { size: 1 }); - defaultMesh.isVisible = false; + let defaultMesh: AbstractMesh = null; + + if (mesh == null) { + defaultMesh = MeshBuilder.CreateBox(facilityData.key, { size: 1 }); + defaultMesh.isVisible = false; + } + else { + defaultMesh = mesh; + } + let facilityInfo = InfoManager.newModelInfo_facility( facilityData.key, facilityData, @@ -433,7 +441,7 @@ export class FacilityWindow extends UIBase { facilityInfo.belongToBuilding = buildingInfo; - if (facilityInfo.facilityShowType == FacilityShowType.ModelAndTag) { + if (facilityInfo.facilityShowType == FacilityShowType.ModelAndTag && mesh == null) { this.getFacilityPrefabSync(facilityData.resName).then((mesh) => { let prefab = mesh; @@ -480,7 +488,7 @@ export class FacilityWindow extends UIBase { } //设置设备transform信息 - setFacilityTransform(isLocalPos: boolean, isNew: boolean, facilityData: ModelData_facility, buildingInfo: BuildingInfo, newFacility: Mesh, facilityInfo?: ModelInfo_facility) { + setFacilityTransform(isLocalPos: boolean, isNew: boolean, facilityData: ModelData_facility, buildingInfo: BuildingInfo, newFacility: AbstractMesh, facilityInfo?: ModelInfo_facility) { //如果是局部坐标,要先设置父节点 if (isLocalPos) { buildingInfo.ModelInfo.setFacilityParent(facilityInfo); diff --git a/src/app/service/babylon/building-basic-infos.service.ts b/src/app/service/babylon/building-basic-infos.service.ts index 4cb08fc..5562801 100644 --- a/src/app/service/babylon/building-basic-infos.service.ts +++ b/src/app/service/babylon/building-basic-infos.service.ts @@ -38,9 +38,9 @@ export class BuildingBasicInfosService { postBuildingBasicInfos(name: string, data: any): Observable { let params = { name: name, - content: JSON.stringify(data), + // content: JSON.stringify(data), } - return this.http.post(this.baseUrl + this.c_post, {}, { params }) + return this.http.post(this.baseUrl + this.c_post, JSON.stringify(data), { params }) .pipe( catchError((err) => this.handleError(err)) ); @@ -66,9 +66,9 @@ export class BuildingBasicInfosService { postMarkData(name: string, data: any): Observable { let params = { name: name, - content: JSON.stringify(data), + //content: JSON.stringify(data), } - return this.http.post(this.markUrl + this.c_post, {}, { params }) + return this.http.post(this.markUrl + this.c_post, JSON.stringify(data), { params }) .pipe( catchError((err) => this.handleError(err)) ); diff --git a/src/assets/images/facility/in/FHFQ.png b/src/assets/images/facility/in/FHFQ.png new file mode 100644 index 0000000..dfc59c9 Binary files /dev/null and b/src/assets/images/facility/in/FHFQ.png differ diff --git a/src/assets/images/facility/in/FHJL.png b/src/assets/images/facility/in/FHJL.png new file mode 100644 index 0000000..60d38b0 Binary files /dev/null and b/src/assets/images/facility/in/FHJL.png differ diff --git a/src/assets/images/facility/in/FHM.png b/src/assets/images/facility/in/FHM.png new file mode 100644 index 0000000..dd6647a Binary files /dev/null and b/src/assets/images/facility/in/FHM.png differ diff --git a/src/assets/images/facility/in/HT.png b/src/assets/images/facility/in/HT.png new file mode 100644 index 0000000..a15f56d Binary files /dev/null and b/src/assets/images/facility/in/HT.png differ diff --git a/src/assets/images/facility/in/LSXFB.png b/src/assets/images/facility/in/LSXFB.png new file mode 100644 index 0000000..0e38f1a Binary files /dev/null and b/src/assets/images/facility/in/LSXFB.png differ diff --git a/src/assets/images/facility/in/PTDT.png b/src/assets/images/facility/in/PTDT.png new file mode 100644 index 0000000..c253fe4 Binary files /dev/null and b/src/assets/images/facility/in/PTDT.png differ diff --git a/src/assets/images/facility/in/SNXHS.png b/src/assets/images/facility/in/SNXHS.png new file mode 100644 index 0000000..37feb73 Binary files /dev/null and b/src/assets/images/facility/in/SNXHS.png differ diff --git a/src/assets/images/facility/in/SSLT.png b/src/assets/images/facility/in/SSLT.png new file mode 100644 index 0000000..002638a Binary files /dev/null and b/src/assets/images/facility/in/SSLT.png differ diff --git a/src/assets/images/facility/in/SX.png b/src/assets/images/facility/in/SX.png new file mode 100644 index 0000000..128ada5 Binary files /dev/null and b/src/assets/images/facility/in/SX.png differ diff --git a/src/assets/images/facility/in/WSXFB.png b/src/assets/images/facility/in/WSXFB.png new file mode 100644 index 0000000..c2811d5 Binary files /dev/null and b/src/assets/images/facility/in/WSXFB.png differ diff --git a/src/assets/images/facility/in/XFDT.png b/src/assets/images/facility/in/XFDT.png new file mode 100644 index 0000000..e1f0b59 Binary files /dev/null and b/src/assets/images/facility/in/XFDT.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_GF_8.png b/src/assets/images/facility/in/XF_MHQ_GF_8.png new file mode 100644 index 0000000..b3e78e2 Binary files /dev/null and b/src/assets/images/facility/in/XF_MHQ_GF_8.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_PT_8.png b/src/assets/images/facility/in/XF_MHQ_PT_8.png new file mode 100644 index 0000000..de94ddc Binary files /dev/null and b/src/assets/images/facility/in/XF_MHQ_PT_8.png differ diff --git a/src/assets/images/facility/in/XKS.png b/src/assets/images/facility/in/XKS.png new file mode 100644 index 0000000..9c27faa Binary files /dev/null and b/src/assets/images/facility/in/XKS.png differ