合并代码

src/app/babylon/controller/inputController.ts

@@ -1304,8 +1304,11 @@ export class Keyboard {
     private constructor() {
         // 添加快捷键
         document.addEventListener('keydown', (e: KeyboardEvent) => {
+            if (e.key == null) {
+                return;
+            }
             let key = e.key.toLocaleLowerCase();
-            console.log(key);
+            // console.log(key);
             if (key == "w" && e.shiftKey) {
                 this.W = true;
             } else if (key == "w") {

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

@@ -23,12 +23,12 @@ export class ModeManager {
     /**
      * 制作模式代表内部编辑人员，可新增单位、上传模型，查看模式代表交付的模式
      */
-    public static s_isMakeMode = true;
+    public static s_isMakeMode = false;
 
     /**
      * 调试模式
      */
-    public static isDebug = true;
+    public static isDebug = false;
 
 
 
@@ -63,7 +63,7 @@ export class ModeManager {
      */
     static set currentMode(modeType: ModeType) {
         ModeManager.s_currentMode = modeType;
-        ModeManager.log("currentMode" + modeType);
+
     }
 
     //封装打印

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

@@ -58,6 +58,7 @@ import { MarkData_multiArrow_CT, MarkData_multiArrow_JG } from '../model/data/ma
 import { ModelInfo_mark_multiArrow } from '../model/info/mark/other/mark-plan-multi-arrow';
 import { ModelInfo_mark_particle } from '../model/info/mark/other/mark-plan-particle-info';
 import { FacilityPosType, ModelData_facility } from '../model/data/model-data/model-data-facility';
+import { LoadTool } from '../tool/load-tool';
 
 //场景管理器
 export class SceneManager {
@@ -556,7 +557,7 @@ export class SceneManager {
             }
             SceneManager.endLoadMesh(modelData.resPath, modelData.resName);
             let box = SceneManager.importMeshSuccess(newMeshes, particleSystems, skeletons, animationGroups, modelInfo, needBox, modelData);
-            console.log("加载模型完成", modelData.resName);
+            //console.log("加载模型完成", modelData.resName);
             onSuccess(newMeshes, box, modelInfo);
           }, null,
           function (scene: Scene, message: string, exception?: any) {
@@ -568,14 +569,14 @@ export class SceneManager {
 
               SceneManager.createModel(modelType, modelData, needBox, isNew, tag, onSuccess, onError, l_index);
 
-              console.log("重新开始加载" + l_index, modelData);
+              //console.log("重新开始加载" + l_index, modelData);
               console.log(exception);
             }
             else {
               modelInfo.dispose();
-              console.log(message);
+              LoadTool.remove(modelData.resPath + modelData.resName);
-              console.log(exception);
+              console.log(message, exception);
-              // alert("模型加载失败: " + message + "==" + exception);
+              alert("模型加载失败,请刷新页面重试: " + message + "==" + exception);
               // alert(exception);
               if (onError) {
                 onError(message)

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

@@ -53,7 +53,7 @@ export class ServeManager {
         let l_data = classToPlain(institutionData);
 
         console.log("保存单位", l_data);
-        this.buildingBISrv.postBuildingBasicInfos(key, l_data)
+        this.buildingBISrv.postBuildingBasicInfos(key, 1, l_data)
             .subscribe(data => {
                 console.log("保存单位成功：" + key, l_data);
                 if (onSuccess) {

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

@@ -54,6 +54,11 @@ export class StatusManager {
         newStatus.onEnter();
         return newStatus;
     }
+
+    static dispose() {
+        StatusManager.s_allStatus = [];
+        StatusManager.s_currentStatus = null;
+    }
 }
 
 

src/app/babylon/game.ts

@@ -54,6 +54,7 @@ export class Game {
 
     dispose() {
         SceneManager.Instance.dispose();
+        StatusManager.dispose();
         this.scene.dispose()
         this.scene = null;
         this.engine.dispose();

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

@@ -83,6 +83,10 @@ export class GizmoTool {
     GizmoTool.onTransformUITypeChange(TransformUIType.Hide);
   }
 
+  static dispose() {
+
+  }
+
   static onBeforeRender(
     eventData: Scene,
     eventState: EventState
@@ -195,7 +199,6 @@ export class GizmoTool {
   //改变Gizmo目标
   static changeGizmoAim(mesh: AbstractMesh, x: boolean = true, y = true, z = true) {
 
-
     GizmoTool.s_nowPickAim_mesh = mesh;
     GizmoTool.s_gizmoManager.attachToMesh(mesh);
     GizmoTool.s_gizmoManager.gizmos.positionGizmo.xGizmo.isEnabled = x;
@@ -427,6 +430,7 @@ export class GizmoTool {
 
     if (uiType == TransformUIType.Hide || !ModeManager.s_isMakeMode) { //隐藏选中框
       GizmoTool.s_boundingBoxGizmo.attachedMesh = null;
+
     }
 
   }

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

@@ -1,3 +1,4 @@
+import { PlanComponent } from "src/app/pages/plan/plan.component";
 
 /**
  * 加载管理器
@@ -49,16 +50,16 @@ export class LoadTool {
      * 开始加载
      */
     static onStart() {
-        console.log("开始加载");
+        // console.log("开始加载");
-        //ThreeDimensionalHomeComponent.instance.maskLayerService.sendMessage(true)
+        PlanComponent.instance.showLoading(true);
     }
 
     /**
      * 全部加载结束
      */
     static onEnd() {
-        console.log("结束加载");
+        // console.log("结束加载");
-        //ThreeDimensionalHomeComponent.instance.maskLayerService.sendMessage(false)
+        PlanComponent.instance.showLoading(false);
     }
 
 }

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

@@ -3,6 +3,7 @@
 import { AbstractMesh, Mesh, TransformNode } from "@babylonjs/core";
 import { ConfigManager } from "../../controller/config-manager";
 import { InfoManager } from "../../controller/info-manager";
+import { ModeManager, ModeType } from "../../controller/mode-manager";
 import { SceneManager } from "../../controller/scene-manager";
 import { IndoorStatus } from "../../controller/status/indoor-status";
 import { StatusManager } from "../../controller/status/status-manager";
@@ -161,7 +162,7 @@ export class BuildingUIItem {
      */
     onSelect(select: boolean, animMove = true) {
         if (select) {
-            if (this.buildingInfo.ModelInfo != null && this.buildingInfo.ModelInfo.modelBox != null) {
+            if (this.buildingInfo.ModelInfo != null && this.buildingInfo.ModelInfo.modelBox != null && ModeManager.currentMode == ModeType.Edit) {
                 GizmoTool.onPickMeshInfoObservable.notifyObservers(this.buildingInfo.ModelInfo);
                 //BabylonTool.changeCameraTarget(SceneManager.Instance.defaultCamera, this.buildingInfo.ModelInfo.modelBox, animMove);
             }

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

@@ -128,7 +128,7 @@ export class BuildingWindow extends UIBase {
             file.push(manifestFile); //临时关闭缓存文件
         }
 
-
+        PlanComponent.instance.showLoading(true);
         ServeManager.instance.uploadFile(0, file, resPath_out, (name: string, path: string, currentfile) => {
             if (TsTool.stringContain(name, ".gltf")) {
                 if (TsTool.stringContain(name, ".gltf.manifest")) {
@@ -150,6 +150,7 @@ export class BuildingWindow extends UIBase {
             }
         }
             , () => {
+                PlanComponent.instance.showLoading(false);
                 let buildingInfo = buildingWindow.getBuildingInfo(buildingData.normalData.key);
                 buildingWindow.updateBuildingModel(buildingInfo, true);
                 // buildingWindow.three = ThreeDimensionalHomeComponent.instance;
@@ -372,7 +373,7 @@ export class BuildingWindow extends UIBase {
             }
         }
 
-        console.log("选中建筑", modelInfo);
+        // console.log("选中建筑", modelInfo);
         this.showJYZModules(JYZInfoMoudleType.AQSS, false);
         this.showJYZModules(JYZInfoMoudleType.YQHSGX, false);
         this.showJYZModules(JYZInfoMoudleType.YQHSGX, false);
@@ -506,7 +507,7 @@ export class BuildingWindow extends UIBase {
             if (firstType == BuildingType.Environment) {
                 instance.createOneBuildingItem(firstItem, 0, (uiItem, index) => {
                     instance.onChangeCurrentBuildingItem(uiItem, false);
-                    uiItem.lookAt(false);
+                    // uiItem.lookAt(false);
                     if (buildingDatas_Environment.length > 1) {
                         instance.addBuildings(BuildingType.Environment, 1);
                     }
@@ -519,7 +520,7 @@ export class BuildingWindow extends UIBase {
             else {
                 instance.createOneBuildingItem(firstItem, 0, (uiItem, index) => {
                     instance.onChangeCurrentBuildingItem(uiItem, false);
-                    uiItem.lookAt(false);
+                    // uiItem.lookAt(false);
                     if (buildingDatas_mormal.length > 1) {
                         instance.addBuildings(BuildingType.Normal, 1);
                     }

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

@@ -178,31 +178,31 @@ export class FacilityInfoInSceneWindow extends UIBase {
      */
     showFacilityByType(facilityType: FacilityType, show: boolean) {
 
-        if (ModeManager.currentMode == ModeType.Look) {
+        // if (ModeManager.currentMode == ModeType.Look) {
-            for (let i = 0; i < this.facilityInfoUIItemes.length; i++) {
-                let l_facilityData = (this.facilityInfoUIItemes[i].modelInfo.modelData) as ModelData_facility;
-                if (facilityType == null || facilityType == l_facilityData.facilityType) {
-                    this.facilityInfoUIItemes[i].modelInfo.setEnable(show);
-                }
-                else if (show) {
-                    this.facilityInfoUIItemes[i].modelInfo.setEnable(false);
-                }
-            }
         //     for (let i = 0; i < this.facilityInfoUIItemes.length; i++) {
         //         let l_facilityData = (this.facilityInfoUIItemes[i].modelInfo.modelData) as ModelData_facility;
         //         if (facilityType == null || facilityType == l_facilityData.facilityType) {
-            //         this.facilityInfoUIItemes[i].modelInfo.setIconEnable(show);
+        //             this.facilityInfoUIItemes[i].modelInfo.setEnable(show);
         //         }
+        //         else if (show) {
+        //             this.facilityInfoUIItemes[i].modelInfo.setEnable(false);
         //         }
-        }
+        //     }
-        else {
+        //     // for (let i = 0; i < this.facilityInfoUIItemes.length; i++) {
+        //     //     let l_facilityData = (this.facilityInfoUIItemes[i].modelInfo.modelData) as ModelData_facility;
+        //     //     if (facilityType == null || facilityType == l_facilityData.facilityType) {
+        //     //         this.facilityInfoUIItemes[i].modelInfo.setIconEnable(show);
+        //     //     }
+        //     // }
+        // }
+        // else {
         for (let i = 0; i < this.facilityInfoUIItemes.length; i++) {
             let l_facilityData = (this.facilityInfoUIItemes[i].modelInfo.modelData) as ModelData_facility;
             if (facilityType == null || facilityType == l_facilityData.facilityType) {
                 this.facilityInfoUIItemes[i].modelInfo.setIconEnable(show);
             }
         }
-        }
+        // }
 
     }
 
@@ -483,7 +483,6 @@ export class FacilityInfoInSceneWindow extends UIBase {
         if (this.currentSelectJYJInfo != null) {
             let facilityItem: FacilityInfoUIItem = FacilityInfoInSceneWindow.instance.getFacilityItem(this.currentSelectJYJInfo);
             facilityItem.onSelect(false);
-            // this.playJYJSelectEffect(false, this.currentSelectJYJInfo);
             this.currentSelectJYJInfo = null;
         }
 
@@ -496,8 +495,6 @@ export class FacilityInfoInSceneWindow extends UIBase {
         try {
             let facilityInfosByType = BuildingWindow.instance.currentBuidngItem.buildingInfo.ModelInfo.facilityInfos;
 
-
-
             for (let i = 0; i < facilityInfosByType.length; i++) {
                 if ((currentMoudle == null || currentMoudle == JYZInfoMoudleType.JYJ) && facilityInfosByType[i].type == FacilityType.JY_JYJ ||
                     (currentMoudle == null || currentMoudle == JYZInfoMoudleType.YG) && facilityInfosByType[i].type == FacilityType.JY_YG) {
@@ -519,28 +516,18 @@ export class FacilityInfoInSceneWindow extends UIBase {
             for (let j = 0; j < childMesh.length; j++) {
                 if (pickInfo.pickedMesh == childMesh[j]) {
                     result = allJYJInfo[i];
-                    console.log("通过点击，找到加油机了");
-
                     break;
                 }
             }
         }
 
-
         if (result != null) {
-
-            //this.playJYJSelectEffect(true, result);
-
             if ((result.modelData as ModelData_facility).facilityType == FacilityType.JY_JYJ && currentMoudle == null) {
                 PlanComponent.instance.toggleHeaderFence(1);//在空状态下，点击加油机，跳转到加油机页签
             }
 
             let facilityItem: FacilityInfoUIItem = FacilityInfoInSceneWindow.instance.getFacilityItem(result);
-            console.log("场景中选中设备", facilityItem);  //通知前端
             this.selectFacilityItem(facilityItem);
-            // facilityItem.onSelect(true);
-            //FacilityInfoInSceneWindow.instance.selectFacilityItemToThree([facilityItem], true);
-            //console.log(facilityItem.getHeadUIPos());
         }
     }
 

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

@@ -189,6 +189,7 @@ export class MarkWindow extends UIBase {
      * 开启界面  
      */
     static openWindow(): MarkWindow {
+        console.log("进入沙盘");
         if (MarkWindow.instance == null) {
             SceneManager.s_markWindow = UIManager.open(MarkWindow);
         }

src/app/pages/left-domain/left-domain.component.ts

@@ -10,6 +10,7 @@ import { Event_GetAllMarkPlanData } from 'src/app/babylon/controller/event-manag
 import { AllMarkPlanData, MarkNodeData, MarkPlanData } from 'src/app/babylon/model/data/mark/mark-plan-data';
 import { MarkWindow } from 'src/app/babylon/view/mark-window/mark-window';
 import { NzMessageService } from 'ng-zorro-antd/message';
+import { ModeManager, ModeType } from 'src/app/babylon/controller/mode-manager';
 
 @Component({
   selector: 'app-left-domain',
@@ -197,7 +198,11 @@ export class LeftDomainComponent implements OnInit {
         this.selectNodeId = e.id
         MarkWindow.instance.selectMarkNode(item.id, e.id)
       } else { //已选中节点
-        let isTrue = confirm('切换节点后,没保存的信息将会丢失!')
+        let isTrue = true;
+        if (ModeManager.currentMode == ModeType.Edit) {
+          isTrue = confirm('切换节点后,没保存的信息将会丢失!')
+        }
+
         if (isTrue) {
           this.selectPlanId = item.id
           this.selectNodeId = e.id
@@ -205,7 +210,10 @@ export class LeftDomainComponent implements OnInit {
         }
       }
     } else if (this.selectPlanId === item.id && this.selectNodeId === e.id) { //取消选中
-      let isTrue = confirm('切换节点后,没保存的信息将会丢失!')
+      let isTrue = true;
+      if (ModeManager.currentMode == ModeType.Edit) {
+        isTrue = confirm('切换节点后,没保存的信息将会丢失!')
+      }
       if (isTrue) {
         this.selectPlanId = null
         this.selectNodeId = null

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

@@ -77,9 +77,9 @@ export class PlanComponent implements OnInit {
           this.beforeOneSatus = StatusManager.getStatus<LoginSatus>(LoginSatus);
           this.beforeOneSatus.onSelectInsSuccess(find)
         } else { //如果没有找到对应的单位key，则调用新建单位
-          let isAdd = confirm('没有单位name,是否进行初始化？')
+          let isAdd = confirm('没有单位' + key + ',是否进行初始化？')
           if (isAdd) {
-            let name = 'ceshi';
+            let name = key;
             loginStatus.createInsitution(key, name);
           }
         }
@@ -375,6 +375,13 @@ export class PlanComponent implements OnInit {
     this.message.info(title);
   }
 
+  /**
+   * 展示加载遮罩
+   * @param show 
+   */
+  showLoading(show: boolean) {
+    this.isShowLoading = show;
+  }
 
 
 }

src/app/service/babylon/building-basic-infos.service.ts

@@ -35,8 +35,8 @@ export class BuildingBasicInfosService {
    * @param name 
    * @param data 
    */
-  postBuildingBasicInfos(name: string, data: object): Observable<any> {
+  postBuildingBasicInfos(name: string, gasstationId: number, data: object): Observable<any> {
-    return this.postInfos(this.api_buildingInfo, name, data);
+    return this.postInfos(this.api_buildingInfo, data, { name: name, gasstationId: gasstationId });
   }
 
   /**
@@ -53,7 +53,7 @@ export class BuildingBasicInfosService {
    * @param data 
    */
   postMarkData(name: string, data: object): Observable<any> {
-    return this.postInfos(this.api_sandBox, name, data);
+    return this.postInfos(this.api_sandBox, data, { name: name });
   }
 
 
@@ -92,14 +92,11 @@ export class BuildingBasicInfosService {
    * @param name 
    * @param data 
    */
-  postInfos(api: string, name: string, data: object) {
+  postInfos(api: string, body: object, params = {}) {
-    let params = {
-      name: name,
-    };
 
     let headers = this.headers;
 
-    return this.http.post<any>(api + this.c_post, `'${JSON.stringify(data)}'`, { headers, params })
+    return this.http.post<any>(api + this.c_post, `'${JSON.stringify(body)}'`, { headers, params })
       .pipe(
         catchError((err) => this.handleError(err))
       );