接口没地址

subpages/InspectionReport/pages/InspectionReport/InspectionReport.js

@@ -131,7 +131,7 @@ Page({
       hiddenDangeList:[...this.data.hiddenDangeList,{hazardStatus:2,hazardDesc:this.data.hazardDesc2}] ,
       attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
       remark: '',
-      address:this.data.addressContent
+      reviewAddress:this.data.addressContent
     }).then(
       res => {
         if(res.code == 0){

subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml

@@ -28,7 +28,7 @@
   </view>
   
   <view class="prosecutors" bind:tap="showPopup">
-    <view>
+    <view class="conclusion">
       <text class="prosecutors_req">*</text>
       <text class="prosecutors_pre">检查人员</text>
       <text class="prosecutors_name">{{ selectedNames }}</text>
@@ -39,7 +39,7 @@
   </view>
   <view class="pitfall">
     <view class="prosecutors">
-      <view>
+      <view class="conclusion">
         <text class="prosecutors_req"  wx:if="{{checkResultFlag == 0}}">*</text>
         <text class="prosecutors_pre">隐患明细</text>
       </view>

subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss

@@ -1,252 +1,3 @@
-/* page {
-  width: 100%;
-  height: auto;
-  overflow-y: auto;
-  background: #f7f7f7;
-  padding-bottom: 20rpx;
-  box-sizing: border-box;
-}
-.header{
-  height: 80rpx;
-  display: flex;
-  background-color: white;
-  flex-direction: row;
-  justify-content: space-between;
-}
-.header_left{
-  display:flex;
-  flex-direction: row;
-  margin-left: 20rpx;
-}
-.header_img{
-  width: 36rpx;
-  height: 36rpx;
-  margin-top: 10rpx;
-}
-.inside{
-  display: flex;
-  flex-direction: column;
-  margin-left: 10rpx;
-}
-.text1{
-  width: 374rpx;
-  height: 30rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 32rpx;
-  font-family: PingFang-SC-Regular;
-  font-weight: normal;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin-left: 1rpx;
-}
-.text2{
-  width: 382rpx;
-  height: 24rpx;
-  overflow-wrap: break-word;
-  color: rgba(172,172,172,1);
-  font-size: 24rpx;
-  font-family: PingFang-SC-Regular;
-  font-weight: normal;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin-top: 10rpx;
-}
-.header_right{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-right: 30rpx;
-}
-.text3{
-  width: 118rpx;
-  height: 28rpx;
-  overflow-wrap: break-word;
-  color: rgba(56,135,248,1);
-  font-size: 30rpx;
-  font-family: PingFang-SC-Regular;
-  font-weight: normal;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-.from{
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  border-radius: 15rpx;
-  background-color: rgb(255, 255, 255);
-  margin: 30rpx;
-}
-.prosecutors{
-  display: flex;
-  flex-direction:row;
-  align-items: center;
-  margin: 20rpx;
-  justify-content: space-between;
-  height: 70rpx;
-  border-bottom: 1px solid #EAEAEA;
-  align-items: center;
-}
-.hidden_top{
-  display: flex;
-  flex-direction:row;
-  align-items: center;
-  margin: 20rpx;
-  justify-content: space-between;
-  height: 50rpx;
-}
-.prosecutors_req{
-  color: red;
-  margin: 5rpx
-}
-.prosecutors_pre{
-  width: 125rpx;
-  height: 30rpx;
-  overflow-wrap: break-word;
-  color: rgba(102,102,102,1);
-  font-size:32rpx;
-  font-weight: normal;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin-left: 6rpx;
-  margin-bottom: 10rpx;
-}
-.prosecutors_pre1{
-  width: 125rpx;
-  height: 30rpx;
-  overflow-wrap: break-word;
-  color: rgba(102,102,102,1);
-  font-size:32rpx;
-  font-weight: normal;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin-left: 30rpx;
-  margin-bottom: 10rpx;
-}
-.prosecutors_name{
-  width: 93rpx;
-  height: 30rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 32rpx;
-  font-weight: normal;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin-left: 60rpx;
-}
-.prosecutors_img{
-  width: 40rpx;
-  height: 30rpx;
-  margin-right: 30rpx;
-}
-.hidden{
-  display: flex;
-  flex-direction: column;
-}
-.hidden_button{
-  display: flex;
-  flex-direction: column;
-}
-.input{
-  background-color: rgba(247,247,247,1.000000);
-  border-radius: 10rpx;
-  height: 100rpx;
-  display: flex;
-  flex-direction: column;
-  width: 650rpx;
-  margin-left: 40rpx;
-  height: 90rpx;
-}
-.input_pre{
-
-  width: 650rpx;
-
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 32rpx;
-  font-weight: normal;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin-left: 60rpx;
-}
-.add{
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin: 20rpx;
-}
-.add_img{
-  width: 40rpx;
-  height: 40rpx;
-}
-.add_text{
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 32rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 48rpx;
-}
-.input1{
-  margin-left: 60rpx;
-}
-.date{
-  display: flex;
-  flex-direction:row;
-  align-items: center;
-  margin: 20rpx;
-  height: 70rpx;
-  border-bottom: 1px solid #EAEAEA;
-  align-items: center;
-}
-.attachment{
-  display: flex;
-  flex-direction: column;
-  margin: 20rpx;
-}
-.shangchuan{
-  margin: 20rpx;
-}
-.textarea1{
-  margin-top: 20rpx;
-  background-color:#f7f7f7 ;
-  width: 100%;
-  height: 200rpx;
-}
-.text-wrapper_11 {
-  background-color: rgba(57,116,246,1.000000);
-  border-radius: 43rpx;
-  height: 86rpx;
-  display: flex;
-  flex-direction: column;
-  width: 630rpx;
-  margin: 60rpx 0 57rpx 60rpx;
-}
-.text_29 {
-  width: 62rpx;
-  height: 31rpx;
-  overflow-wrap: break-word;
-  color: rgba(255,255,255,1);
-  font-size: 32rpx;
-  font-family: PingFang-SC-Bold;
-  font-weight: 700;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 60rpx;
-  margin: 25rpx 0 0 284rpx;
-} */
-
 
 page {
   width: 100%;
@@ -269,7 +20,7 @@ page {
   align-items: center;
   margin: 20rpx;
   justify-content: space-between;
-  height: 50rpx;
+  height: 80rpx;
   border-bottom: 1px solid #EAEAEA;
 }
 .conclusion{
@@ -281,16 +32,16 @@ page {
   margin: 5rpx
 }
 .prosecutors_pre{
-  width: 125rpx;
+  width: 124rpx;
-  height: 30rpx;
+  height: 31rpx;
   overflow-wrap: break-word;
-  color: rgba(102,102,102,1);
+  color: rgba(51,51,51,1);
-  font-size:32rpx;
+  font-size: 32rpx;
+  font-family: PingFang-SC-Regular;
   font-weight: normal;
   text-align: left;
   white-space: nowrap;
   line-height: 42rpx;
-  margin-left: 6rpx;
 }
 .prosecutors_name{
   width: 150px;
@@ -633,7 +384,8 @@ margin-bottom: 20rpx;
   height: 40rpx;
 }
 .header{
-  height: 80rpx;
+  width: 748rpx;
+  height: 100rpx; 
   display: flex;
   background-color: white;
   flex-direction: row;

subpages/safetyinspection/pages/safetyinspection/safetyinspection.js

@@ -150,6 +150,7 @@ Page({
       id: this.data.companyId
     }
     showRecord(parm).then(res => {
+      console.log(res)
       if(res.data[0].hiddenDangeList){
         let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:0}));
         let checkboxOptionsnumber=checkboxOptions.length+1;

subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml

@@ -139,7 +139,7 @@
           </view>
           <view wx:if="{{index}}" >
             <text class="logs-content-title">巡查定位：</text>
-            <text class="logs-content-txt">{{item.name}}</text>
+            <text class="logs-content-txt">{{item.address}}</text>
           </view>
       </view>
     </view>