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

src/app/babylon/controller/event-manager/events/event-change-facility.ts

@@ -1,6 +1,7 @@
 
-import { ModelData } from "src/babylon/model/data/model-data/model-data";
-import { BuildingInfo } from "src/babylon/model/info/building/building-info";
+
+import { ModelData } from "src/app/babylon/model/data/model-data/model-data";
+import { BuildingInfo } from "src/app/babylon/model/info/building/building-info";
 import { ModelChangeType } from "../../data-manager";
 import { Event_Base } from "../event-base";
 import { EventManager } from "../event-manager";

src/app/babylon/controller/event-manager/events/event-get-markplandata-success.ts

@@ -1,4 +1,5 @@
-import { AllMarkPlanData } from "src/babylon/model/data/mark/mark-plan-data";
+
+import { AllMarkPlanData } from "src/app/babylon/model/data/mark/mark-plan-data";
 import { Event_Base } from "../event-base";
 import { EventManager } from "../event-manager";
 

src/app/babylon/controller/event-manager/events/event-mark-info-change.ts

@@ -1,4 +1,5 @@
-import { ModelInfo_mark } from "src/babylon/model/info/mark/model-info-mark";
+
+import { ModelInfo_mark } from "src/app/babylon/model/info/mark/model-info-mark";
 import { Event_Base } from "../event-base";
 import { EventManager } from "../event-manager";
 

src/app/babylon/controller/event-manager/events/event-modelinfo-change.ts

@@ -1,4 +1,5 @@
-import { ModelInfo } from "src/babylon/model/info/model/model-info";
+
+import { ModelInfo } from "src/app/babylon/model/info/model/model-info";
 import { ModelChangeType } from "../../data-manager";
 import { Event_Base } from "../event-base";
 import { EventManager } from "../event-manager";

src/app/babylon/controller/status/login-status.ts

@@ -2,6 +2,7 @@ import { HttpErrorResponse } from "@angular/common/http";
 import { plainToClass } from "class-transformer";
 import { InstitutionData, NormalData } from "../../model/data/institution/institution-data";
 import { InsitutionDataSimple } from "../../model/data/institution/institution-data-simple";
+import { BabylonTool } from "../../tool/babylon-tool";
 import { InstitutionCreateWindow } from "../../view/institution/institution-create-window";
 import { InstitutionSelectWindow } from "../../view/institution/institution-select-window";
 import { TopbarWindow } from "../../view/topbar-window/topbar-window";
@@ -118,6 +119,10 @@ export class LoginSatus extends StatusBase {
 
         console.log("进入 logins");
 
+        BabylonTool.importMeshSync("", "assets/mesh/outdoor/ZhuTi/ZhuTi.gltf", undefined, undefined, undefined, (meshes) => {
+            console.log("加载完成", meshes);
+        });
+
         //UIManager.open<TopbarWindow>(TopbarWindow);
         // this.openSelectWindow();//可以开启选择、新建单位