Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

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

src/app/service/objects.service.ts

@@ -54,8 +54,8 @@ export class ObjectsService {
    */
   obsRootByEnv = new Map<EnvironmentType, string>([
     [EnvironmentType.DevelopEditor, "sinochemweb/"], //开发与编辑
-    [EnvironmentType.Test, "sinochem3d/"],//测试
-    [EnvironmentType.Production, "sinochem3d/"],//生产环境（根据需要设置）最好是与测试环境的桶名相同
+    [EnvironmentType.Test, "sinochemweb/"],//测试
+    [EnvironmentType.Production, "sinochemweb/"],//生产环境（根据需要设置）最好是与测试环境的桶名相同
   ]);