From 49d446d6cbb8634a59403f89a0cc519404d31dca Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Fri, 19 Nov 2021 16:55:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=B2=B9=E6=9C=BA=E6=B2=B9=E7=BD=90?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=A0=8F=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property-data/in/property-data-jyj.ts | 6 +++++ src/app/pages/plan/plan.component.html | 24 ++++++++++++++++++ src/app/pages/plan/plan.component.scss | 25 ++++++++++++++++++- src/app/pages/plan/plan.component.ts | 8 ++++++ 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts index e06fede..ea673a0 100644 --- a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts +++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts @@ -12,6 +12,8 @@ export class PropertyData_JYJ extends PropertyData_Base { oilGunNum: string = ""; //油枪数量 oilProductNo: string = ""; //油品品号 oilPumpType: string = ""; //油泵类型 + flow: string = ""; //流量 + power: string = ""; //功率 constructor(key: string, brand: string, superBrand: string, oilGunNum: string, oilProductNo: string, oilPumpType: string) { super(key, FacilityType.JY_JYJ); @@ -21,11 +23,15 @@ export class PropertyData_JYJ extends PropertyData_Base { this.oilGunNum = oilGunNum this.oilProductNo = oilProductNo this.oilPumpType = oilPumpType + this.flow = "0.5kg/s" + this.power = "1kw" } clone(key: string) { let result = new PropertyData_JYJ(key, this.brand, this.superBrand, this.oilGunNum, this.oilProductNo, this.oilPumpType); result.name = this.name; + result.flow = this.flow; + result.power = this.power; return result; } diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index 668ea93..9978d24 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -70,6 +70,30 @@
+
+
+
{{beforeOnePropertyData.getPropertyData().name}}
+
+
+ + +
+
+ + +
+
+
品牌 :
+
油枪数量 :
+
油品品号 :
+
+
+
{{beforeOnePropertyData.getPropertyData().name}}
+
油品品号 :
+
油罐容积 :
+
安全容积 :
+
+
diff --git a/src/app/pages/plan/plan.component.scss b/src/app/pages/plan/plan.component.scss index 38aa25f..4dcc908 100644 --- a/src/app/pages/plan/plan.component.scss +++ b/src/app/pages/plan/plan.component.scss @@ -188,7 +188,6 @@ color: #C4E2FC; font-size: 14px; background: linear-gradient(360deg, #000D21 0%, rgba(0, 59, 110, 0.8) 100%); - overflow: hidden; .natureHeader{ text-align: right; height: 10px; .anticon{ font-size: 18px; margin: 5px 5px 0 0; } } .natureContent{ box-sizing: border-box; @@ -200,6 +199,30 @@ .natureUpload{ margin: 0; text-align: center; width: 50px; height: 50px; line-height: 50px; } } } +.natureLook{ + width: auto; + min-width: 170px; + box-sizing: border-box; + padding: 20px; + color: #fff; + .flowPower{ + width: 200px; + height: 50px; + display: flex; + font-size: 12px; + margin-bottom: 8px; + div{ flex: 1; line-height: 50px; margin-left: -10px; } + img { width: 40%; height: auto; vertical-align: top; } + label { display: inline-block; width: 60%; height: 100%; overflow: hidden; } + p{ width: 100%; height: 25px; line-height: 25px; margin: 0; } + input{ border: none; outline: none; background-color: transparent; width: 100%; height: 100%; } + } + .everyNature{ + margin-bottom: 8px; + font-size: 12px; + span{ margin-right: 10px; } + } +} //右侧图标栏 .rightIcons{ diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 5e4b45e..3d1ace7 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -116,6 +116,7 @@ export class PlanComponent implements OnInit { this.beforeOneSatus = StatusManager.getStatus(BuildingStatus); let buildingWindow: BuildingWindow = this.beforeOneSatus.buildingWindow; let fenceType: JYZInfoMoudleType = this.getFenceType(type) + this.isShowNature = false //隐藏属性栏 if (this.selectFence != type) { this.isShowChildComponent && this.leftDomain && type != 4 ? this.leftDomain.initComponent(type) : null; //手动初始化子组件 this.selectFence = type @@ -302,6 +303,7 @@ export class PlanComponent implements OnInit { isShowNature: boolean = false; //显隐设备 属性栏 beforeOnePropertyData: FacilityInfoUIItem = null; //当前选择 设备 + naturePosition: naturePosition = new naturePosition(); //设备栏 定位位置 //选中 设备 selectProperty(e: FacilityInfoUIItem) { @@ -388,6 +390,12 @@ export class PlanComponent implements OnInit { } +//属性栏 定位 +export class naturePosition { + top: string = "1%" + left: string = "50%" + right: string = "5%" +} // 处置预案 所有图标 export class planIcons { iconsName: string[] = ["灾情", "内部力量", "外部力量", "其他"]