diff --git a/src/app/home/basic-info/unit-details/unit-details.component.html b/src/app/home/basic-info/unit-details/unit-details.component.html index 47a9402..3192f7d 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.html +++ b/src/app/home/basic-info/unit-details/unit-details.component.html @@ -160,12 +160,15 @@
-
基本信息
-
切换为实战演练卡
-
切换为单位基本信息
+
基本信息
+
+
切换为单位基本信息
+
切换为实战演练卡
+
切换为数字化预案卡
+
-
+
@@ -875,13 +879,14 @@

 

-
-

+ style="font-family:'Times New Roman'; font-size:9pt">
+
+
@@ -1570,8 +1575,611 @@
-

实战演练卡

+

实战演练卡 +

- - + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

{{company}}基本情况

+
+

+ 单位基本情况 +

+ 		+

单位名称

+ 		+

{{planData.data.basicInfo.name}}

+ 		+

单位地址

+ 		+

{{planData.data.basicInfo.address}}

+ 		+

联系电话

+ 		+

{{planData.data.basicInfo.phone}}

+
+

人员总数

+ 		+

{{planData.data.basicInfo.peoplenum}}

+ 		+

建筑高度

+ 		+

{{planData.data.basicInfo.buildingheight}} +

+ 		+

层数

+ 		+

{{planData.data.basicInfo.cengshu}} +

+
+

建筑结构

+ 		+

{{planData.data.basicInfo.jiegou}}

+ 		+

占地面积

+ 		+

{{planData.data.basicInfo.zhandimianji}}

+ 		+

总建筑面积

+ 		+

{{planData.data.basicInfo.zongmianji}}

+ 		+

主要使用性质

+ 		+

{{planData.data.basicInfo.xingzhi}}

+
+

毗邻建筑

+ 		+

东：{{planData.data.basicInfo.pilin.dong}} +

+ 		+

南：{{planData.data.basicInfo.pilin.nan}}

+ 		+

西：{{planData.data.basicInfo.pilin.xi}} +

+ 		+

北：{{planData.data.basicInfo.pilin.bei}}

+
+

辖区中队行驶路线及时间

+ 		+

{{planData.data.basicInfo.luxian}}

+
+

+ 单位内部主要消防设施 +

+ 		+

消防控制室

+ 		+

位置

+ 		+

+ + {{kongzhishi.data.addres}} + +

+
+

消防水源

+ 		+

消防水池数量

+ 		+

{{planData.data.other.listdata[0].data[0].value}} +

+ 		+

位置

+ 		+

{{planData.data.other.listdata[0].data[1].value}} +

+ 		+

总容量

+ 		+

{{planData.data.other.listdata[0].data[2].value}} +

+ 		+

补给
方式

+ 		+

{{planData.data.other.listdata[0].data[3].value}}

+
+

室外其他水源

+ 		+

{{planData.data.other.listdata[0].data[4].value}} +

+ 		+

位置

+ 		+

{{planData.data.other.listdata[0].data[5].value}}

+
+

自动报警

+

系统

+ 		+

有（{{planData.data.other.radiodata[0].isHave ? '√' : + ''}}）
无（{{planData.data.other.radiodata[0].isHave ? '' : '√'}}）

+ 		+

自动喷水系统

+ 		+

有（{{planData.data.other.radiodata[1].isHave ? '√' : + ''}}）
无（{{planData.data.other.radiodata[1].isHave ? '' : '√'}}）

+ 		+

应急广播系统

+ 		+

有（{{planData.data.other.radiodata[2].isHave ? '√' : + ''}}）
无（{{planData.data.other.radiodata[2].isHave ? '' : '√'}}）

+ 		+

防排烟系统

+ 		+

有（{{planData.data.other.radiodata[3].isHave ? '√' : + ''}}）
无（{{planData.data.other.radiodata[3].isHave ? '' : '√'}}）

+
+

室外消火栓数量

+ 		+

+ 		+

室外消火栓位置分布

+ 		+

+ + {{shiwaixiaohuoshuan.data.addres}} + +

+
+

消防泵

+ 		+

消火栓泵

+ 		+

数量：{{planData.data.other.listdata[1].data[0].value}} +

+ 		+

扬程：{{planData.data.other.listdata[1].data[1].value}}m

+ 		+

流量：{{planData.data.other.listdata[1].data[2].value}}L/S

+ 		+

水泵接合器

+ 		+

数量：{{planData.data.other.listdata[1].data[3].value}} +

+ 		+

{{planData.data.other.listdata[1].data[4].value}}

+
+

喷淋泵

+ 		+

数量：{{planData.data.other.listdata[2].data[0].value}} +

+ 		+

扬程：{{planData.data.other.listdata[2].data[1].value}}m

+ 		+

流量：{{planData.data.other.listdata[2].data[2].value}}L/S

+ 		+

