diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts index a491273..41892e3 100644 --- a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts +++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts @@ -16,6 +16,7 @@ export class PropertyData_YG extends PropertyData_Base { constructor(key: string,oilProductNo: string,oilTankVolume: string,safeVolume: string,quantity: string,tankFarm: string,oilTankType: string) { super(key, FacilityType.JY_YG); + this.name = "未命名"; this.oilProductNo = oilProductNo this.oilTankVolume = oilTankVolume this.safeVolume = safeVolume @@ -26,6 +27,7 @@ export class PropertyData_YG extends PropertyData_Base { clone(key: string) { let result = new PropertyData_YG(key,this.oilProductNo,this.oilTankVolume,this.safeVolume,this.quantity,this.tankFarm,this.oilTankType); + result.name = this.name; return result; } diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 7314d40..d0782a8 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -18,8 +18,12 @@
-
-

{{item.getName()}}

+
+ +
+
+ +

品牌

@@ -33,7 +37,12 @@

-

+

+ + + + +

@@ -41,8 +50,12 @@
-
-

{{item.getName()}}

+
+ +
+
+ +

油品品号

@@ -58,7 +71,13 @@

-

+

+ + + + + +

diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss index af3f38d..5f39ec6 100644 --- a/src/app/pages/left-domain/left-domain.component.scss +++ b/src/app/pages/left-domain/left-domain.component.scss @@ -36,6 +36,7 @@ .publicBox{ width: 100%; height: 100%; overflow-y: auto; padding: 0 20px; } .title{ font-size: 16px; height: 20px; line-height: 20px; margin-bottom: 20px; .anticon{ margin-left: 5px; font-size: 16px; } } //头部header .tableInput{ border: none; outline: none; background-color: transparent; width: 100%; height: 100%; } +.tableSelect{ width: 100%; height: 100%; color: #fff; } .baseInfo{ //基本信息 .interval{ margin-top: 10px; border-bottom: 1px solid rgb(197, 226, 245); } //分隔div @@ -46,7 +47,11 @@ .textImage{ margin-bottom: 15px; height: auto; line-height: normal; img{ width: auto; height: 130px; } } } .refueller{ //加油机 - .interval{ margin-top: 10px; } //分隔div + .interval{ margin-top: 10px; position: relative; cursor: pointer; } //分隔div + .positionLeftTop { position: absolute; width: 10px; height: 10px; left: -5px; top: -5px; border-left: 1px solid #fff; border-top: 1px solid #fff; } //左上角 + .positionLeftBottom { position: absolute; width: 10px; height: 10px; left: -5px; bottom: -5px; border-left: 1px solid #fff; border-bottom: 1px solid #fff; } //左下角 + .positionRightTop { position: absolute; width: 10px; height: 10px; right: -5px; top: -5px; border-right: 1px solid #fff; border-top: 1px solid #fff; } //右上角 + .positionRightBottom { position: absolute; width: 10px; height: 10px; right: -5px; bottom: -5px; border-right: 1px solid #fff; border-bottom: 1px solid #fff; } //右下角 .table{ width: 100%; border: 1px solid #91CCFF; diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index 351f80a..e6dd912 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -56,6 +56,17 @@ export class LeftDomainComponent implements OnInit { } } + //选中 设备 + selectFacility(item: FacilityInfoUIItem) { + if (this.selectFacilityId != item.getID()) { + this.selectFacilityId = item.getID() + FacilityInfoInSceneWindow.instance.selectFacilityItem(item); + } else { + this.selectFacilityId = null + item.onSelect(false) + } + } + //处理 treeData handleTreeData(list: FacilityInfoUIItem[]) { this.treeData = [] diff --git a/src/styles.scss b/src/styles.scss index 90ea105..88c4e22 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -107,6 +107,7 @@ h1 { .ant-tree{ color: #C4E2FC; } .ant-tree,.ant-tree-node-content-wrapper:hover,.ant-tree-node-content-wrapper.ant-tree-node-selected { background-color: transparent; } .ant-tree-node-content-wrapper { width: 100%; } + .ant-select-single:not(.ant-select-customize-input) .ant-select-selector { border: none; border-radius: 0px; } //滚动条样式 ::-webkit-scrollbar { width: 5px;