完善

README.md

@@ -1,5 +1,26 @@
 # 中国石化加油站项目
 
+## 🌼v1.1.2
+
+### 🌻 简介
+
+> 时间：未发布
+> 优化
+
+### 🌻 详情
+
+> 前端部分
+
+- [🚩 重大变更]
+- [🌱 新增]
+- [🍀 完善]
+
+> 三维部分
+
+- [🚩 重大变更]
+- [🌱 新增]
+- [🍀 完善] 优化新增单位时初始化设备的操作流程
+
 ## 🌼v1.1.1
 
 ### 🌻 简介
@@ -19,7 +40,7 @@
 
 - [🚩 重大变更]
 - [🌱 新增] 新增阀门模块
-- [🍀 完善]
+- [🍀 完善] 修复 buildinginfo 和 buildingwindow 释放时没有释放 update 问题（之前会造成视角高度锁定不争取）
 
 ## 🌼v1.1.0
 

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config  proxy.config.json  --open --port 4000 ",
+    "start": "ng serve --proxy-config  proxy.config.json  --open --port 4200 ",
     "build": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
@@ -81,4 +81,4 @@
     "tslint": "~5.15.0",
     "typescript": "~3.7.5"
   }
-}
+}

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

@@ -748,6 +748,10 @@ export class BuildingWindow extends UIBase {
 
         this.clearHomeLessFacilityData();
 
+        if (this.currentBuidngItem == null && this.buildingUIItems.length > 0) {
+            this.onChangeCurrentBuildingItem(this.buildingUIItems[0])
+        }
+
         if (this.currentBuidngItem != null) {
             //获取所有transformNodes
             let allNode = this.currentBuidngItem.buildingInfo.ModelInfo.modelBox.getChildMeshes(false);
@@ -776,6 +780,9 @@ export class BuildingWindow extends UIBase {
 
             }
         }
+        else {
+            console.log("currentBuidngItem is null")
+        }
 
 
     }

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

@@ -465,7 +465,10 @@ export class FacilityWindow extends UIBase {
             //模型类的，等加载完模型再设置transform信息，因为要把模型的position等数值和数据层的position等数据指向同一引用，方便后续调整后的同步
         }
         else {
-            this.setFacilityTransform(isLocalPos, isNew, facilityData, buildingInfo, defaultMesh, facilityInfo);
+            if (mesh == null) {
+                this.setFacilityTransform(isLocalPos, isNew, facilityData, buildingInfo, defaultMesh, facilityInfo);
+            }
+
         }
 
 

src/assets/js/abp.signalr-client.js

@@ -33,14 +33,14 @@ var abp = abp || {};
                         console.log('Reconnected to SignalR server!');
                         abp.event.trigger('abp.signalr.reconnected');
                     }).catch(function () {
-                    tries += 1;
-                    reconnectTime = abp.signalr.increaseReconnectTime(reconnectTime);
-                    setTimeout(function () {
+                        tries += 1;
+                        reconnectTime = abp.signalr.increaseReconnectTime(reconnectTime);
+                        setTimeout(function () {
                             tryReconnect()
                         },
-                        reconnectTime
-                    );
-                });
+                            reconnectTime
+                        );
+                    });
             }
         }
 
@@ -55,7 +55,7 @@ var abp = abp || {};
             if (!abp.signalr.autoReconnect) {
                 return;
             }
-            
+
             abp.event.trigger('abp.signalr.disconnected');
             tryReconnect();
         });
@@ -84,7 +84,7 @@ var abp = abp || {};
                 abp.log.debug(error.message);
             });
     }
-    abp.signalr.disconnect = function() {
+    abp.signalr.disconnect = function () {
         abp.signalr.autoReconnect = false
         abp.signalr.hubs.common.stop()
     };