水泵接合器

+ 		+

数量：{{planData.data.other.listdata[2].data[3].value}} +

+ 		+

{{planData.data.other.listdata[2].data[4].value}} +

+
+

消防电梯

+

数量及位置

+ 		+

{{planData.data.other.listdata[3].data[0].value}} + , + {{planData.data.other.listdata[3].data[1].value}} +

+ 		+

疏散楼梯

+

数量及位置

+ 		+

{{planData.data.other.listdata[4].data[0].value}} + ,{{planData.data.other.listdata[4].data[1].value}} +

+ 		+

安全出口

+

数量及位置

+ 		+

{{planData.data.other.listdata[5].data[0].value}},{{planData.data.other.listdata[5].data[1].value}} +

+
+

室内消火栓数量

+ 		+

+

+ 		+

标准层室内消火栓数量及位置

+ 		+

{{planData.data.other.listdata[6].data[0].value}},{{planData.data.other.listdata[6].data[1].value}} +

+
+

+ 重点部位情况（{{key | chineseNumbers}}） +

+ 		+

重点部位名称

+ 		+

{{item.data[0].value}}

+ 		+

重点部位所在位置

+ 		+

{{item.data[1].value}}

+ 		+

建筑结构

+ 		+

{{item.data[2].value}}

+ 		+

使用性质

+ 		+

{{item.data[3].value}}

+
+

主要危险性

+ 		+

{{item.data[4].value}}

+
+

重点

+

提示

+ 		+

+ + {{planData.data.zhongdiantishi}} + +

