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

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

@@ -18,7 +18,7 @@ export class ModeManager {
      * 当前模式的类型
      * 外部使用 currentMode 属性访问和修改
      */
-    private static s_currentMode: ModeType = ModeType.Edit;
+    private static s_currentMode: ModeType = ModeType.Look;
 
     /**
      * 制作模式代表内部编辑人员，可新增单位、上传模型，查看模式代表交付的模式

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

@@ -376,7 +376,7 @@ export class BuildingWindow extends UIBase {
         // console.log("选中建筑", modelInfo);
         this.showJYZModules(JYZInfoMoudleType.AQSS, false);
         this.showJYZModules(JYZInfoMoudleType.YQHSGX, false);
-        this.showJYZModules(JYZInfoMoudleType.YQHSGX, false);
+        this.showJYZModules(JYZInfoMoudleType.SYG, false);
         this.recoverMoudleShow(null);
 
         //this.onChangeCurrentBuildingItem(item);

src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts

@@ -98,10 +98,10 @@ export class FacilityInfoUIItem {
     }
     else {
       this.facilityInfoInSceneWindow.selectFacilityItemToThree([this], false);
-      if (!this.facilityInfoInSceneWindow.getFacilityUIShowType(this.getType())) {
+      // if (!this.facilityInfoInSceneWindow.getFacilityUIShowType(this.getType())) {
-        this.modelInfo.setIconEnable(select);
+      //   this.modelInfo.setIconEnable(select);
 
-      }
+      // }
       this.facilityInfoInSceneWindow.playJYJSelectEffect(select, this.modelInfo)
 
     }