diff --git a/pages/projectEnd/dangerBigProject/index.vue b/pages/projectEnd/dangerBigProject/index.vue index 955a310b..5599f3cc 100644 --- a/pages/projectEnd/dangerBigProject/index.vue +++ b/pages/projectEnd/dangerBigProject/index.vue @@ -15,9 +15,11 @@ {{item.engineeringName}} - + + - {{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} + + {{item.engineeringState === 4 ? "已完工" : "在施"}} 申请单位:{{detailData.jobApplicationUnitName}} @@ -58,9 +58,9 @@ --> - + 盲板编号:{{detailData.blindPlateNo}} @@ -131,10 +131,10 @@ 接受交底人: {{detailData.acceptTheInformantName}} - + @@ -163,7 +163,7 @@ - @@ -210,6 +210,7 @@ detailId: "", detailData:{}, isShowBtn: null, + userInfo: {} } }, onReachBottom() { @@ -219,6 +220,7 @@ console.log(2) }, onShow(){ + this.userInfo = JSON.parse(uni.getStorageSync('userInfo')) this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; // this.initData() this.getWork() diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue b/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue index 3033b8ce..fb6211de 100644 --- a/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue +++ b/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue @@ -112,7 +112,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 88rpx; + padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index fcb4fc4f..afb327cd 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -116,7 +116,7 @@ - @@ -163,6 +163,7 @@ detailId: "", detailData:{}, isShowBtn: null, + userInfo: {} } }, onReachBottom() { @@ -172,6 +173,7 @@ console.log(2) }, onShow(){ + this.userInfo = JSON.parse(uni.getStorageSync('userInfo')) this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; // this.initData() this.getWork() diff --git a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue index 835e1e93..901c5874 100644 --- a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue +++ b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue @@ -112,7 +112,7 @@ } .safe-mesure-container{ padding: 0 30rpx; - padding-top: 88rpx; + padding-top: 138rpx; padding-bottom: 100rpx; // background-color: darkred; .safe-mesure-header{ diff --git a/pages/projectEnd/specialOperations/fireWork/workFinally.vue b/pages/projectEnd/specialOperations/fireWork/workFinally.vue index 20fd8a59..d371f788 100644 --- a/pages/projectEnd/specialOperations/fireWork/workFinally.vue +++ b/pages/projectEnd/specialOperations/fireWork/workFinally.vue @@ -68,7 +68,9 @@