From a8caacfc1a0006c04756754d942d1145a8ad60f4 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 16 May 2024 20:27:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../projectEnd/specialOperations/fireWork/safeMesure.vue | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue
index 64c2607d..eb6819e1 100644
--- a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue
@@ -11,7 +11,7 @@
-
+
{{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)
}
})
},
From f1834ad2cd820b33e2de3f3928f41c48362980dc Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 16 May 2024 20:51:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/projectEnd/specialOperations/fireWork/detail.vue | 5 ++++-
pages/projectEnd/specialOperations/fireWork/safeMesure.vue | 2 +-
pages/projectEnd/specialOperations/fireWork/work.vue | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue
index 429b167d..c0a37e32 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}}
@@ -415,6 +415,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 eb6819e1..0d38fd08 100644
--- a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue
@@ -13,7 +13,7 @@
- {{item.name}}
+ {{i + 1}}.{{item.name}}
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;
}
}
}
From dc1d2e2f33b67a5704d78f1c6d87920698857820 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 16 May 2024 21:22:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../specialOperations/specialCheck.vue | 37 +++++++++++--------
.../specialOperations/specialOperations.vue | 37 +++++++++++--------
2 files changed, 44 insertions(+), 30 deletions(-)
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{