diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue index 89d17594..81a574e8 100644 --- a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue +++ b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue @@ -68,7 +68,7 @@ 盲板位置图： - + - 监护人：{{detailData.guardianName}} - - - 作业内容：{{detailData.jobContent}} - - - 作业人：{{detailData.jobPersonName}} + 作业单位：{{detailData.operatingUnitName}} 作业地点：{{detailData.jobPlace}} - 作业范围、内容、方式（包括深度、面积）：{{detailData.jobRangeContent}} + 作业内容：{{detailData.jobContent}} - 作业范围、内容、方式的简图：{{detailData.jobRangeContentPic}} + 监护人：{{detailData.guardianName}} 关联的其他特殊作业及安全作业编号：{{detailData.otherRelatedSpecialTask}} - 作业单位：{{detailData.operatingUnitName}} + 作业范围、内容、方式（包括深度、面积）：{{detailData.jobRangeContent}} + - 关联的其他特殊作业：{{detailData.otherRelatedSpecialTask}} + + 作业范围、内容、方式的简图： + + + + + + 风险辨识结果：{{detailData.riskIdentificationResult}} + + 作业实施时间：{{detailData.workExecutionBeginTime+'-'+detailData.workExecutionEndTime}} + + + - + 查看安全措施 diff --git a/pages/projectEnd/specialOperations/hoistSafe/detail.vue b/pages/projectEnd/specialOperations/hoistSafe/detail.vue index 5a28ab81..34937753 100644 --- a/pages/projectEnd/specialOperations/hoistSafe/detail.vue +++ b/pages/projectEnd/specialOperations/hoistSafe/detail.vue @@ -12,23 +12,23 @@ 作业票编号：{{detailData.workTicketCode}} - 作业申请时间：{{detailData.jobApplicationTime}} + 作业申请单位：{{detailData.jobApplicationUnitName}} - 作业申请单位：{{detailData.jobApplicationUnitName}} + 作业申请时间：{{detailData.jobApplicationTime}} 作业负责人：{{detailData.assignmentPersonInChargeName}} - 指挥人员：{{detailData.commanderName}} + 作业单位：{{detailData.operatingUnitName}} - 监护人：{{detailData.guardianName}} + 吊装地点：{{detailData.hoistPlace}} - 安全隐患总数：{{detailData.hiddenDangerNum}} + 吊具名称：{{detailData.hoistName}} 吊物内容：{{detailData.hoistContent}} @@ -37,10 +37,13 @@ 吊装作业人：{{detailData.hoistJobPersonName}} - 吊具名称：{{detailData.hoistName}} + 司索人：{{detailData.siSuoPersonName}} - 吊装地点：{{detailData.hoistPlace}} + 监护人：{{detailData.guardianName}} + + + 指挥人员：{{detailData.commanderName}} 吊物质量(t)：{{detailData.hoistWeight}} @@ -49,24 +52,21 @@ 作业级别：{{detailData.jobLevel}} - 作业单位：{{detailData.operatingUnitName}} - - - 安全作业票编号：{{detailData.riskIdentificationResult}} - - - 司索人名称：{{detailData.siSuoPersonName}} + 风险辨识结果：{{detailData.riskIdentificationResult}} 作业实施时间：{{detailData.workExecutionBeginTime+'-'+detailData.workExecutionEndTime}} - - 风险辨识结果：{{detailData.riskIdentificationResult}} - + + - + 查看安全措施 diff --git a/pages/projectEnd/specialOperations/openCircuit/detail.vue b/pages/projectEnd/specialOperations/openCircuit/detail.vue index 0a9daf50..2e602c64 100644 --- a/pages/projectEnd/specialOperations/openCircuit/detail.vue +++ b/pages/projectEnd/specialOperations/openCircuit/detail.vue @@ -11,57 +11,71 @@ 作业票编号：{{detailData.workTicketCode}} - + 作业申请单位：{{detailData.jobApplicationUnitName}} + + 作业单位：{{detailData.operatingUnitName}} + 作业负责人：{{detailData.assignmentPersonInChargeName}} - 断路地段相关说明：{{detailData.breakLocationDescription}} - - - 断路地段示意图：{{detailData.breakLocationDiagram}} - - - 断路原因：{{detailData.breakReason}} + 涉及相关单位（部门）：{{detailData.jobApplicationTime}} 监护人：{{detailData.guardianName}} - 涉及相关单位（部门）：{{detailData.jobApplicationTime}} + 断路原因：{{detailData.breakReason}} + + 关联的其他特殊作业及安全作业编号：{{detailData.otherRelatedSpecialTask}} - 作业内容：{{detailData.jobContent}} + 断路地段相关说明：{{detailData.breakLocationDescription}} + - 作业人：{{detailData.jobPersonName}} - - - 作业单位：{{detailData.operatingUnitName}} - - - 关联的其他特殊作业：{{detailData.otherRelatedSpecialTask}} + + 作业范围、内容、方式的简图： + + + + + + 风险辨识结果：{{detailData.riskIdentificationResult}} + + 作业实施时间：{{detailData.workExecutionBeginTime+'-'+detailData.workExecutionEndTime}} + + + + - - + - - - - - - - + + --> 查看安全措施 diff --git a/pages/projectEnd/specialOperations/specialCheck.vue b/pages/projectEnd/specialOperations/specialCheck.vue index 99da14cb..dd4115f6 100644 --- a/pages/projectEnd/specialOperations/specialCheck.vue +++ b/pages/projectEnd/specialOperations/specialCheck.vue @@ -43,15 +43,15 @@ - 吊装安装作业 + 吊装安全作业 - + - 断路作业 + 临时用电作业 @@ -64,10 +64,10 @@ - + - 临时用电作业 + 断路作业 @@ -90,9 +90,9 @@ if(val === 3) uni.navigateTo({ url: "./bindPlatePlug/checkList" }) if(val === 4) uni.navigateTo({ url: "./highJob/checkList" }) if(val === 5) uni.navigateTo({ url: "./hoistSafe/checkList" }) - if(val === 6) uni.navigateTo({ url: "./openCircuit/checkList" }) + if(val === 6) uni.navigateTo({ url: "./tempElectricity/checkList" }) if(val === 7) uni.navigateTo({ url: "./groundSafe/checkList" }) - if(val === 7) uni.navigateTo({ url: "./tempElectricity/checkList" }) + if(val === 8) uni.navigateTo({ url: "./openCircuit/checkList" }) } } } diff --git a/pages/projectEnd/specialOperations/specialOperations.vue b/pages/projectEnd/specialOperations/specialOperations.vue index d3b3b1f2..d7f1bf7a 100644 --- a/pages/projectEnd/specialOperations/specialOperations.vue +++ b/pages/projectEnd/specialOperations/specialOperations.vue @@ -43,15 +43,15 @@ - 吊装安装作业 + 吊装安全作业 - + - 断路作业 + 临时用电作业 @@ -64,10 +64,10 @@ - + - 临时用电作业 + 断路作业 @@ -90,9 +90,9 @@ if(val === 3) uni.navigateTo({ url: "./bindPlatePlug/work" }) if(val === 4) uni.navigateTo({ url: "./highJob/work" }) if(val === 5) uni.navigateTo({ url: "./hoistSafe/work" }) - if(val === 6) uni.navigateTo({ url: "./openCircuit/work" }) + if(val === 6) uni.navigateTo({ url: "./tempElectricity/work" }) if(val === 7) uni.navigateTo({ url: "./groundSafe/work" }) - if(val === 8) uni.navigateTo({ url: "./tempElectricity/work" }) + if(val === 8) uni.navigateTo({ url: "./openCircuit/work" }) } } } diff --git a/pages/projectEnd/specialOperations/tempElectricity/detail.vue b/pages/projectEnd/specialOperations/tempElectricity/detail.vue index e11ea8d7..03543b69 100644 --- a/pages/projectEnd/specialOperations/tempElectricity/detail.vue +++ b/pages/projectEnd/specialOperations/tempElectricity/detail.vue @@ -21,63 +21,60 @@ 作业负责人：{{detailData.assignmentPersonInChargeName}} - + + + 作业地点：{{detailData.jobPlace}} - 工作电压：{{detailData.jobVoltage}} - - - 作业单位：{{detailData.operatingUnitName}} - - - 关联的其他特殊作业：{{detailData.otherRelatedSpecialTask}} - - - 许可用电功率：{{detailData.permitElectricPower}} + 作业内容：{{detailData.jobContent}} 电源接入点：{{detailData.powerAccessPoint}} - 额度功率 ：{{detailData.ratedPower}} + 许可用电功率：{{detailData.permitElectricPower}} + + + 工作电压：{{detailData.jobVoltage}} + + + 用电设备名称：{{detailData.electricName}} + + + 额定功率 ：{{detailData.ratedPower}} + + + 监护人：{{detailData.guardianName}} + + + 用电人：{{detailData.electricityCustomerName}} + + + 作业人及电工证号：{{detailData.jobPersonName}} + + + 作业负责人电工证号：{{detailData.electricianNum2}} + + + + + 关联的其他特殊作业及安全作业票编号：{{detailData.otherRelatedSpecialTask}} 风险辨识结果：{{detailData.riskIdentificationResult}} - - - - - 关联的其他特殊作业及安全作业编号：{{detailData.otherRelatedSpecialTask}} - @@ -85,76 +82,23 @@ 安全作业票编号：{{detailData.safetyWorkTicketCode}} --> - - - - 气体取样分析时间 - 代表性气体 - 分析结果/% - 分析人 + + + + 分析人 + 分析时间 + 分析点 + 可燃气体检测结果 - - {{item.gasAnalyzeTime||'暂无数据'}} - {{item.representativeGas||'暂无数据'}} - {{item.analyzeResult||'暂无数据'}} - {{item.analyzer||'暂无数据'}} - - - - - - - + + 查看安全措施 @@ -386,6 +330,9 @@