diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 3b85f54..460e7ee 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -5,7 +5,7 @@ page {
height: auto;
display: flex;
flex-direction: column;
- background-color: #f7f7f7;
+ background-color: black;
/* z-index: -9999; */
}
.header {
@@ -735,8 +735,9 @@ page {
width: 700rpx;
height:auto ;
background-color: #FFFFFF;
- margin: 30rpx 0 0 30rpx;
+ margin: 20rpx 0 0 30rpx;
border-radius: 20rpx;
+ overflow: hidden;
}
.hd_news{
display: flex;
@@ -834,8 +835,10 @@ line-height: 40rpx;
font-family: DIN Alternate;
color: #FF783C;
/* align-items: center; */
+
}
.right{
+ margin-right: 30rpx;
}
.bg_new_box{
background: #F9FBFE;
@@ -961,7 +964,7 @@ line-height: 40rpx;
display: flex;
flex-direction:row;
justify-content: space-between;
- margin: 21rpx 0 0 30rpx;
+ margin: 23rpx 0 0 30rpx;
}
.door{
display:flex;
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
index fc37d66..8fef7cd 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -192,6 +192,7 @@ Page({
id: this.data.companyId
}
showRecord(parm).then(res => {
+
res.data.forEach(item => {
if (item.hiddenDangeList) {
item.hiddenDangeList0 = [];
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
index 30b61a4..084c3fb 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -129,7 +129,7 @@
{{item.checkResultFlag == 1?'合格':'不合格'}}
- {{index==0?'未整改隐患: ':'隐患明细:'}}
+ {{item.hiddenDangeList2.length ==0?'未整改隐患: ':'隐患明细:'}}
{{index + 1}}.{{item.hazardDesc}}
@@ -156,7 +156,7 @@
备注:
{{item.remark||'--'}}
-
+
巡查定位:
{{item.reviewAddress}}