wIASA%#%_l0UlOW~1`$eyRfy3-B#=he%$SK*N(5gI%U#b+;f3n<7Ci8JEf
z91nG@J3cDZ;c96!C`0hz?(Hr*LW0ObUe%PYkc8L(mAmOjT;<(O7HxU2<(3U5A{^O?
z!8mZ;fO|EqtKjM+#&~}*E@%v3Kzm#njxtz1#TnCsSzEz-@e%Ohf$QL#T00VLkH|a7
zDD{t6dw&Vp*FV{=X^>^c^#
z2-0DrOGtLH#YWq1UWhbM&{B;SjiI*=ADiS(Vc#u
z9o9A_MGjrf5NzT(qlHqdQ@=Z{gasJZ$Vy}krAXH-C0$x=0|IPQR_4%D5Sj{#q2PIz
zr&g(Oo&gl}=`BQr?vky;L_ip}QTRhZsz9(qxV{`+=|1;hZ-$2Np#f4WVkt0#P#R7N
zhA@QKeum&F)e?|uLU4})UvoV2A1xz~`vcY{`+rV2G)?GGv+e)@002ovPDHLkV1mn@
BAhZAg
literal 0
HcmV?d00001
diff --git a/src/assets/images/measuredArea.png b/src/assets/images/measuredArea.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c38e7bf1a998d4322520cbedd8331086ee9e123
GIT binary patch
literal 2842
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
literal 0
HcmV?d00001
diff --git a/src/assets/images/rangeFinding.png b/src/assets/images/rangeFinding.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4c79f614c03a0c65d7f3a2d8c2c0977949e6612
GIT binary patch
literal 2522
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
literal 0
HcmV?d00001
From 473179f34a9060eed960faae2ceaee7a4c2ee33d Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Fri, 5 Nov 2021 15:55:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?header=E5=8A=9F=E8=83=BD=E6=A0=8F=E5=AF=B9?=
=?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/plan/plan.component.ts | 37 +++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index e36af80..ee714f7 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -11,7 +11,7 @@ import { ToolbarWindow } from 'src/app/babylon/view/toolbar-window/toobar-window
import { BuildingStatus } from 'src/app/babylon/controller/status/building-status';
import { BuildingUIItem } from 'src/app/babylon/view/building-window/building-ui-item';
import { BuildingType } from 'src/app/babylon/model/data/institution/building/building-data';
-import { BuildingWindow } from 'src/app/babylon/view/building-window/building-window';
+import { BuildingWindow, JYZInfoMoudleType } from 'src/app/babylon/view/building-window/building-window';
import { FacilityUIItem } from 'src/app/babylon/view/facility-window/facility-ui-item';
import { FacilityWindow } from 'src/app/babylon/view/facility-window/facility-window';
import { FacilityInfoUIItem } from 'src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item';
@@ -93,13 +93,44 @@ export class PlanComponent implements OnInit {
modelInit(InsList) { }
allFence: string[] = ["基本信息", "加油机", "油罐设备", "消防设施", "安全疏散", "输油管线", "油气回收", "应急处置"]; //头部 功能栏
- selectFence: number = 0; //选中 头部功能栏
+ selectFence: number = -1; //选中 头部功能栏
+ isShowChildComponent: boolean = false; //是否 显示左侧子组件
isOpenAwning: boolean = true; //是否 打开罩棚
selectMeasure: number = 0; //当前选择 测量工具
//切换 头部功能栏
toggleHeaderFence(type: number) {
- this.selectFence = type
+ this.beforeOneSatus = StatusManager.getStatus(BuildingStatus);
+ let buildingWindow: BuildingWindow = this.beforeOneSatus.buildingWindow;
+ let fenceType: JYZInfoMoudleType = this.getFenceType(type)
+ if (this.selectFence != type) {
+ this.selectFence = type
+ this.isShowChildComponent = true
+ type>0 && type<7? buildingWindow.showJYZInfoModel(fenceType, true) : null
+ } else { //取消选中
+ this.selectFence = -1
+ this.isShowChildComponent = false
+ type>0 && type<7? buildingWindow.showJYZInfoModel(fenceType, false) : null
+ }
+ }
+
+ //获取 头部功能栏Type
+ getFenceType(type: number): JYZInfoMoudleType {
+ let fenceType
+ if (type === 1) {
+ fenceType = JYZInfoMoudleType.JYJ
+ } else if (type === 2) {
+ fenceType = JYZInfoMoudleType.YG
+ } else if (type === 3) {
+ fenceType = JYZInfoMoudleType.XF
+ } else if (type === 4) {
+ fenceType = JYZInfoMoudleType.TSLX
+ } else if (type === 5) {
+ fenceType = JYZInfoMoudleType.SYG
+ } else if (type === 6) {
+ fenceType = JYZInfoMoudleType.YQHSGX
+ }
+ return fenceType
}
//切换 头部罩棚