diff --git a/main.js b/main.js index f0f913e7..a722b9a1 100644 --- a/main.js +++ b/main.js @@ -44,8 +44,8 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 - Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 + Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue index 81a574e8..a5438fa7 100644 --- a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue +++ b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue @@ -15,7 +15,7 @@ 作业申请时间：{{detailData.jobApplicationTime}} - 作业申请单位：{{detailData.jobApplicationUnitName}} + 申请单位：{{detailData.jobApplicationUnitName}} 作业负责人：{{detailData.assignmentPersonInChargeName}} @@ -58,9 +58,9 @@ --> - + 盲板编号：{{detailData.blindPlateNo}} diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue b/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue index 8156368f..3033b8ce 100644 --- a/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue +++ b/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue @@ -111,8 +111,8 @@ z-index: 2; } .safe-mesure-container{ - margin-top: 150rpx; padding: 0 30rpx; + padding-top: 88rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/work.vue b/pages/projectEnd/specialOperations/bindPlatePlug/work.vue index d3f3909c..ca64790d 100644 --- a/pages/projectEnd/specialOperations/bindPlatePlug/work.vue +++ b/pages/projectEnd/specialOperations/bindPlatePlug/work.vue @@ -16,9 +16,11 @@ 作业票编号：{{item.workTicketCode}} - + + - {{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} + + {{item.engineeringState === 4 ? "已完工" : "在施"}} - + + - {{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} + + {{item.engineeringState === 4 ? "已完工" : "在施"}} 关联的其他特殊作业及安全作业编号：{{detailData.otherRelatedSpecialTask}} diff --git a/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue b/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue index 4b6990b4..73aad8b6 100644 --- a/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue +++ b/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue @@ -111,8 +111,8 @@ z-index: 2; } .safe-mesure-container{ - margin-top: 150rpx; padding: 0 30rpx; + padding-top: 88rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/groundSafe/work.vue b/pages/projectEnd/specialOperations/groundSafe/work.vue index 567f223a..e5ce1662 100644 --- a/pages/projectEnd/specialOperations/groundSafe/work.vue +++ b/pages/projectEnd/specialOperations/groundSafe/work.vue @@ -16,9 +16,11 @@ 作业票编号：{{item.workTicketCode}} - + + - {{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} + + {{item.engineeringState === 4 ? "已完工" : "在施"}} 风险辨识结果：{{detailData.riskIdentificationResult}} 关联的其他特殊作业及安全作业票编号：{{detailData.otherRelatedSpecialTask}} + + 作业实施时间：{{detailData.workExecutionBeginTime+'-'+detailData.workExecutionEndTime}} + diff --git a/pages/projectEnd/specialOperations/highJob/safeMesure.vue b/pages/projectEnd/specialOperations/highJob/safeMesure.vue index bbb2156f..551115b0 100644 --- a/pages/projectEnd/specialOperations/highJob/safeMesure.vue +++ b/pages/projectEnd/specialOperations/highJob/safeMesure.vue @@ -111,8 +111,8 @@ z-index: 2; } .safe-mesure-container{ - margin-top: 150rpx; padding: 0 30rpx; + padding-top: 88rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/highJob/work.vue b/pages/projectEnd/specialOperations/highJob/work.vue index 9a89551b..c3309bdb 100644 --- a/pages/projectEnd/specialOperations/highJob/work.vue +++ b/pages/projectEnd/specialOperations/highJob/work.vue @@ -16,9 +16,11 @@ 作业票编号：{{item.workTicketCode}} - + + - {{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} + + {{item.engineeringState === 4 ? "已完工" : "在施"}} 指挥人员：{{detailData.commanderName}} diff --git a/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue b/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue index b1bd0d33..c7da3d0e 100644 --- a/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue +++ b/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue @@ -111,8 +111,8 @@ z-index: 2; } .safe-mesure-container{ - margin-top: 150rpx; padding: 0 30rpx; + padding-top: 88rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/hoistSafe/work.vue b/pages/projectEnd/specialOperations/hoistSafe/work.vue index 36750737..3c8dac8b 100644 --- a/pages/projectEnd/specialOperations/hoistSafe/work.vue +++ b/pages/projectEnd/specialOperations/hoistSafe/work.vue @@ -16,9 +16,11 @@ 作业票编号：{{item.workTicketCode}} - + + - {{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} + + {{item.engineeringState === 4 ? "已完工" : "在施"}} 作业单位：{{detailData.operatingUnitName}} diff --git a/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue b/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue index 2574259d..a8195e1f 100644 --- a/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue +++ b/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue @@ -111,8 +111,8 @@ z-index: 2; } .safe-mesure-container{ - margin-top: 150rpx; padding: 0 30rpx; + padding-top: 88rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ @@ -178,4 +178,4 @@ } } } - + \ No newline at end of file diff --git a/pages/projectEnd/specialOperations/limitSpaceWork/work.vue b/pages/projectEnd/specialOperations/limitSpaceWork/work.vue index 82539403..3783ddb1 100644 --- a/pages/projectEnd/specialOperations/limitSpaceWork/work.vue +++ b/pages/projectEnd/specialOperations/limitSpaceWork/work.vue @@ -16,9 +16,11 @@ 作业票编号：{{item.workTicketCode}} - + + - {{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} + + {{item.engineeringState === 4 ? "已完工" : "在施"}} - 作业申请单位：{{detailData.jobApplicationUnitName}} + 申请单位：{{detailData.jobApplicationUnitName}} 作业单位：{{detailData.operatingUnitName}} diff --git a/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue b/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue index b4507b6c..520b383b 100644 --- a/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue +++ b/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue @@ -111,8 +111,8 @@ z-index: 2; } .safe-mesure-container{ - margin-top: 150rpx; padding: 0 30rpx; + padding-top: 88rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/openCircuit/work.vue b/pages/projectEnd/specialOperations/openCircuit/work.vue index 2bcc3f67..0ca91fc4 100644 --- a/pages/projectEnd/specialOperations/openCircuit/work.vue +++ b/pages/projectEnd/specialOperations/openCircuit/work.vue @@ -16,9 +16,11 @@ 作业票编号：{{item.workTicketCode}} - + + - {{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} + + {{item.engineeringState === 4 ? "已完工" : "在施"}} 用电人：{{detailData.electricityCustomerName}} diff --git a/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue b/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue index 057dec96..ba5e1e1d 100644 --- a/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue +++ b/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue @@ -111,8 +111,8 @@ z-index: 2; } .safe-mesure-container{ - margin-top: 150rpx; padding: 0 30rpx; + padding-top: 88rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/tempElectricity/work.vue b/pages/projectEnd/specialOperations/tempElectricity/work.vue index e83d9900..5445a2f9 100644 --- a/pages/projectEnd/specialOperations/tempElectricity/work.vue +++ b/pages/projectEnd/specialOperations/tempElectricity/work.vue @@ -16,9 +16,11 @@ 作业票编号：{{item.workTicketCode}} - + + - {{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} + + {{item.engineeringState === 4 ? "已完工" : "在施"}}