From 81bc202e7d04fdbc3b5a86d8b7607346e53018da Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Thu, 11 Nov 2021 16:00:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../facilityinfo-ui-item.ts                     |  4 ++--
 .../facilityinfoinscene-window.ts               | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts b/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts
index 5df9528..f9126ba 100644
--- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts
+++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts
@@ -100,9 +100,9 @@ export class FacilityInfoUIItem {
       this.facilityInfoInSceneWindow.selectFacilityItemToThree([this], false);
       if (!this.facilityInfoInSceneWindow.getFacilityUIShowType(this.getType())) {
         this.modelInfo.setIconEnable(select);
-        this.facilityInfoInSceneWindow.playJYJSelectEffect(select, this.modelInfo)
-      }
 
+      }
+      this.facilityInfoInSceneWindow.playJYJSelectEffect(select, this.modelInfo)
 
     }
   }
diff --git a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
index ec58012..91dc478 100644
--- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
+++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
@@ -165,10 +165,13 @@ export class FacilityInfoInSceneWindow extends UIBase {
             if (isChecked) { //选中
                 this.three.beforeOnefacilityInfo = facilityInfoUIItem[0].getID();
                 this.three.getPropertyData(facilityInfoUIItem[0])
+                console.log("通知前端选中设备", facilityInfoUIItem[0]);
             } else { //取消选中
                 // this.three.isShowRightNature = false
                 this.three.beforeOnefacilityInfo = null
+
             }
+
         }
     }
 
@@ -543,14 +546,14 @@ export class FacilityInfoInSceneWindow extends UIBase {
      */
     playJYJSelectEffect(play: boolean, facilityInfo: ModelInfo_facility) {
 
-        if (play) {
-            let facilityData = facilityInfo.modelData as ModelData_facility;
-            if (facilityData.facilityType != FacilityType.JY_JYJ &&
-                facilityData.facilityType != FacilityType.JY_YG) {
-                //只有加油机和油罐有高亮显示
-                return;
-            }
+        //if (play) {
+        let facilityData = facilityInfo.modelData as ModelData_facility;
+        if (facilityData.facilityType != FacilityType.JY_JYJ &&
+            facilityData.facilityType != FacilityType.JY_YG) {
+            //只有加油机和油罐有高亮显示和取消
+            return;
         }
+        //}
 
 
         if (play) {