刘向辉 3 years ago
parent
commit
81bc202e7d
  1. 4
      src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts
  2. 17
      src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts

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

@ -100,9 +100,9 @@ export class FacilityInfoUIItem {
this.facilityInfoInSceneWindow.selectFacilityItemToThree([this], false); 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)
}
}
this.facilityInfoInSceneWindow.playJYJSelectEffect(select, this.modelInfo)
} }
} }

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

@ -165,10 +165,13 @@ export class FacilityInfoInSceneWindow extends UIBase {
if (isChecked) { //选中 if (isChecked) { //选中
this.three.beforeOnefacilityInfo = facilityInfoUIItem[0].getID(); this.three.beforeOnefacilityInfo = facilityInfoUIItem[0].getID();
this.three.getPropertyData(facilityInfoUIItem[0]) this.three.getPropertyData(facilityInfoUIItem[0])
console.log("通知前端选中设备", facilityInfoUIItem[0]);
} else { //取消选中 } else { //取消选中
// this.three.isShowRightNature = false // this.three.isShowRightNature = false
this.three.beforeOnefacilityInfo = null this.three.beforeOnefacilityInfo = null
} }
} }
} }
@ -543,14 +546,14 @@ export class FacilityInfoInSceneWindow extends UIBase {
*/ */
playJYJSelectEffect(play: boolean, facilityInfo: ModelInfo_facility) { playJYJSelectEffect(play: boolean, facilityInfo: ModelInfo_facility) {
if (play) { //if (play) {
let facilityData = facilityInfo.modelData as ModelData_facility; let facilityData = facilityInfo.modelData as ModelData_facility;
if (facilityData.facilityType != FacilityType.JY_JYJ && if (facilityData.facilityType != FacilityType.JY_JYJ &&
facilityData.facilityType != FacilityType.JY_YG) { facilityData.facilityType != FacilityType.JY_YG) {
//只有加油机和油罐有高亮显示 //只有加油机和油罐有高亮显示和取消
return; return;
}
} }
//}
if (play) { if (play) {

Loading…
Cancel
Save