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

src/app/babylon/controller/mode-manager.ts

@@ -26,7 +26,7 @@ export class ModeManager {
     public static isDebug = true;
 
     /**
-     * 是编辑人员（内部编辑人员，可新增单位、上传模型）
+     * 内部模式 是编辑人员（内部编辑人员，可新增单位、上传模型）
      */
     public static isEditor = true;
 

src/app/babylon/controller/scene-manager.ts

@@ -133,7 +133,7 @@ export class SceneManager {
       this.scene //定义摄像机所属的场景
     );
     camera.maxZ = 6000; //摄像机拍摄的最远距离
-    camera.upperBetaLimit = 1.5; //beta方向上的旋转限制（防止看到模型底面）
+    // camera.upperBetaLimit = 1.5; //beta方向上的旋转限制（防止看到模型底面）
     camera.lowerRadiusLimit = 3; //相机距离拍摄目标的最小距离（防止穿插）
     camera.setTarget(Vector3.Zero()); //设置拍摄目标
     camera.attachControl(this.canvas, true); //把相机连接到画布

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

@@ -122,19 +122,23 @@ export class LoginSatus extends StatusBase {
 
         console.log("进入 logins");
 
-        BabylonTool.importMeshSync("", "assets/mesh/outdoor/ZhuTi/ZhuTi.gltf", undefined, undefined, undefined, (meshes) => {
+        //测试
-            console.log("加载完成", meshes);
+        // BabylonTool.importMeshSync("", "assets/mesh/outdoor/ZhuTi/ZhuTi.gltf", undefined, undefined, undefined, (meshes) => {
-        });
+        //     console.log("加载完成", meshes);
+        // });
+
+        // let l_xy = 100;
+        // let result = [new Vector3(l_xy, l_xy), new Vector3(l_xy, -l_xy), new Vector3(-l_xy, -l_xy), new Vector3(-l_xy, l_xy)];
+
+        // let poly_tri = new PolygonMeshBuilder("polytri", result, SceneManager.Instance.scene);
+        // let mesh = poly_tri.build(true, 0);
+        // mesh.position.y = -10;
+
+        // console.log(poly_tri);
 
-        let l_xy = 100;
-        let result = [new Vector3(l_xy, l_xy), new Vector3(l_xy, -l_xy), new Vector3(-l_xy, -l_xy), new Vector3(-l_xy, l_xy)];
 
-        let poly_tri = new PolygonMeshBuilder("polytri", result, SceneManager.Instance.scene);
-        let mesh = poly_tri.build(true, 0);
-        mesh.position.y = -10;
 
-        console.log(poly_tri);
+        UIManager.open<TopbarWindow>(TopbarWindow);
-        //UIManager.open<TopbarWindow>(TopbarWindow);
         // this.openSelectWindow();//可以开启选择、新建单位
 
 

src/app/babylon/model/data/institution/institution-data.ts

@@ -5,6 +5,11 @@ import { BuildingData_ChemicalPlant, BuildingData_Environment, BuildingData_Norm
 //单位信息
 export class InstitutionData {
 
+    /**
+     * 版本号
+     */
+    version: string = "1.0";
+
     @Type(() => NormalData)
     normalData: NormalData = null;//常规信息