From 26d942c20aee78b4346385375a00856782575357 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Sat, 27 Nov 2021 14:42:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/plan/plan.component.html | 5 +---- src/app/pages/plan/plan.component.ts | 27 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index 51e3786..b8d62e3 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -7,10 +7,7 @@
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index efa6323..10b3eb5 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -27,6 +27,8 @@ import { AllMarkPlanData, MarkNodeData, MarkPlanData } from 'src/app/babylon/mod import { DataManager, ResType } from 'src/app/babylon/controller/data-manager'; import { EventManager as babylonEventManager } from 'src/app/babylon/controller/event-manager/event-manager'; import { Event_GetAllMarkPlanData } from 'src/app/babylon/controller/event-manager/events/event-get-markplandata-success'; +import { FacilityInfoInSceneWindow } from 'src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window'; +import { FacilityType } from 'src/app/babylon/model/data/model-data/model-data-facility'; @@ -122,6 +124,7 @@ export class PlanComponent implements OnInit { modelInit(InsList) { } allFence: string[] = ["基本信息", "加油机", "油罐设备", "消防设施", "安全疏散", "输油管线", "油气回收", "应急预案"]; //头部 功能栏 + baseInfoMarks: baseInfoMark[] = [new baseInfoMark("毗邻"), new baseInfoMark("区域"), new baseInfoMark("图片"), new baseInfoMark("点位")] //基本信息 设备筛选list selectFence: number = -1; //选中 头部功能栏 isShowChildComponent: boolean = false; //是否 显示左侧子组件 @ViewChild('leftDomain') leftDomain: LeftDomainComponent; //子组件引用 @@ -154,6 +157,7 @@ export class PlanComponent implements OnInit { this.selectFence = type this.isShowChildComponent = true buildingWindow.changeJYZInfoModel(fenceType, true) + if (type === 0) { this.baseInfoMarks.forEach(item=>{ item.isShow = true }) } //初始化基本信息 设备显隐 } } else { //取消选中 this.selectFence = -1 @@ -188,6 +192,21 @@ export class PlanComponent implements OnInit { return fenceType } + //基本信息 设备筛选显隐 + toggleBaseInfoMark(event, item: baseInfoMark) { + let type + if (item.markerName === "毗邻") { + type = FacilityType.PL + } else if (item.markerName === "区域") { + type = FacilityType.QY + } else if (item.markerName === "图片") { + type = FacilityType.TPBZ + } else if (item.markerName === "点位") { + type = FacilityType.DWBZ + } + FacilityInfoInSceneWindow.instance.showFacilityByType(type, event) + } + //子组件 创建预案/保存 noticeChildComponent(type: boolean) { if (this.isShowChildComponent && this.leftDomain) { @@ -787,3 +806,11 @@ export class modelBuilding { name: string = ""; modelType: BuildingType = BuildingType.Normal; } +//基本信息 设备筛选 +export class baseInfoMark{ + markerName: string; + isShow: boolean = true; + constructor(markerName: string) { + this.markerName = markerName + } +} From bb8406e77b15fc8b9f746c3e66fd8685fa8a9155 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Sat, 27 Nov 2021 17:00:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-domain/left-domain.component.html | 45 +++++++++++++++---- .../left-domain/left-domain.component.scss | 3 +- .../left-domain/left-domain.component.ts | 14 +++++- src/app/pages/plan/plan.component.html | 2 +- src/app/pages/plan/plan.component.ts | 34 +++++++------- 5 files changed, 70 insertions(+), 28 deletions(-) diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 1cf03f4..ff2a673 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -2,17 +2,46 @@
-
+
-

北京市第十九加油站

-

北京市朝阳区朝外大街关东店33号

-

山东省淄博市

-

2020.7.26开业

-

4车道

+

{{baseInfo.stationName || '暂无数据'}}

+

{{baseInfo.address || '暂无数据'}}

+

{{baseInfo.locationName || '暂无数据'}}

+

{{baseInfo.openTime | date:"yyyy/MM/dd HH:mm:ss" || '0:00:00'}} 开业

+

{{baseInfo.laneCount || '0'}} 车道

-
+
+

辖区派出所

+

{{baseInfo.govUnitDetail.policeStation.name || '暂无数据'}}

+

{{baseInfo.govUnitDetail.policeStation.address || '暂无数据'}}

+

{{baseInfo.govUnitDetail.policeStation.contactInformation || '暂无数据'}}

+

{{baseInfo.govUnitDetail.policeStation.distance || '0公里'}}

+
+
+

辖区医院

+

{{baseInfo.govUnitDetail.hospital.name || '暂无数据'}}

+

{{baseInfo.govUnitDetail.hospital.address || '暂无数据'}}

+

{{baseInfo.govUnitDetail.hospital.contactInformation || '暂无数据'}}

+

{{baseInfo.govUnitDetail.hospital.distance || '0公里'}}

+
+
+

辖区消防队

+

{{baseInfo.govUnitDetail.fireBrigade.name || '暂无数据'}}

+

{{baseInfo.govUnitDetail.fireBrigade.address || '暂无数据'}}

+

{{baseInfo.govUnitDetail.fireBrigade.contactInformation || '暂无数据'}}

+

{{baseInfo.govUnitDetail.fireBrigade.distance || '0公里'}}

+
+

营业执照

-

+

+
+
+

危险化学品经营许可证

+

+
+
+

成品油零售经营许可证

+

diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss index b536e03..07efc39 100644 --- a/src/app/pages/left-domain/left-domain.component.scss +++ b/src/app/pages/left-domain/left-domain.component.scss @@ -45,7 +45,8 @@ } .baseInfo{ //基本信息 - .interval{ margin-top: 10px; border-bottom: 1px solid rgb(197, 226, 245); } //分隔div + .interval{ margin-top: 10px; border-bottom: 1px solid rgb(107, 117, 122); } //分隔div + .baseInfoImg{ border: none; } p{ height: 20px; line-height: 20px; } .titleBotton{ background: #2399FF; border-radius: 3px; height: 20px; line-height: 20px; font-size: 12px; margin-left: 5px; padding: 0 5px; border: none; outline: none; } .text{ font-size: 14px; margin-bottom: 15px; } diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index c665943..f162dbf 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -15,6 +15,7 @@ import { DataManager } from 'src/app/babylon/controller/data-manager'; import { ServeManager } from 'src/app/babylon/controller/serve-manager'; import { ObjectsService } from 'src/app/service/objects.service'; import Viewer from 'viewerjs'; +import { HttpClient } from '@angular/common/http'; @Component({ selector: 'app-left-domain', @@ -23,7 +24,7 @@ import Viewer from 'viewerjs'; }) export class LeftDomainComponent implements OnInit { - constructor(private message: NzMessageService, private element: ElementRef) { } + constructor(private message: NzMessageService, private element: ElementRef, private http: HttpClient) { } ngOnInit(): void { this.editMode = PlanComponent.instance.editMode @@ -34,6 +35,7 @@ export class LeftDomainComponent implements OnInit { beforeFence: number; //当前选中功能栏 FacilityList: FacilityInfoUIItem[] = []; //统计设备 list selectFacilityId: string = null; //选中设备 ID + baseInfo: any; //基本信息 //初始化组件 initComponent(type?: number) { @@ -48,6 +50,16 @@ export class LeftDomainComponent implements OnInit { //处理 设备data handleFacility() { + if (this.beforeFence === 0) { //基本信息 + if (!this.baseInfo) { + let params = { organizationUnitId: PlanComponent.instance.companyData.id } + this.http.get('/api/services/app/GasStation/Get', { params: params }).subscribe((data: any)=>{ + data.result.govUnitDetail? data.result.govUnitDetail = JSON.parse(data.result.govUnitDetail) : null + this.baseInfo = data.result + }) + } + return + } if (this.beforeFence === 7) { //应急预案 this.selectPlanId = null this.selectNodeId = null diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index b8d62e3..8769b30 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -23,7 +23,7 @@ -
+
{{allFence[selectFence]}}
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 10b3eb5..48c179c 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -49,12 +49,14 @@ export class PlanComponent implements OnInit { public userMode: boolean = ModeManager.s_isMakeMode; //是否为 内部权限 public bucketName: string = ObjectsService.getFullPath("文件路径"); //当前桶名 public isShowLoading: boolean = true; //显隐 loading加载条 + public companyData: any; //当前加油站 信息 ngOnInit(): void { PlanComponent.instance = this; ServeManager.Init(this.buildingBISrv, this.objectsSrv); this.canvas = this.element.nativeElement.querySelector('#center') as HTMLCanvasElement; this.game.init(this.canvas); + this.companyData = (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization || {} let editMode = sessionStorage.getItem('isGasStation') if (editMode == 'false') { this.editMode = true @@ -77,9 +79,9 @@ export class PlanComponent implements OnInit { ngAfterViewInit(): void { let simpleData: InsitutionDataSimple = new InsitutionDataSimple(); - simpleData.id = 1; //来自选中的单位的信息 ,测试:1 - simpleData.key = "ceshi"; //正式: id.tostring(),测试:"ceshi" - simpleData.name = "测试"; //来自选中的单位的信息 ,测试:"测试" + simpleData.id = 1; //来自选中的单位的信息 ,测试:1 + simpleData.key = "ceshi"; //正式: id.tostring(),测试:"ceshi" + simpleData.name = this.companyData.displayName || "测试"; //来自选中的单位的信息 ,测试:"测试" let has3dData = true;//是否有三维数据,来自选中单位的信息 let loginStatus = StatusManager.getStatus(LoginSatus); @@ -92,8 +94,8 @@ export class PlanComponent implements OnInit { { let isAdd = confirm('没有单位' + simpleData.key + ',是否进行初始化?') if (isAdd) { - let name = simpleData.key; - let id = 2;// 单位id + let name = simpleData.name; + let id = simpleData.id;// 单位id loginStatus.createInsitution(simpleData.key, name, id); } } @@ -144,7 +146,7 @@ export class PlanComponent implements OnInit { if (type === 7) { //初始化 应急预案 data this.isShowChildComponent && this.leftDomain? this.leftDomain.initComponent(type) : null; //手动初始化子组件 this.selectFence = type - this.isShowChildComponent = true + this.editMode? this.isShowChildComponent = true : this.isShowChildComponent = false buildingWindow.changeJYZInfoModel(fenceType, true) MarkWindow.instance ? this.allMarkPlanData = MarkWindow.instance.allMarkPlanData : null; babylonEventManager.addListener(Event_GetAllMarkPlanData, (data: Event_GetAllMarkPlanData) => { @@ -434,17 +436,15 @@ export class PlanComponent implements OnInit { //选中 底部一级节点 开启自动播放 selectChildNode(item: MarkPlanData) { - if (this.isShowChildComponent && this.leftDomain) { - if (item.nodes.length) { - this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 - this.nzCurrent = 0 - this.beforeEmergencyPlan = item - this.updateProgressList().then(res => { - this.publicToggleNode() - }) - } else { - this.message.info('暂无数据节点'); - } + if (item.nodes.length) { + this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 + this.nzCurrent = 0 + this.beforeEmergencyPlan = item + this.updateProgressList().then(res => { + this.publicToggleNode() + }) + } else { + this.message.info('暂无数据节点'); } }