合并代码

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

@@ -780,11 +780,11 @@ export class BuildingWindow extends UIBase {
 
         if (type == JYZInfoMoudleType.YJCZ) {
             if (show) {
-                console.log("进入应急处置");
+                // console.log("进入应急处置");
                 MarkWindow.openWindow();
             }
             else {
-                console.log("退出应急处置");
+                // console.log("退出应急处置");
                 MarkWindow.closeWindow();
             }
 

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

@@ -178,10 +178,7 @@ export class FacilityWindow extends UIBase {
 
                 instance.allFacilityUIItemes.push(facilityUIItem);
             }
-
-            console.log("所有可用的设备", instance.allFacilityUIItemes);
-
-
+            // console.log("所有可用的设备", instance.allFacilityUIItemes);
             PlanComponent.instance.getAllIcons(instance)
 
         })

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

@@ -199,7 +199,7 @@ export class MarkWindow extends UIBase {
      * 开启界面  
      */
     static openWindow(): MarkWindow {
-        console.log("进入沙盘");
+        // console.log("进入沙盘");
         if (MarkWindow.instance == null) {
             SceneManager.s_markWindow = UIManager.open(MarkWindow);
         }
@@ -222,7 +222,7 @@ export class MarkWindow extends UIBase {
             MarkWindow.instance.shouWaterSource(false);
             UIManager.hide(MarkWindow.instance);
         }
-        console.log("退出沙盘");
+        // console.log("退出沙盘");
     }
 
     /**
@@ -263,7 +263,7 @@ export class MarkWindow extends UIBase {
             copyNodeData.name = oldNodeData.name;
         }
 
-        console.log("记录的数据", copyNodeData.texture, this.currentMarkNodeInfo.nodeData.texture);
+        //console.log("记录的数据", copyNodeData.texture, this.currentMarkNodeInfo.nodeData.texture);
 
         markPlaneData.setNodeData(nodeId, copyNodeData);//覆盖数据
 
@@ -285,7 +285,7 @@ export class MarkWindow extends UIBase {
      * 在沙盘节点中点击UI、 切换楼层或室内外，相当于清空
      */
     changeBuilding(isOutdoor: boolean = false, buildingId: string = null, floorId: string = null) {
-        console.log("沙盘内切换", isOutdoor, buildingId, floorId);
+        // console.log("沙盘内切换", isOutdoor, buildingId, floorId);
         if (this.currentMarkNodeInfo == null) {
 
             this.selectMarkNode(null, null, true);
@@ -362,7 +362,7 @@ export class MarkWindow extends UIBase {
         }
         else {
             if (nodeCopy == null) {
-                console.log("拷贝游离节点 2");
+                // console.log("拷贝游离节点 2");
                 nodeCopy = this.createLeaveNode();
                 this.savCurrentNodeData(nodeCopy);
             }
@@ -875,7 +875,7 @@ export class MarkWindow extends UIBase {
 
                 if (eventData.type == PointerEventTypes.POINTERDOUBLETAP) {
                     //双击标绘物，打开任务界面
-                    console.log("打开属性面板");
+                    // console.log("打开属性面板");
                     instance.openProperty(l_markInfo);
                     readyCreateMark = false; //双击，必然不创建标绘物
                 }
@@ -883,7 +883,7 @@ export class MarkWindow extends UIBase {
                     if (eventData.event.button == 0)//左键
                     {
                         if (!instance.isCreateMultiPointMark()) {
-                            console.log("选中标绘物", l_markInfo);
+                            // console.log("选中标绘物", l_markInfo);
                             instance.selectMarkDataFrom3d(l_markInfo, true);
                         }
                     }
@@ -1069,7 +1069,7 @@ export class MarkWindow extends UIBase {
 
         markNodeData.cameraData.getDataFromCamera(SceneManager.Instance.defaultCamera);
         markNodeData.showZP = BuildingWindow.instance.currentZPShow;
-        console.log("记录节点", markNodeData);
+        // console.log("记录节点", markNodeData);
     }
 
     /**

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

@@ -63,17 +63,18 @@ export class WeatherTool {
         WeatherTool.instance = this;
 
         let instance = this;
-        ParticleSystemTool.instance.loadPrefab("rain", "assets/particlesystem/rain/rain.json", false, (ps) => {
-            instance.effect_rain = ps;
-            ps.emitter = instance.followRoot;
-            console.log("下雨加载完成");
-        })
-
-        ParticleSystemTool.instance.loadPrefab("snow", "assets/particlesystem/snow/snow.json", false, (ps) => {
-            instance.effect_snow = ps;
-            ps.emitter = instance.followRoot;
-            console.log("下雪加载完成");
-        })
+        //暂时不需要天气
+        // ParticleSystemTool.instance.loadPrefab("rain", "assets/particlesystem/rain/rain.json", false, (ps) => {
+        //     instance.effect_rain = ps;
+        //     ps.emitter = instance.followRoot;
+        //     console.log("下雨加载完成");
+        // })
+
+        // ParticleSystemTool.instance.loadPrefab("snow", "assets/particlesystem/snow/snow.json", false, (ps) => {
+        //     instance.effect_snow = ps;
+        //     ps.emitter = instance.followRoot;
+        //     console.log("下雪加载完成");
+        // })
 
     }
 

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

@@ -126,8 +126,7 @@ export class LeftDomainComponent implements OnInit {
         return
       }
       PlanComponent.instance.isShowLoading = true //打开遮罩
-      //let institutionKey = PlanComponent.instance.companyData.id || "ceshi"; //单位id
-      let institutionKey = DataManager.institutionData_simple.key;
+      let institutionKey = `${PlanComponent.instance.companyData.id}` || "ceshi"; //单位id
       let buildingKey = PlanComponent.instance.buildingUIItems.find(item => { return item.getBuildingID() == PlanComponent.instance.beforeOneBuildingID })
       let url = DataManager.getResPath_facilityProperty(institutionKey, buildingKey.getBuildingID(), item.getType(), item.getID(), null)
       ServeManager.instance.openFileSelect(file, url, (name: string, path: string) => { //上传