+
\ No newline at end of file diff --git a/src/app/home/basic-info/unit-details/unit-details.component.scss b/src/app/home/basic-info/unit-details/unit-details.component.scss index 96a67a4..6d0b04a 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.scss +++ b/src/app/home/basic-info/unit-details/unit-details.component.scss @@ -1,6 +1,7 @@ -.bule{ +.bule { color: #2196F3; } + .detailsbox { width: 100%; @@ -56,6 +57,19 @@ line-height: 35px; border-radius: 3px; padding-left: 10px; + display: flex; + justify-content: space-between; + .tabbtn{ + display: flex; + .bule{ + cursor: pointer; + margin-right: 10px; + color: #000; + } + .selected{ + color: #2196F3; + } + } } .content { diff --git a/src/app/home/basic-info/unit-details/unit-details.component.ts b/src/app/home/basic-info/unit-details/unit-details.component.ts index 075f93a..5f98905 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.ts +++ b/src/app/home/basic-info/unit-details/unit-details.component.ts @@ -1,7 +1,7 @@ import { Component, Input, Renderer2, OnDestroy, AfterViewInit, ElementRef, OnInit, ViewChild, ViewContainerRef } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NzMessageService } from 'ng-zorro-antd/message'; -import { Router,ActivatedRoute } from '@angular/router'; +import { Router, ActivatedRoute } from '@angular/router'; import { MethodService } from 'src/app/service/method.service'; import { TreeService } from 'src/app/service/tree.service'; @@ -27,7 +27,7 @@ export class UnitDetailsComponent implements OnInit { constructor(public methodService: MethodService, private route: ActivatedRoute, private message: NzMessageService, private router: Router, private toTree: TreeService, private fb: FormBuilder, private http: HttpClient, private renderer: Renderer2, private el: ElementRef, public renderer2: Renderer2, private elementRef: ElementRef, private objectsSrv: ObjectsSimpleService, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { } - index=true + index = 1 disableds = false exerciseData: any = { data: { @@ -336,7 +336,8 @@ export class UnitDetailsComponent implements OnInit { this.disableds = true } this.company = this.route.snapshot.queryParams.company - this.organization = JSON.parse(sessionStorage.getItem('userData')).organizationName + this.organization = this.route.snapshot.queryParams.organization + let taskId = this.route.snapshot.queryParams.id this.methodService.getCompanyTaskDetails(taskId).then((data: any) => { let obj = JSON.parse(data.resultData) @@ -350,13 +351,29 @@ export class UnitDetailsComponent implements OnInit { // console.log('实战演练详情', this.exerciseData) let planData = this.methodService.getTaskDetailsItem('数字化预案', obj.form) - if (planData.data) { - this.planData = this.methodService.getTaskDetailsItem('数字化预案', obj.form) + if (JSON.stringify(planData.data) != "{}") { + if (JSON.stringify(planData.data.basicInfo) != "{}") { + this.planData.data.basicInfo = this.methodService.getTaskDetailsItem('数字化预案', obj.form).data.basicInfo + } + if (JSON.stringify(planData.data.other) != "{}") { + this.planData.data.other = this.methodService.getTaskDetailsItem('数字化预案', obj.form).data.other + } + if (planData.data.key.lenth != 0) { + this.planData.data.key = this.methodService.getTaskDetailsItem('数字化预案', obj.form).data.key + } + if (planData.data.zhongdiantishi) { + this.planData.data.zhongdiantishi = this.methodService.getTaskDetailsItem('数字化预案', obj.form).data.zhongdiantishi + } } // console.log('数字化预案详情', this.planData) - - this.kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form) - this.shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form) + let kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form) + if (JSON.stringify(kongzhishi.data) != "{}") { + this.kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form) + } + let shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form) + if (JSON.stringify(shiwaixiaohuoshuan.data) != "{}") { + this.shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form) + } // console.log('消防控制室详情', this.kongzhishi) // console.log('室外消火栓详情', this.shiwaixiaohuoshuan) }) @@ -909,7 +926,7 @@ export class UnitDetailsComponent implements OnInit {

`+this.datas.facilities.supplyMode+`

+ style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.facilities.supplyMode + `

@@ -1419,6 +1436,8 @@ export class UnitDetailsComponent implements OnInit { if (data.data) { this.datas = JSON.parse(data.data) } + + this.datas.basicInfo.name = data.companyName this.datas.basicInfo.addr = data.address // this.datas.basicInfo.phone = data.directorPhone diff --git a/src/app/home/basic-info/unit/unit.component.ts b/src/app/home/basic-info/unit/unit.component.ts index c92939d..7d3a83a 100644 --- a/src/app/home/basic-info/unit/unit.component.ts +++ b/src/app/home/basic-info/unit/unit.component.ts @@ -197,12 +197,13 @@ export class UnitComponent implements OnInit { this.router.navigate(['/basicInfo/unit/details'], { queryParams: { id: data.id, pattern: 'look' } }) } edit(data) { + console.log(data) let unitPagesData = { searchValue: this.searchValue, PageNumber: this.PageNumber } sessionStorage.setItem('unitPagesData', JSON.stringify(unitPagesData)) - this.router.navigate(['/basicInfo/unit/details'], { queryParams: { id: data.id, pattern: 'edit' } }) + this.router.navigate(['/basicInfo/unit/details'], { queryParams: { id: data.id, pattern: 'edit', company: data.companyName, organization: data.organization.name } }) } delete(item) { @@ -225,9 +226,9 @@ export class UnitComponent implements OnInit { download(data) { // console.log(data) - if(data.data){ - this.datas = JSON.parse(data.data) - }else{ + if (data.data) { + this.datas = JSON.parse(data.data) + } else { this.message.create('warning', '该单位未保存过数据'); return } diff --git a/src/app/home/task/station-task-execution/task-details/task-details.component.ts b/src/app/home/task/station-task-execution/task-details/task-details.component.ts index cf620ec..5354fbb 100644 --- a/src/app/home/task/station-task-execution/task-details/task-details.component.ts +++ b/src/app/home/task/station-task-execution/task-details/task-details.component.ts @@ -265,13 +265,29 @@ export class TaskDetailsPagesComponent implements OnInit { // console.log('实战演练详情', this.exerciseData) let planData = this.methodService.getTaskDetailsItem('数字化预案', obj.form) - if (planData.data) { - this.planData = this.methodService.getTaskDetailsItem('数字化预案', obj.form) + if (JSON.stringify(planData.data) != "{}") { + if (JSON.stringify(planData.data.basicInfo) != "{}") { + this.planData.data.basicInfo = this.methodService.getTaskDetailsItem('数字化预案', obj.form).data.basicInfo + } + if (JSON.stringify(planData.data.other) != "{}") { + this.planData.data.other = this.methodService.getTaskDetailsItem('数字化预案', obj.form).data.other + } + if (planData.data.key.lenth != 0) { + this.planData.data.key = this.methodService.getTaskDetailsItem('数字化预案', obj.form).data.key + } + if (planData.data.zhongdiantishi) { + this.planData.data.zhongdiantishi = this.methodService.getTaskDetailsItem('数字化预案', obj.form).data.zhongdiantishi + } + } + console.log('数字化预案详情', this.planData) + let kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form) + if (JSON.stringify(kongzhishi.data) != "{}") { + this.kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form) + } + let shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form) + if (JSON.stringify(shiwaixiaohuoshuan.data) != "{}") { + this.shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form) } - // console.log('数字化预案详情', this.planData) - - this.kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form) - this.shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form) // console.log('消防控制室详情', this.kongzhishi) // console.log('室外消火栓详情', this.shiwaixiaohuoshuan) }) @@ -287,8 +303,8 @@ export class TaskDetailsPagesComponent implements OnInit { type == 1 ? $("#tablebox").wordExport('演练卡') : $("#tablebox2").wordExport('数字化预案'); } - //查看图片 - viewImg(url) { + //查看图片 + viewImg(url) { let dom = document.getElementById(`viewerjs`) let pObjs = dom.childNodes; let node = document.createElement("img")