heyang 2 年 前
コミット
f6e774f45f

+ 0 - 16
pages_manage/workbench/problemRectification/rectifyDetails.vue

@@ -66,10 +66,6 @@
 					<img src="@/pages_manage/images/Version2.2/icon_aqjc_zgxx.png">
 					<view>整改信息</view>
 				</view>
-				<!-- <view class="bottom-info-text-box" v-if="details.spStatus==4">
-					<view>整改结果:</view>
-					<view>{{newData.zgJg}}</view>
-				</view> -->
 				<view class="bottom-info-text-box" v-if="details.spStatus==2">
 					<view>驳回原因:</view>
 					<view>{{details.spMs}}</view>
@@ -86,18 +82,6 @@
 								<view>隐患描述:</view>
 								<view>{{details.yhMs}}</view>
 							</view>
-							<!-- <view class="rectified-for-text-box" v-if="details.isZg == 0 && newData.zgType == 0">
-								<view>整改描述:</view>
-								<view>{{details.zgMs}}</view>
-							</view> -->
-						<!-- 	<view class="rectified-for-text-box" v-if="details.isZg == 0 && newData.zgType == 1">
-								<view>原因分析:</view>
-								<view>{{details.zgYyfx}}</view>
-							</view>
-							<view class="rectified-for-text-box" v-if="details.isZg == 0 && newData.zgType == 1">
-								<view>整改措施:</view>
-								<view>{{details.zgCs}}</view>
-							</view> -->
 							<view class="rectified-for-text-box" v-if="details.isZg == 1">
 								<view>证明信息:</view>
 								<view>{{details.zmClMs}}</view>

+ 7 - 11
pages_manage/workbench/problemRectification/rectifyList.vue

@@ -14,9 +14,9 @@
 			<view class="for-big-box">
 				<view class="for-box" @click="goInfo(item)" v-for="(item,index) in infoList" :key="index">
 					<view class="for-title-box">
-                        <view v-if="item.isYuqi" class="viewColor1">逾期</view>
+                        <view  v-if="item.isYuqi" class="viewColor1">逾期</view>
 						<view v-if="!item.isYuqi" :class="item.spStatus==5?'viewColor1':(item.spStatus==0?'viewColor2':(item.spStatus==1?'viewColor3':(item.spStatus==2?'viewColor4':(item.spStatus==3?'viewColor5':(item.spStatus==4?'viewColor6':'')))))">{{item.spStatus==5?'逾期':(item.spStatus==0?'待整改':(item.spStatus==1?'待复核':(item.spStatus==2?'驳回':(item.spStatus==3?'整改中':(item.spStatus==4?'已完成':'')))))}}</view>
-						<view>{{item.laboratoryName}}</view>
+						<view class="min-for-name-p">{{item.laboratoryName}}</view>
 						<view v-if="item.zgType == 1">(重大)</view>
 					</view>
 					<view class="for-address-box">
@@ -268,7 +268,7 @@
 						margin:0 26rpx 0;
 						border-top:1rpx solid #dedede;
 						padding-top:45rpx;
-						view:nth-child(1){
+						view:nth-of-type(1){
 							width:98rpx;
 							line-height:38rpx;
 							height:38rpx;
@@ -277,19 +277,15 @@
 							text-align center;
 							margin-right:10rpx;
 						}
-						view:nth-child(2){
-							flex:1;
-							font-size:30rpx;
-							color:#333;
-							height:36rpx;
-							lin-height:36rpx;
-							margin-right:10rpx;
+						.min-for-name-p{
+							width: 472rpx;
+						    font-size:28rpx;
 							display:block;
 							overflow:hidden;
 							text-overflow:ellipsis;
 							white-space:nowrap;
 						}
-						view:nth-child(3){
+						view:nth-of-type(3){
 							font-size:30rpx;
 							color:#333;
 							height:36rpx;

+ 4 - 1
pages_manage/workbench/securityCheck/inspectionRecords.vue

@@ -295,7 +295,8 @@
 		                    margin-right:20rpx;
 		                }
 		                .min-for-name-p{
-		                    flex:1;
+		                    
+							width: 400rpx;
 		                    font-size:28rpx;
 							display:block;
 							overflow:hidden;
@@ -308,6 +309,8 @@
 							margin-right:10rpx;
 						}
 		                .min-for-timee-p{
+							flex: 1;
+							text-align: right;
 		                    font-size:26rpx;
 		                    color:#999;
 		                }