Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-xcx

pages_basics/views/record/index.vue

@@ -217,7 +217,7 @@
 
 			.right-time-box {
 				flex: 1;
-				height: 80rpx;
+				height: 70rpx;
 			}
 		}
 

pages_manage/views/accessQualification/accessQualification.vue

@@ -74,11 +74,11 @@
 			}
 		},
 		onLoad() {
-			this.clearData();
-			this.getList();
+			
 		},
 		onShow() {
-			
+			this.clearData();
+			this.getList();
 		},
 		mounted() {
 

pages_manage/views/laboratory/iotControl.vue

@@ -15,8 +15,8 @@
 		<view class="sensor">
 			<view v-for="(item,index) in sensorData" :key="index">
 				<img class="sensor-l" :src="baseUrl+item.icon"/>
-				<veiw class="sensor-r">{{item.deviceName}}:
-					{{item.deviceValue?item.deviceValue:''}}{{item.unit?item.unit:''}}</veiw>
+				<view class="sensor-r">{{item.deviceName}}:
+					{{item.deviceValue?item.deviceValue:''}}{{item.unit?item.unit:''}}</view>
 			</view>
 		</view>
 		<!-- 智能控制 -->
@@ -162,7 +162,7 @@
 								setTimeout(function(){
 									self.iotAppHardwareFindByType();
 								},200)
-								
+
 								console.log('用户点击确定');
 							} else if (res.cancel) {
 								console.log('用户点击取消');
@@ -464,13 +464,13 @@
 			box-sizing: border-box;
 
 			>view {
-				
+
 				min-height: 66rpx;
 				width: 355rpx;
 				display: flex;
 				justify-content: flex-start;
 				align-content: center;
-				
+
 				.sensor-l {
 					flex-shrink: 0;
 					width: 42rpx;

pages_safetyExamine/views/dangerManage/dangerDetail.vue

@@ -20,7 +20,7 @@
 					</view>
 					<view class="basics_li">
 						<text>实验室：</text>
-						<text>{{infoData.subjectName}}-{{infoData.roomNumber}}</text>
+						<text>{{infoData.subjectName}}-{{infoData.roomNumber?infoData.roomNumber:''}}</text>
 					</view>
 					<view class="basics_li">
 						<text>楼栋：</text>

pages_safetyExamine/views/examineManage/examineDetail.vue

@@ -9,7 +9,7 @@
 				</view>
 				<view class="basics_li">
 					<text>实验室：</text>
-					<text>{{infoData.subjectName}}-{{infoData.roomNumber}}</text>
+					<text>{{infoData.subjectName}}-{{infoData.roomNumber?infoData.roomNumber:''}}</text>
 				</view>
 				<view class="basics_li">
 					<text>楼栋：</text>

pages_safetyExamine/views/examineManage/examineList.vue

@@ -36,7 +36,7 @@
 							<img v-if="item.checkRange==3" src="@/pages_safetyExamine/images/icon_xyxc_sys.png" />
 							<text></text>
 						</view>
-						<view class="list_three_li_t_c">{{item.subjectName}}-{{item.roomNumber}}</view>
+						<view class="list_three_li_t_c">{{item.subjectName}}-{{item.roomNumber?item.roomNumber:''}}</view>
 						<view class="list_three_li_t_c2" v-if="item.isOverdue==1">已逾期</view>
 						<view class="list_three_li_t_r"></view>
 					</view>

pages_safetyExamine/views/safetyExamineWorkbench.vue

@@ -94,7 +94,7 @@
 								<text></text>
 							</view>
 							<view class="list_tow_li_t_c" v-if="curTabTow==0 || curTabTow==1">
-								{{item.subjectName}}-{{item.roomNumber}}</view>
+								{{item.subjectName}}-{{item.roomNumber?item.roomNumber:''}}</view>
 							<view class="list_tow_li_t_c" v-if="curTabTow==2 && item.rectifyStatus==3">{{item.subRoom}}
 							</view>
 							<view class="list_tow_li_t_c2" v-if="(curTabTow==0 || curTabTow==1) && item.isOverdue==1">