diff --git a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts index 87d6761..3442ea7 100644 --- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts +++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts @@ -2,6 +2,7 @@ import { AbstractMesh, Color3, EventState, Mesh, PickingInfo, PointerEventTypes, import { classToClass } from "class-transformer"; import { PlanComponent } from "src/app/pages/plan/plan.component"; import { ModelChangeType } from "../../controller/data-manager"; +import { EventManager } from "../../controller/event-manager/event-manager"; import { Event_KeyboardInput } from "../../controller/event-manager/events/event-keyboard-input"; import { Event_ModelInfoChange } from "../../controller/event-manager/events/event-modelinfo-change"; import { ModeManager, ModeType } from "../../controller/mode-manager"; @@ -261,7 +262,7 @@ export class FacilityInfoInSceneWindow extends UIBase { FacilityInfoInSceneWindow.instance = this; this.three = PlanComponent.instance; - // EventManager.addListener(Event_ModelInfoChange, this.onModelInfoChange); + EventManager.addListener(Event_ModelInfoChange, this.onModelInfoChange); GizmoTool.onPickMeshInfoObservable.add(this.onClickModel); this.currentFacility = []; @@ -275,7 +276,7 @@ export class FacilityInfoInSceneWindow extends UIBase { onClose() { super.onClose(); - //EventManager.removeCallback(Event_ModelInfoChange, this.onModelInfoChange); + EventManager.removeCallback(Event_ModelInfoChange, this.onModelInfoChange); GizmoTool.onPickMeshInfoObservable.removeCallback(this.onClickModel); } @@ -638,7 +639,7 @@ export class FacilityInfoInSceneWindow extends UIBase { } // facilityInfo.setSelectEnable(true); - // this.selectFacilityItemToThree(facilityInfoUIItem); + this.selectFacilityItemToThree([facilityInfoUIItem], true); } //this.onClickModel(facilityInfoUIItem); diff --git a/src/app/service/objects.service.ts b/src/app/service/objects.service.ts index c1a2de2..533a4e0 100644 --- a/src/app/service/objects.service.ts +++ b/src/app/service/objects.service.ts @@ -54,8 +54,8 @@ export class ObjectsService { */ obsRootByEnv = new Map([ [EnvironmentType.DevelopEditor, "sinochemweb/"], //开发与编辑 - [EnvironmentType.Test, "sinochem3d/"],//测试 - [EnvironmentType.Production, "sinochem3d/"],//生产环境(根据需要设置)最好是与测试环境的桶名相同 + [EnvironmentType.Test, "sinochemweb/"],//测试 + [EnvironmentType.Production, "sinochemweb/"],//生产环境(根据需要设置)最好是与测试环境的桶名相同 ]); diff --git a/src/assets/images/mark/disaster/dt.png b/src/assets/images/mark/disaster/dt.png index e564828..3b33fdd 100644 Binary files a/src/assets/images/mark/disaster/dt.png and b/src/assets/images/mark/disaster/dt.png differ diff --git a/src/assets/images/mark/disaster/lyd.png b/src/assets/images/mark/disaster/lyd.png index e564828..0f3dbdc 100644 Binary files a/src/assets/images/mark/disaster/lyd.png and b/src/assets/images/mark/disaster/lyd.png differ diff --git a/src/assets/images/mark/disaster/lyx.png b/src/assets/images/mark/disaster/lyx.png index e564828..fe8c7fe 100644 Binary files a/src/assets/images/mark/disaster/lyx.png and b/src/assets/images/mark/disaster/lyx.png differ diff --git a/src/assets/images/mark/inside/jyy.png b/src/assets/images/mark/inside/jyy.png index e564828..51cac39 100644 Binary files a/src/assets/images/mark/inside/jyy.png and b/src/assets/images/mark/inside/jyy.png differ diff --git a/src/assets/images/mark/inside/syy.png b/src/assets/images/mark/inside/syy.png index e564828..e070316 100644 Binary files a/src/assets/images/mark/inside/syy.png and b/src/assets/images/mark/inside/syy.png differ diff --git a/src/assets/images/mark/inside/xfsd.png b/src/assets/images/mark/inside/xfsd.png index e564828..5dd4b01 100644 Binary files a/src/assets/images/mark/inside/xfsd.png and b/src/assets/images/mark/inside/xfsd.png differ diff --git a/src/assets/images/mark/inside/xfsq.png b/src/assets/images/mark/inside/xfsq.png index e564828..2b356d4 100644 Binary files a/src/assets/images/mark/inside/xfsq.png and b/src/assets/images/mark/inside/xfsq.png differ diff --git a/src/assets/images/mark/inside/xyy.png b/src/assets/images/mark/inside/xyy.png index e564828..9548755 100644 Binary files a/src/assets/images/mark/inside/xyy.png and b/src/assets/images/mark/inside/xyy.png differ diff --git a/src/assets/images/mark/inside/ygc.png b/src/assets/images/mark/inside/ygc.png index e564828..955d0d1 100644 Binary files a/src/assets/images/mark/inside/ygc.png and b/src/assets/images/mark/inside/ygc.png differ diff --git a/src/assets/images/mark/inside/ygcsj.png b/src/assets/images/mark/inside/ygcsj.png index e564828..803a2fc 100644 Binary files a/src/assets/images/mark/inside/ygcsj.png and b/src/assets/images/mark/inside/ygcsj.png differ diff --git a/src/assets/images/mark/inside/zymbrq.png b/src/assets/images/mark/inside/zymbrq.png index e564828..7223661 100644 Binary files a/src/assets/images/mark/inside/zymbrq.png and b/src/assets/images/mark/inside/zymbrq.png differ