From 1fec7cc2cb031b7b2eed1d944e401f64bc638816 Mon Sep 17 00:00:00 2001 From: Vce Date: Fri, 17 May 2024 23:19:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E9=99=90=E7=A9=BA=E9=97=B4=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=AF=B9=E6=8E=A5=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialOperations/fireWork/detail.vue | 63 +------ .../specialOperations/groundSafe/detail.vue | 109 ++++------- .../specialOperations/hoistSafe/detail.vue | 109 ++++------- .../limitSpaceWork/detail.vue | 174 +++++++++++++++++- .../specialOperations/openCircuit/detail.vue | 41 ++++- .../tempElectricity/detail.vue | 57 +++++- 6 files changed, 324 insertions(+), 229 deletions(-) diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index 33b51a9c..b0839187 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -64,67 +64,12 @@ 分析人 - {{item.gasAnalyzeTime||'暂无数据'}} - {{item.representativeGas||'暂无数据'}} - {{item.analyzeResult||'暂无数据'}} - {{item.analyzer||'暂无数据'}} - - - - - - 查看安全措施 diff --git a/pages/projectEnd/specialOperations/groundSafe/detail.vue b/pages/projectEnd/specialOperations/groundSafe/detail.vue index a7bef9fc..b84cdea2 100644 --- a/pages/projectEnd/specialOperations/groundSafe/detail.vue +++ b/pages/projectEnd/specialOperations/groundSafe/detail.vue @@ -11,36 +11,48 @@ 作业票编号：{{detailData.workTicketCode}} + + 作业申请时间：{{detailData.jobApplicationTime}} + + + 作业申请单位：{{detailData.jobApplicationUnitName}} + + + 作业负责人：{{detailData.assignmentPersonInChargeName}} + + + 监护人：{{detailData.guardianName}} + 作业内容：{{detailData.jobContent}} + + 作业人：{{detailData.jobPersonName}} + + + 作业地点：{{detailData.jobPlace}} + + + 作业范围、内容、方式（包括深度、面积）：{{detailData.jobRangeContent}} + + + 作业范围、内容、方式的简图：{{detailData.jobRangeContentPic}} + + + 关联的其他特殊作业及安全作业编号：{{detailData.otherRelatedSpecialTask}} + 作业单位：{{detailData.operatingUnitName}} - 作业负责人：{{detailData.assignmentPersonInChargeName}} + 关联的其他特殊作业：{{detailData.otherRelatedSpecialTask}} - - 作业申请单位：{{detailData.jobApplicationUnitName}} - - - 作业申请时间：{{detailData.jobApplicationTime}} - - - 关联的其他特殊作业及安全作业编号：{{detailData.otherRelatedSpecialTask}} - - - 风险辨识结果：{{detailData.riskIdentificationResult}} + - 气体取样分析时间 @@ -49,67 +61,12 @@ 分析人 - {{item.gasAnalyzeTime||'暂无数据'}} - {{item.representativeGas||'暂无数据'}} - {{item.analyzeResult||'暂无数据'}} - {{item.analyzer||'暂无数据'}} - - - - - - 查看安全措施 diff --git a/pages/projectEnd/specialOperations/hoistSafe/detail.vue b/pages/projectEnd/specialOperations/hoistSafe/detail.vue index adf3e4c9..5a28ab81 100644 --- a/pages/projectEnd/specialOperations/hoistSafe/detail.vue +++ b/pages/projectEnd/specialOperations/hoistSafe/detail.vue @@ -11,36 +11,62 @@ 作业票编号：{{detailData.workTicketCode}} + + 作业申请时间：{{detailData.jobApplicationTime}} + + + 作业申请单位：{{detailData.jobApplicationUnitName}} + + + 作业负责人：{{detailData.assignmentPersonInChargeName}} + - 作业内容：{{detailData.jobContent}} + 指挥人员：{{detailData.commanderName}} + + + 监护人：{{detailData.guardianName}} + + + 安全隐患总数：{{detailData.hiddenDangerNum}} + + + 吊物内容：{{detailData.hoistContent}} + + + 吊装作业人：{{detailData.hoistJobPersonName}} + + + 吊具名称：{{detailData.hoistName}} + + + 吊装地点：{{detailData.hoistPlace}} + + + 吊物质量(t)：{{detailData.hoistWeight}} + + + 作业级别：{{detailData.jobLevel}} 作业单位：{{detailData.operatingUnitName}} - 作业负责人：{{detailData.assignmentPersonInChargeName}} + 安全作业票编号：{{detailData.riskIdentificationResult}} - 作业申请单位：{{detailData.jobApplicationUnitName}} + 司索人名称：{{detailData.siSuoPersonName}} - 作业申请时间：{{detailData.jobApplicationTime}} + 作业实施时间：{{detailData.workExecutionBeginTime+'-'+detailData.workExecutionEndTime}} - - 关联的其他特殊作业及安全作业编号：{{detailData.otherRelatedSpecialTask}} - - - 风险辨识结果：{{detailData.riskIdentificationResult}} + - 气体取样分析时间 @@ -53,63 +79,8 @@ {{item.representativeGas||'暂无数据'}} {{item.analyzeResult||'暂无数据'}} {{item.analyzer||'暂无数据'}} - - - - - - 查看安全措施 diff --git a/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue b/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue index c9ed212e..3d2a44bc 100644 --- a/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue +++ b/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue @@ -78,29 +78,89 @@ 分析项目 - 二氧化硫 - 氧化硫 - 甲烷 - 氢气 + {{JSON.parse(detailData.toxicAndHarmfulGasInformation)[0].name||'--'}} + {{JSON.parse(detailData.toxicAndHarmfulGasInformation)[1].name||'--'}} + {{JSON.parse(detailData.combustibleGasInformation)[0].name||'--'}} + {{JSON.parse(detailData.combustibleGasInformation)[1].name||'--'}} -- -- -- -- - 合格标准 - 5% + 合格标准 + {{JSON.parse(detailData.toxicAndHarmfulGasInformation)[0].standard||'--'}} + {{JSON.parse(detailData.toxicAndHarmfulGasInformation)[1].standard||'--'}} + {{JSON.parse(detailData.combustibleGasInformation)[0].standard||'--'}} + {{JSON.parse(detailData.combustibleGasInformation)[1].standard||'--'}} + 19.5%~21%(体积分数) + -- + -- + -- + + + 分析数据 + {{item.name1}} + {{item.name2}} + {{item.name3}} + {{item.name4}} + {{item.name5}} + {{item.time}} + {{item.local}} + {{item.person}} + + + 查看安全措施 @@ -121,13 +181,11 @@ - {{isShow ? "收起详情":"展开详情"}} - @@ -331,6 +389,104 @@