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

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

@@ -1,6 +1,7 @@
 import { Vector3 } from "@babylonjs/core";
 import { Type } from "class-transformer";
 import { BuildingData_ChemicalPlant, BuildingData_Environment, BuildingData_Normal, BuildingType } from "./building/building-data";
+import { JYZInfoMoudleType, JYZShowData } from "./jyz-show-data";
 
 //单位信息
 export class InstitutionData {
@@ -25,6 +26,11 @@ export class InstitutionData {
     @Type(() => Vector3)
     pos: Vector3 = new Vector3(0, 0, 0);
 
+    /**
+     * 加油站展示数据
+     */
+    @Type(() => JYZShowData)
+    JYZShowDatas: JYZShowData[] = [];
 
     //获取一个最新的key（根据前一个同类建筑key，加一）
     public getNewKey(buildingType: BuildingType): string {
@@ -65,6 +71,21 @@ export class InstitutionData {
         return result;
     }
 
+    /**
+     * 获取加油站展示数据
+     * @param type 
+     */
+    getMoudleShowData(type: JYZInfoMoudleType) {
+        let result: JYZShowData = null;
+        for (let i = 0; i < this.JYZShowDatas.length; i++) {
+            if (this.JYZShowDatas[i].moudleType == type) {
+                result = this.JYZShowDatas[i];
+                break;
+            }
+        }
+        return result;
+    }
+
 
 }
 
@@ -89,4 +110,5 @@ export class NormalData {
         //console.log("getName==" + this.name);
         return this.name;
     }
-}
+}
+

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

@@ -0,0 +1,78 @@
+import { ArcRotateCamera } from "@babylonjs/core/Cameras/arcRotateCamera";
+import { Type } from "class-transformer";
+import { ArcRotateCameraData } from "../camera-data";
+
+/**
+ * 加油站展示数据
+ */
+export class JYZShowData {
+
+    /**
+     * 模块类型
+     */
+    moudleType: JYZInfoMoudleType;
+
+    /**
+     * 摄像机数据
+     */
+    @Type(() => ArcRotateCameraData)
+    cameraData: ArcRotateCameraData;
+
+    /**
+     * 展示罩棚
+     */
+    showZP: boolean;
+
+    constructor(moudleType: JYZInfoMoudleType, camera: ArcRotateCamera, showZP: boolean) {
+        this.moudleType = moudleType;
+        this.cameraData = new ArcRotateCameraData();
+        this.cameraData.getDataFromCamera(camera);
+    }
+
+}
+
+/**
+ * 加油站信息模块类型
+ */
+export enum JYZInfoMoudleType {
+
+    /**
+     * 基本信息
+     */
+    JBXX = "JBXX",
+
+    /**
+     * 应急处置
+     */
+    YJCZ = "YJCZ",
+
+    /**
+     * 消防
+     */
+    XF = "XF",
+    /**
+     * 加油机
+     */
+    JYJ = "JYJ",
+    /**
+     * 油罐
+     */
+    YG = "YG",
+    /**
+     * 输油管
+     */
+    SYG = "SYG",
+    /**
+     * 油气回收管线
+     */
+    YQHSGX = "YQHSGX",
+    /**
+     * 安全疏散
+     */
+    AQSS = "AQSS",
+
+    /**
+     * 罩棚
+     */
+    ZP = "ZP",
+}

src/app/babylon/tool/babylon-tool.ts

@@ -288,6 +288,89 @@ export class BabylonTool {
   }
 
 
