diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index 9a4e10a6..8fe779c7 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -18,7 +18,7 @@ 动火方式:{{detailData.hotMethod}} - 动火实施时间:{{detailData.hotWorkExecutionBeginTime+'-'+detailData.hotWorkExecutionEndTime}} + 动火实施时间:{{detailData.hotWorkExecutionBeginTime+'-'+detailData.hotWorkExecutionEndTime}} 动火地点和动火部位:{{detailData.fireLocationAndFirePart}} @@ -435,6 +435,9 @@ } } } + .u-td{ + height: auto; + } } .dangerbig-details{ min-height: 100%; diff --git a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue index 64c2607d..0d38fd08 100644 --- a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue +++ b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue @@ -11,9 +11,9 @@ 是否涉及 - + - {{item.name}} + {{i + 1}}.{{item.name}} @@ -80,15 +80,17 @@ }, methods:{ getWork(){ + let that = this; this.sendRequest({ url:'xmgl/xzSpecialOperationFireSafety/queryById', method:'get', data:{id:this.detailId}, success:res=>{ uni.hideLoading() - this.detailData = res.result + that.detailData = res.result + that.detailData.safeMeasure = JSON.parse(that.detailData.safeMeasure) //otherSafeMeasure - console.log("=====================",this.detailData) + console.log("=====================",that.detailData) } }) }, diff --git a/pages/projectEnd/specialOperations/fireWork/work.vue b/pages/projectEnd/specialOperations/fireWork/work.vue index ad0785fb..b19be4ae 100644 --- a/pages/projectEnd/specialOperations/fireWork/work.vue +++ b/pages/projectEnd/specialOperations/fireWork/work.vue @@ -216,7 +216,7 @@ margin-bottom: 60rpx; } .txt{ - color: #2E8B57; + color: #CFC8CC; } } } diff --git a/pages/projectEnd/specialOperations/specialCheck.vue b/pages/projectEnd/specialOperations/specialCheck.vue index 1f66a5ee..9c5a63b8 100644 --- a/pages/projectEnd/specialOperations/specialCheck.vue +++ b/pages/projectEnd/specialOperations/specialCheck.vue @@ -6,29 +6,29 @@ - + - + 动火作业 - - + @@ -61,30 +61,37 @@ z-index: 2; } .sp-menu{ + margin: 0 38rpx; margin-top: 138rpx; - width: 100%; // height: 1200rpx; // height: 1000rpx; // background-color: darkred; display: grid; - grid-gap: 10rpx; + grid-gap: 24rpx; grid-template-columns: repeat(2, 1fr); // grid-template-columns: repeat(auto-fill, 220rpx); - place-items: center; - justify-content: center; + // place-items: center; + // justify-content: center; .menu-item{ - width: 220rpx; + // width: 220rpx; height: 274rpx; // background-color: darkblue; + box-shadow: 0px 8rpx 15rpx 0px rgba(219,229,255,0.6); + border-radius: 10rpx; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; .item-icon{ - width: 220rpx; - height: 220rpx; + // width: 220rpx; + // height: 220rpx; display: flex; justify-content: center; align-items: center; + margin-bottom: 14rpx; image{ - width: 220rpx; - height: 220rpx; + width: 66rpx; + height: 86rpx; } } .item-text{ diff --git a/pages/projectEnd/specialOperations/specialOperations.vue b/pages/projectEnd/specialOperations/specialOperations.vue index 8bf1406e..95fea494 100644 --- a/pages/projectEnd/specialOperations/specialOperations.vue +++ b/pages/projectEnd/specialOperations/specialOperations.vue @@ -6,29 +6,29 @@ - + - + 动火作业 - - + @@ -61,30 +61,37 @@ z-index: 2; } .sp-menu{ + margin: 0 38rpx; margin-top: 138rpx; - width: 100%; // height: 1200rpx; // height: 1000rpx; // background-color: darkred; display: grid; - grid-gap: 10rpx; + grid-gap: 24rpx; grid-template-columns: repeat(2, 1fr); // grid-template-columns: repeat(auto-fill, 220rpx); - place-items: center; - justify-content: center; + // place-items: center; + // justify-content: center; .menu-item{ - width: 220rpx; + // width: 220rpx; height: 274rpx; // background-color: darkblue; + box-shadow: 0px 8rpx 15rpx 0px rgba(219,229,255,0.6); + border-radius: 10rpx; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; .item-icon{ - width: 220rpx; - height: 220rpx; + // width: 220rpx; + // height: 220rpx; display: flex; justify-content: center; align-items: center; + margin-bottom: 14rpx; image{ - width: 220rpx; - height: 220rpx; + width: 66rpx; + height: 86rpx; } } .item-text{