diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8afb9dd..0081f66 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -107,7 +107,7 @@
未创建{{curMonth}}月份满意度自查
-
+
进行中
@@ -134,7 +134,7 @@
更多
-
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index c3b9ff7..ca53af2 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -105,7 +105,7 @@ page {
flex-direction: row;
display: flex;
justify-content: space-between;
- margin: -75rpx 0 0 30rpx;
+ margin: -95rpx 0 0 30rpx;
}
@@ -740,7 +740,6 @@ page {
width: 700rpx;
height:auto ;
background-color: #FFFFFF;
- margin: 20rpx 0 0 30rpx;
border-radius: 20rpx;
overflow: hidden;
margin: 20rpx 24rpx 0 24rpx;
@@ -749,13 +748,19 @@ page {
display: flex;
justify-content: space-between;
flex-direction: row;
- margin: 30rpx 30rpx 30rpx 30rpx;
+ margin: 30rpx 30rpx 0rpx 30rpx;
+ height:70rpx;
}
.news_remind{
- font-family: PingFang SC;
- font-weight: bold;
+ width: 202rpx;
+ height: 33rpx;
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
font-size: 34rpx;
- color: #333333;
+ font-family: PingFang-SC-Bold;
+ font-weight: 700;
+ text-align: left;
+ white-space: nowrap;
line-height: 52rpx;
}
.more{
@@ -764,15 +769,22 @@ page {
line-height: 36rpx;
}
.Information{
- height: 110rpx;
+ height: 115rpx;
display: flex;
flex-direction: column;
- margin: 10rpx 30rpx 30rpx 30rpx;
+ margin: 10rpx 30rpx 0 30rpx;
border-bottom: 2rpx solid #EAEAEA;
}
+.Information1{
+ height: 110rpx;
+ display: flex;
+ flex-direction: column;
+ margin: 10rpx 30rpx 0 30rpx;
+}
.Information_one{
display: flex;
justify-content: space-between;
+ margin-top: 20rpx;
}
.Information_test{
@@ -795,7 +807,7 @@ page {
.Information_two{
display: flex;
justify-content: space-between;
- margin: 20rpx 0 0 0rpx;
+ margin: 10rpx 0 20rpx 0rpx;
}
.Information_test3{
width: 169rpx;
@@ -838,7 +850,7 @@ line-height: 40rpx;
/* align-items: center; */
}
.right text{
- font-size: 40rpx;
+ font-size: 34rpx;
font-family: DIN Alternate;
color: #FF783C;
/* align-items: center; */
@@ -849,7 +861,7 @@ line-height: 40rpx;
}
.bg_new_box{
background: #F9FBFE;
- height: 300rpx;
+ height: 230rpx;
width: 95%;
margin-top: -30rpx;
margin-left: -10rpx;
@@ -862,7 +874,7 @@ line-height: 40rpx;
.bg_new_right{
position: absolute;
float: right;
- top: 50%;
+ top: 70%;
transform: translateY(-50%);
right: 0;
}
@@ -879,6 +891,7 @@ line-height: 40rpx;
font-family: PingFang SC;
font-weight: 500;
color: #FF783C;
+ margin-top: 20rpx;
}
.new_h2{
margin-top: 30rpx;
@@ -894,14 +907,21 @@ line-height: 40rpx;
bottom: 0;
margin-left: 30rpx;
}
+.list{
+ width: 650rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+}
.list_card {
+ width: 650rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
/* align-items: center; */
color: #333333;
- border-bottom: 1px solid #f7f7f7;
- padding: 30rpx 0;
+ padding: 10rpx 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -911,7 +931,7 @@ line-height: 40rpx;
}
.list_card:last-child {
- margin-top: 29rpx;
+
}
.list_card .special {
@@ -926,6 +946,9 @@ line-height: 40rpx;
}
.new_hh{
margin-bottom: 12rpx;
+font-size: 34rpx;
+color: #333333;
+line-height: 52rpx;
}
.new_submit{
margin-top: 30rpx;
diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
index c9f84d9..d620d8b 100644
--- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml
@@ -8,8 +8,8 @@
已提交人数:{{item.personQty}}
-
-
+
+
diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
index 441c288..03efaa8 100644
--- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
+++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss
@@ -30,7 +30,7 @@ page {
.content .card .list_card{
display: flex;
justify-content: space-around;
- padding: 30rpx;
+ padding: 20rpx;
align-items: center;
color: #333333;
border-top: 1px solid #EAEAEA;
@@ -102,7 +102,7 @@ page {
font-size: 24rpx;
}
.list_card .right .score b{
- font-size: 40rpx;
+ font-size: 36rpx;
font-family: DIN Alternate;
font-weight: bold;
color: #FF783C;
@@ -189,51 +189,60 @@ page {
}
.list_3{
- width: 100%;
+ width: 351rpx;
height: 56rpx;
flex-direction: row;
display: flex;
align-items: center;
justify-content: start;
- margin: 40rpx 0 0 0;
+ margin: 45rpx 0 0 0;
}
.button{
- width: 200rpx;
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- border-radius: 43rpx;
- color: rgba(51,51,51,1);
- font-size: 30rpx;
- font-family:PingFang-SC-Medium;
- margin: 20rpx 0 0 15rpx;
- box-sizing: border-box;
- font-weight: 500rpx;
- height: 56rpx;
- line-height: 86rpx;
- background-color: rgba(57,116,246,1.000000);
- justify-content: center;
- align-items: center;
-
-
+ background-color: rgba(57,116,246,1.000000);
+ border-radius: 28rpx;
+ height: 56rpx;
+ display: flex;
+ flex-direction: column;
+ width: 160rpx;
+ justify-content: center;
+ align-items: center;
}
.button1{
- width: 200rpx;
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- border-radius: 43rpx;
- color: rgba(51,51,51,1);
- font-size: 30rpx;
- font-family:PingFang-SC-Medium;
- margin: 20rpx 0 0 15rpx;
- box-sizing: border-box;
- font-weight: 500rpx;
- height: 56rpx;
- line-height: 86rpx;
- justify-content: center;
- align-items: center;
+ width: 160rpx;
+ height: 56rpx;
+ border-radius: 28rpx;
+ background-color: rgba(255,255,255,1.000000);
+ border: 1px solid rgba(153,153,153,1);
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ margin-right: 40rpx;
+
+}
+.text_one{
+ width: 118rpx;
+ height: 28rpx;
+ font-family: PingFang SC;
+ font-size: 30rpx;
+ color: #333333;
+ line-height: 42rpx;
+ margin-bottom: 10rpx;
+}
+.text_two{
+ width: 118rpx;
+ height: 28rpx;
+ overflow-wrap: break-word;
+ color: rgba(255,255,255,1);
+ font-size: 30rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-bottom: 10rpx;
+ margin-left: 5rpx;
+
}
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
index 5a53f1e..37be075 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -11,6 +11,7 @@ Page({
* 页面的初始数据
*/
data: {
+
attachmentUrl:"",
imageshow:false,
orgid:'',
@@ -56,7 +57,6 @@ Page({
checkResultFlagRouter:options.flag,
})
- console.log(options.resiId,App.globalData.user.agencyId,options.flag)
}
this.showRecordData()
this.toOinspectionStaff()
@@ -109,7 +109,6 @@ Page({
},
onImage(e){
const attachmentUrls = e.currentTarget.dataset.item;
- console.log(attachmentUrls.attachmentUrl);
this.setData({
imageshow: true,
attachmentUrl:attachmentUrls.attachmentUrl
@@ -206,6 +205,7 @@ Page({
item.hiddenDangeList1 = [];
item.hiddenDangeList2 = [];
item.hiddenDangeList3 = [];
+ item.hiddenDangeList4 = [];
item.hiddenDangeList.forEach(itemC => {
if (itemC.hazardStatus === 0) {
item.hiddenDangeList0.push(itemC);
@@ -217,7 +217,6 @@ Page({
});
}
});
-
if(res.data[0].hiddenDangeList){
let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:1}));
this.setData({
@@ -227,6 +226,25 @@ Page({
this.setData({
showList:res.data
})
+ const updatedShowList = this.data.showList.map((item, index, array) => {
+ if (index < array.length - 1) {
+ if (array[index + 1].checkResultFlag === 1 && item.checkResultFlag === 0) {
+ return {
+ ...item,
+ hiddenDangeList3: true
+ };
+ }else{
+ return {
+ ...item,
+ hiddenDangeList3:false
+ };
+ }
+ }
+ return item;
+ });
+ this.setData({
+ showList:updatedShowList
+ })
})
},
toOinspectionStaff(){
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
index 524458f..a0c7f1c 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -128,7 +128,7 @@
{{item.checkResultFlag == 1?'合格':'不合格'}}
- {{item.hiddenDangeList2.length ==0?'未整改隐患: ':'隐患明细:'}}
+ {{!item.hiddenDangeList3?'未整改隐患:':'隐患明细:'}}
{{index + 1}}.{{item.hazardDesc}}
@@ -163,7 +163,7 @@
-
- 已整改隐患:--
拟复查时间: {{item.reviewTime}}