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 4d4eb3d..588b7fe 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 @@ -880,10 +880,9 @@

 

-
+
- @@ -902,7 +901,8 @@ @@ -1586,7 +1587,7 @@
-

+

+ {{checkTime | date:"yyyy-MM-dd HH:mm:ss" }}

 @@ -933,7 +933,8 @@ -

+

+ {{exerciseData.data.data.yanliantime}}

-
+
@@ -1928,7 +1929,8 @@

+ style="font-family:'Times New Roman'; font-size:9pt"> + {{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.shiwaishuliang}}

 @@ -2095,8 +2097,8 @@ -

+

+ {{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.shineishuliang}}

-
+
@@ -2206,17 +2208,11 @@ style="font-family:仿宋_GB2312; font-size:16pt; font-weight:bold">防消联勤”工作检查情况登记表

-

执勤中队：xxx 检查日期：2021年10月21日

+

+ 执勤中队：{{organization}} + 检查日期：{{checkTime | date:"yyyy-MM-dd + HH:mm:ss" }} +

@@ -2249,7 +2245,8 @@ @@ -2272,7 +2269,7 @@ @@ -2294,7 +2291,7 @@ @@ -2316,7 +2313,7 @@ @@ -2338,7 +2336,7 @@ @@ -2349,8 +2347,11 @@ @@ -2362,51 +2363,60 @@ - + 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 d7487ca..9292c8d 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 @@ -120,7 +120,8 @@ export class UnitDetailsComponent implements OnInit { // imgShow: '' } } - ] + ], + exerciseData: '' }, vehicleType: [] } @@ -331,6 +332,11 @@ export class UnitDetailsComponent implements OnInit { id = "" integrity = 0 + taskAlldataOfcompany: any + taskAlldataOfform: any + checkTime: string + + isHaveLastTask = true ngOnInit(): void { this.id = this.router['browserUrlTree'].queryParams.id @@ -342,9 +348,11 @@ export class UnitDetailsComponent implements OnInit { let taskId = this.route.snapshot.queryParams.id this.methodService.getCompanyTaskDetails(taskId).then((data: any) => { + this.checkTime = data.checkTime let obj = JSON.parse(data.resultData) console.log('所有数据', obj) - + this.taskAlldataOfcompany = obj.company + this.taskAlldataOfform = obj.form let exerciseData = this.methodService.getTaskDetailsItem('实战演练', obj.form) if (exerciseData.data.data) { @@ -378,6 +386,8 @@ export class UnitDetailsComponent implements OnInit { } // console.log('消防控制室详情', this.kongzhishi) // console.log('室外消火栓详情', this.shiwaixiaohuoshuan) + }).catch((err) => { + this.isHaveLastTask = false }) this.validateForm = this.fb.group({ code: [null], @@ -1432,20 +1442,22 @@ export class UnitDetailsComponent implements OnInit { this.BuildingTypes = data }) } + + olddata: any getCompanies() { this.http.get('/api/Companies/' + this.id).subscribe((data: any) => { console.log('当前单位信息', data); + this.olddata = data 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 this.datas.basicInfo.nature = data.useNature this.integrity = data.integrity this.imageUrl = data.imageFile + console.log('当前单位信息2', this.datas); this.validateForm.patchValue({ code: data.usci, organizationId: data.organizationId, @@ -1507,9 +1519,6 @@ export class UnitDetailsComponent implements OnInit { } print() { - // console.log(1111111,$('#xxx')) - // $('#xxx').printArea() - const iframe: any = document.getElementById("iframe1");//获取iframe的window对象 const iwindow: any = iframe.contentWindow; // iwindow.document.body.innerText = "";//先清空iframe原先的内容 diff --git a/src/app/home/task/station-task-execution/task-details/task-details.component.html b/src/app/home/task/station-task-execution/task-details/task-details.component.html index 5d89b0b..5513ae9 100644 --- a/src/app/home/task/station-task-execution/task-details/task-details.component.html +++ b/src/app/home/task/station-task-execution/task-details/task-details.component.html @@ -26,7 +26,11 @@ @@ -1063,8 +1070,11 @@

谢谢谢

+ style="font-family:宋体; font-size:9pt">{{company}}

 @@ -2237,7 +2233,7 @@

 

+ style="font-family:宋体; font-size:9pt">{{olddata.legalPersonName}}

Xxx + style="font-family:宋体; font-size:9pt"> + {{taskAlldataOfcompany.address}}

 

+ style="font-family:宋体; font-size:10.5pt">{{taskAlldataOfcompany.datas.basicInfo.structure}}

 

+ style="font-family:宋体; font-size:9pt">{{taskAlldataOfcompany.datas.basicInfo.height}}

 @@ -2282,7 +2279,7 @@

 

+ style="font-family:宋体; font-size:10.5pt">{{taskAlldataOfcompany.datas.basicInfo.layer}}

 

+ style="font-family:宋体; font-size:9pt">{{taskAlldataOfcompany.directorName}}

 @@ -2304,7 +2301,7 @@

 

+ style="font-family:宋体; font-size:10.5pt">{{taskAlldataOfcompany.directorPhone}}

 

+ style="font-family:宋体; font-size:9pt">{{taskAlldataOfcompany.useNature}}

 @@ -2326,7 +2323,8 @@

 

+ style="font-family:宋体; font-size:10.5pt">{{taskAlldataOfcompany.datas.facilities.controlPosition}} +

 

+ style="font-family:宋体; font-size:9pt">{{taskAlldataOfcompany.datas.basicInfo.nature}}
-

 

+

+ + {{item.check ? item.name : ''}} + +

室内消火栓数量：

+ style="font-family:宋体; font-size:9pt">室内消火栓数量：{{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.shineishuliang}} +

室外消火栓数量：

+ style="font-family:宋体; font-size:9pt">室外消火栓数量：{{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.shiwaishuliang}} +

消防泵数量：

+ style="font-family:宋体; font-size:9pt">消防泵数量：{{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.xiaofangshuanshuliang}} +

消防控制室

-

- - - - + style="font-family:宋体; font-size:9pt">{{item.name}}

+

+

 

+

+ 位置：{{item.data.addres}} +

位置：控制室

-

结果：不合格

+ *ngIf="item.name != '实战演练' && item.name != '数字化预案'" + style="font-family:宋体; font-size:9pt">结果：{{item.data.jieguo}}

 -

是 - 否 +

+ + {{item.data.zhenggai == '是' ? '√' : '□'}}是 + {{item.data.zhenggai == '是' ? '□' : '√'}}否 + + + □是 + □否 +

具体问题：

+ style="font-family:宋体; font-size:9pt">具体问题： {{item.data.remarks}}

-

+

+ + {{checkTime | date:"yyyy-MM-dd HH:mm:ss" }} + +

@@ -57,7 +61,10 @@ -

+

+ + {{exerciseData.data.data.yanliantime}} +

-

+

+ + {{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.shiwaishuliang}} + +

@@ -1231,8 +1241,9 @@ -

+

+ + {{taskAlldataOfcompany.datas.facilities.fireFightingFacilities.shineishuliang}}

- - \ No newline at end of file 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 5bfa0af..ff5f672 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 @@ -105,7 +105,8 @@ export class TaskDetailsPagesComponent implements OnInit { // imgShow: '' } } - ] + ], + yanliantime: '' }, vehicleType: [] } @@ -248,7 +249,17 @@ export class TaskDetailsPagesComponent implements OnInit { company: string organization: string - + checkTime: string + taskAlldataOfcompany: any = { + datas: { + facilities: { + fireFightingFacilities: { + shiwaishuliang: '', + shineishuliang: '' + } + } + } + } ngOnInit(): void { this.company = this.route.snapshot.queryParams.company this.organization = JSON.parse(sessionStorage.getItem('userData')).organizationName @@ -256,12 +267,15 @@ export class TaskDetailsPagesComponent implements OnInit { this.methodService.getTaskDetails(taskId).then((data: any) => { let obj = JSON.parse(data.resultData) console.log('所有数据', obj) - if(!obj){ + this.checkTime = data.checkTime + if (!obj) { return - }else{ - } + this.taskAlldataOfcompany = obj.company + console.log(689, this.taskAlldataOfcompany) + + let exerciseData = this.methodService.getTaskDetailsItem('实战演练', obj.form) if (exerciseData.data.data) { this.exerciseData = this.methodService.getTaskDetailsItem('实战演练', obj.form) diff --git a/src/app/service/method.service.ts b/src/app/service/method.service.ts index 98cd2be..5e64fbb 100644 --- a/src/app/service/method.service.ts +++ b/src/app/service/method.service.ts @@ -75,16 +75,21 @@ export class MethodService { * @param id2 任务id * @returns 任务具体内容 */ - async getCompanyTaskDetails(id2) { + async getCompanyTaskDetails(id2) { return new Promise((resolve, reject) => { this.http.get(`/api/PlanTasks/GetCompanyLastTask/`, { params: { companyId: id2, - taskType:"熟悉演练", - approvalStatus:["待检查"] + taskType: "熟悉演练", + approvalStatus: ["待检查"] + } + }).subscribe({ + next: (data: any) => { + resolve(data) + }, + error: (err) => { + reject(err) } - }).subscribe((data: any) => { - resolve(data) }) }) } diff --git a/src/theme.less b/src/theme.less index 600cfe8..eddaf12 100644 --- a/src/theme.less +++ b/src/theme.less @@ -152,3 +152,6 @@ border-radius: 0px; } } +.ant-tabs-content-holder{ + overflow-y: auto; +} \ No newline at end of file