+  public static AnimMoveCameraTargetAB(
+    camera: ArcRotateCamera,
+    allFrame: number,
+    target: Vector3,
+    radius: number,
+    alpha: number,
+    beta: number,
+  ) {
+    //缓动动画
+    let easingFunction = new QuadraticEase();
+    easingFunction.setEasingMode(EasingFunction.EASINGMODE_EASEOUT);
+
+    //target
+    let anim_target = new Animation(
+      'CameraAnim_target',
+      'target',
+      60,
+      Animation.ANIMATIONTYPE_VECTOR3,
+      Animation.ANIMATIONLOOPMODE_CYCLE
+    );
+    let keys_target = [
+      { frame: 0, value: camera.target },
+      { frame: allFrame, value: target },
+    ];
+    anim_target.setKeys(keys_target);
+    anim_target.setEasingFunction(easingFunction);
+
+    //radius
+    let anim_radius = new Animation(
+      'CameraAnim_radius',
+      'radius',
+      60,
+      Animation.ANIMATIONTYPE_FLOAT,
+      Animation.ANIMATIONLOOPMODE_CYCLE
+    );
+    let keys_radius = [
+      { frame: 0, value: camera.radius },
+      { frame: allFrame, value: radius },
+    ];
+    anim_radius.setKeys(keys_radius);
+    anim_radius.setEasingFunction(easingFunction);
+
+
+
+    //beta
+    let anim_a = new Animation(
+      'CameraAnim_a',
+      'alpha',
+      60,
+      Animation.ANIMATIONTYPE_FLOAT,
+      Animation.ANIMATIONLOOPMODE_CYCLE
+    );
+    let keys_a = [
+      { frame: 0, value: camera.alpha },
+      { frame: allFrame, value: alpha },
+    ];
+    anim_a.setKeys(keys_a);
+
+    //beta
+    let anim_b = new Animation(
+      'CameraAnim_b',
+      'beta',
+      60,
+      Animation.ANIMATIONTYPE_FLOAT,
+      Animation.ANIMATIONLOOPMODE_CYCLE
+    );
+    let keys_b = [
+      { frame: 0, value: camera.beta },
+      { frame: allFrame, value: beta },
+    ];
+    anim_b.setKeys(keys_b);
+
+    camera.animations = [];
+    camera.animations.push(anim_target);
+    camera.animations.push(anim_radius);
+    camera.animations.push(anim_a);
+    camera.animations.push(anim_b);
+
+    camera._scene.beginAnimation(camera, 0, allFrame, false);
+
+  }
+
+
   //动画移动摄像机target
   public static AnimMoveCameraTarget(
     camera: ArcRotateCamera,

src/app/babylon/view/building-window/building-window.ts

@@ -8,6 +8,7 @@ import { ServeManager } from "../../controller/serve-manager";
 import { BuildingStatus } from "../../controller/status/building-status";
 import { StatusManager } from "../../controller/status/status-manager";
 import { BuildingData, BuildingData_ChemicalPlant, BuildingData_Environment, BuildingData_Normal, BuildingType } from "../../model/data/institution/building/building-data";
+import { JYZInfoMoudleType, JYZShowData } from "../../model/data/institution/jyz-show-data";
 import { ModelType } from "../../model/data/model-data/model-data";
 import { FacilityType } from "../../model/data/model-data/model-data-facility";
 import { ModelEditData } from "../../model/data/model-data/model-edit-data";
@@ -17,6 +18,7 @@ import { BuildingInfo_Environment } from "../../model/info/building/building-inf
 import { BuildingInfo_Normal } from "../../model/info/building/building-info-normal";
 import { ModelInfo_building } from "../../model/info/model/model-info-building";
 import { FacilityInfoByType } from "../../model/info/model/model-info-facility";
+import { BabylonTool } from "../../tool/babylon-tool";
 import { TsTool } from "../../tool/ts-tool";
 import { UIBase } from "../window-base/ui-base";
 import { BuildingUIItem } from "./building-ui-item";
@@ -24,6 +26,7 @@ import { BuildingUIItem } from "./building-ui-item";
 //建筑界面
 export class BuildingWindow extends UIBase {
 
+
     /**
      * uv动画材质的特殊命名
      */
@@ -215,12 +218,13 @@ export class BuildingWindow extends UIBase {
      */
     showJYZInfoModel(type: JYZInfoMoudleType, show: boolean) {
         console.log("showJYZInfoModel", type, show);
+
         if (this.currentJYZInfoMoudleType == type) {
             if (show) {
                 return; //与上次显示的模块相同
             }
             else {
-                this.showJYZModules(type, show);
+                this.showJYZModules(type, show); //单纯隐藏
             }
         }
         else {
@@ -230,6 +234,27 @@ export class BuildingWindow extends UIBase {
             this.showJYZModules(type, show);//展示本次要展示的内容
         }
 
+        if (show) {
+            if (type == JYZInfoMoudleType.YJCZ) {
+                //进入应急处置
+            }
+            else {//恢复查看状态
+                let showData = DataManager.institutionData.getMoudleShowData(type);
+                if (showData != null) {
+                    let camera = SceneManager.Instance.defaultCamera;
+                    //showData.cameraData.setDataToCamera(camera);
+                    let cameraData = showData.cameraData;
+                    BabylonTool.AnimMoveCameraTargetAB(camera, 60, cameraData.target, cameraData.radius, cameraData.alpha, cameraData.beta);
+                    this.showZP(showData.showZP);
+                    PlanComponent.instance.isOpenAwning = showData.showZP;
+                }
+            }
+        }
+        else {
+            if (type == JYZInfoMoudleType.YJCZ) {
+                //退出应急处置
+            }
+        }
 
 
     }
@@ -642,6 +667,11 @@ export class BuildingWindow extends UIBase {
      */
     mat_UV: Map<JYZInfoMoudleType, Material[]> = new Map();
 
+    /**
+     * 当前罩棚是否显示
+     */
+    currentZPShow: boolean = true;
+
     /**
      * 展示加油站信息模块
      * @param type 
@@ -765,6 +795,7 @@ export class BuildingWindow extends UIBase {
                 }
             }
         }
+        this.currentZPShow = show;
     }
 
     /**
@@ -840,42 +871,39 @@ export class BuildingWindow extends UIBase {
         return result;
     }
 
+    /**
+     * 保存展示模块当前数据
+     */
+    saveShowMoudleData() {
+
+        let moudleType = this.currentJYZInfoMoudleType;
+        let camera = SceneManager.Instance.defaultCamera;
+        let showZP = this.currentZPShow;
+
+        if (DataManager.institutionData.JYZShowDatas == null) {
+            DataManager.institutionData.JYZShowDatas = [];
+        }
+
+        let jyzShowData: JYZShowData = null;
+        for (let i = 0; i < DataManager.institutionData.JYZShowDatas.length; i++) {
+            if (DataManager.institutionData.JYZShowDatas[i].moudleType == moudleType) {
+                jyzShowData = DataManager.institutionData.JYZShowDatas[i];
+                break;
+            }
+        }
+        if (jyzShowData == null) {
+            jyzShowData = new JYZShowData(moudleType, camera, showZP);
+        }
+        jyzShowData.moudleType = moudleType;
+        jyzShowData.cameraData.getDataFromCamera(camera);
+        jyzShowData.showZP = showZP;
+
+    }
+
+
+
     //#endregion
 
 
 }
 
-/**
- * 加油站信息模块类型
- */
-export enum JYZInfoMoudleType {
-    /**
-     * 消防
-     */
-    XF = "XF",
-    /**
-     * 加油机
-     */
-    JYJ = "JYJ",
-    /**
-     * 油罐
-     */
-    YG = "YG",
-    /**
-     * 输油管
-     */
-    SYG = "SYG",
-    /**
-     * 油气回收管线
-     */
-    YQHSGX = "YQHSGX",
-    /**
-     * 安全疏散
-     */
-    AQSS = "AQSS",
-
-    /**
-     * 罩棚
-     */
-    ZP = "ZP",
-}

src/app/babylon/view/toolbar-window/toobar-window.ts

@@ -89,6 +89,8 @@ export class ToolbarWindow extends UIBase {
 
     //#endregion
 
+    //#region 加油站专用
+
     /**
      * 清空找不到具体模型的设备info和data
      */
@@ -118,6 +120,16 @@ export class ToolbarWindow extends UIBase {
         BuildingWindow.instance.showZP(show);
     }
 
+    /**
+     * 保存展示模块当前数据
+     */
+    saveShowMoudleData() {
+        BuildingWindow.instance.saveShowMoudleData();
+        PlanComponent.instance.openSnackBar("记录当前视角");
+    }
+
+    //#endregion
+
 
     onInit() {
         super.onInit();

src/app/pages/plan/plan.component.ts

@@ -11,13 +11,14 @@ import { ToolbarWindow } from 'src/app/babylon/view/toolbar-window/toobar-window
 import { BuildingStatus } from 'src/app/babylon/controller/status/building-status';
 import { BuildingUIItem } from 'src/app/babylon/view/building-window/building-ui-item';
 import { BuildingType } from 'src/app/babylon/model/data/institution/building/building-data';
-import { BuildingWindow, JYZInfoMoudleType } from 'src/app/babylon/view/building-window/building-window';
+import { BuildingWindow } from 'src/app/babylon/view/building-window/building-window';
 import { FacilityUIItem } from 'src/app/babylon/view/facility-window/facility-ui-item';
 import { FacilityWindow } from 'src/app/babylon/view/facility-window/facility-window';
 import { FacilityInfoUIItem } from 'src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item';
 import { EventManager } from '@angular/platform-browser';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { LeftDomainComponent } from '../left-domain/left-domain.component';
+import { JYZInfoMoudleType } from 'src/app/babylon/model/data/institution/jyz-show-data';