2 Коміти e63797765f ... 1a776dcd2d

Автор SHA1 Опис Дата
  dedsudiyu 1a776dcd2d Merge branch 'VERSIONS-yinHuanQingDan2' into SCHOOL-XiBeiNongLin 4 тижнів тому
  dedsudiyu 4881860509 zc 4 тижнів тому

+ 2 - 2
pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -86,7 +86,7 @@
 								<view class="hidden-content">{{item.examineOpinion}}</view>
 							</view>
 						</view>
-						<view class="photo" @click="lockImg(item.examineUploadList)">
+						<view class="photo" v-if="item.examineUploadList[0]" @click="lockImg(item.examineUploadList)">
 							<img v-for="(item3,index3) in item.examineUploadList" :src="baseUrl+item3.fileUrl">
 						</view>
 						<!-- <view class="list-li">
@@ -99,7 +99,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="voice">
+				<view class="voice" v-if="newData.voiceList[0] && !newData.rectifyStatus">
 					<view class="voice_t">
 						<view class="voice_t_t" v-if="!newData.voiceList[0]"><text>语音备注:</text><text></text></view>
 						<view class="voice_t_b" v-if="newData.voiceList[0]">语音备注:({{newData.voiceList.length}})

+ 3 - 3
pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -36,7 +36,7 @@
 						<view>检查时间</view>
 						<view>{{newData.checkTime}}</view>
 					</view>
-					<view class="voice">
+					<!-- <view class="voice">
 						<view class="voice_t">
 							<view class="voice_t_t" v-if="!newData.voiceList[0]"><text>语音备注:</text><text></text></view>
 							<view class="voice_t_b" v-if="newData.voiceList[0]">语音备注:({{newData.voiceList.length}})
@@ -49,7 +49,7 @@
 								{{voiceItem.fileLength}}″
 							</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 				<view v-if="pageType==1 || pageType==2" v-for="(item,index) in newData.checkRectifyVoList" :key="index">
 					<view class="list-li" v-if="item.rectifyTime" @click="rectifyCollapse(item)">
@@ -86,7 +86,7 @@
 					<view v-if="item.reviewCollapse && item.reviewTime">
 						<view v-if="item.examineOpinion" class="hidden-content" >{{item.examineOpinion}}
 						</view>
-						<view class="photo"  @click="lockImg(item.examineUploadList)">
+						<view class="photo" v-if="item.examineUploadList[0]" @click="lockImg(item.examineUploadList)">
 							<img v-for="(item3,index3) in item.examineUploadList" :src="baseUrl+item3.fileUrl">
 						</view>
 						<!-- <view class="list-li">

+ 1 - 1
pages_safetyCheck/views/planDetail.vue

@@ -273,7 +273,7 @@
 
 			.list {
 				width: 690rpx;
-				height: 323rpx;
+				// height: 323rpx;
 				background: #FFFFFF;
 				border-radius: 20rpx 20rpx 20rpx 20rpx;
 				padding: 0 30rpx;