diff --git a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts index 3442ea7..1dfa899 100644 --- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts +++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts @@ -164,9 +164,9 @@ export class FacilityInfoInSceneWindow extends UIBase { } } else { // 单选 if (isChecked) { //选中 - this.three.selectProperty(facilityInfoUIItem[0]) + this.three.selectProperty(facilityInfoUIItem[0]) } else { //取消选中 - + this.three.isShowNature = false } } diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index bdded79..a0220bb 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -48,7 +48,7 @@
-

+

品牌

@@ -57,10 +57,10 @@

油泵类型

-

-

-

-

+

+

+

+

@@ -74,7 +74,7 @@

-

+

油品品号

@@ -85,12 +85,12 @@

油罐类型

-

-

-

-

-

-

+

+

+

+

+

+

@@ -112,25 +112,25 @@

-

+

连接的加油机

连接的油罐

-

-

+

+

设计图纸

- -
+ +
- +
@@ -138,30 +138,30 @@
-

+

油气回收系统类型

油气回收泵类型

-

+

-

+

设计图纸

- -
+ +
- +
diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index 4fcf754..22564e0 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -101,8 +101,6 @@ export class LeftDomainComponent implements OnInit { //选中 设备 selectFacility(event, item: FacilityInfoUIItem) { - event.stopPropagation(); - event.preventDefault(); if (this.selectFacilityId != item.getID()) { this.selectFacilityId = item.getID() FacilityInfoInSceneWindow.instance.selectFacilityItem(item); @@ -112,6 +110,12 @@ export class LeftDomainComponent implements OnInit { } } + //阻止 事件冒泡 + stopBubbling(event) { + event.stopPropagation(); + //event.preventDefault(); + } + //上传设备 图片 uploadLeftDomainImg(e, item: FacilityInfoUIItem) { if (e.target.files.length) {