heyang

api/request/config.js

@@ -20,10 +20,9 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/api/', //暨大化材
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
     //base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
-	// base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
-	// base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
+	base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'http://172.16.0.65/api/', //西北农林
-	base_url: 'https://lab.zjznai.com/labapp/', //43测试
+	//base_url: 'https://lab.zjznai.com/labapp/', //43测试
 }
 export {
 	config

pages_manage/views/laboratory/safetyCardScan.vue

@@ -97,7 +97,7 @@
 				src="@/pages_safetyCheck/images/icon_aqjc_suishoupai.png">
 		</view>
 		<!-- 安全检查 -->
-		<scanCodeCheck v-if="securityCheck"  :subjectData="subjectData"></scanCodeCheck>
+		<scanCodeCheck v-if="securityCheck" :subjectData="subjectData"></scanCodeCheck>
 		<!-- 物联控制 -->
 		<iotControl ref="iotControl" v-if="pageType == 1" :subjectData="subjectData"></iotControl>
 		<!-- 进出记录 -->
@@ -173,8 +173,8 @@
 				//语音广播弹窗
 				broadcastPage: false,
 				broadcastPage: false,
-				securityCheck:false,
-				form:{},
+				securityCheck: false,
+				form: {},
 			}
 		},
 		// 父页面
@@ -204,7 +204,7 @@
 
 		},
 		onShow() {
-			this.$set(this,'securityCheck',false)
+			this.$set(this, 'securityCheck', false)
 		},
 		mounted() {
 
@@ -257,7 +257,7 @@
 				} else if (type == 'conditioningClose') {
 					//空调弹窗关闭
 					this.$set(this, 'conditioningPage', false);
-				}else if (type == 'back') {
+				} else if (type == 'back') {
 					this.$set(this, 'pageType', 2);
 				}
 			},
@@ -278,7 +278,7 @@
 					this.$set(this, 'pageType', index);
 				}
 			},
-			goPage(type,status) {
+			goPage(type, status) {
 				if (!pageRestrictVerify(type)) {
 					uni.showToast({
 						title: '没有相关权限,请联系管理员',
@@ -287,10 +287,10 @@
 						duration: 2000
 					});
 					return
-				}else if (type == 'securityCheck') {
-					if(status){
+				} else if (type == 'securityCheck') {
+					if (status) {
 						this.$set(this, "securityCheck", true)
-					}else{
+					} else {
 						this.$set(this, "securityCheck", false)
 					}
 				} else if (type == 'snapshot') {
@@ -463,7 +463,7 @@
 							background: rgba(255, 0, 0, 0.2);
 							border-radius: 10rpx 10rpx 10rpx 10rpx;
 							border: 2rpx solid #FF0000;
-							width: 180rpx;
+							width: 200rpx;
 							height: 40rpx;
 							margin-left: 10rpx;
 
@@ -475,6 +475,9 @@
 								color: #FF0000;
 								line-height: 40rpx;
 								text-align: center;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
 							}
 
 							>text:nth-of-type(1) {
@@ -491,6 +494,9 @@
 						line-height: 42rpx;
 						text-align: left;
 						margin-top: 10rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
 					}
 				}
 
@@ -745,6 +751,6 @@
 			.position-button-p-2 {}
 		}
 
-		
+
 	}
 </style>

pages_safetyCheck/component/checkItemModule.vue

@@ -62,6 +62,7 @@
 	},
  -->
 <template>
+	<scroll-view scroll-y style="overflow-y: scroll;">
 	<view class="checkItemModule">
 		<!-- 标签选项卡 -->
 		<view class="checkItemModule-title-box">
@@ -145,6 +146,7 @@
 			</view>
 		</view>
 	</view>
+	</scroll-view>
 </template>
 
 <script>
@@ -563,7 +565,7 @@
 				.for-box {
 					.for-box-n {
 						margin: 0 21rpx;
-						font-size: 29rpx;
+						font-size: 32rpx;
 						line-height: 40rpx;
 						padding: 20rpx 0;
 						background-color: #fff;
@@ -607,7 +609,7 @@
 
 				>view {
 					>view {
-						font-size: 25rpx;
+						font-size: 32rpx;
 						line-height: 70rpx;
 						margin: 0 21rpx;
 						border-bottom: 1px solid #dedede;

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -69,6 +69,7 @@
 				<view class="get-data-text">上拉加载</view>
 			</view>
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
+			
 		</scroll-view>
 		<checkItemModule :propsData="propsData" v-if="checkItemModuleType"></checkItemModule>
 		<!-- 	<view class="sub-btn" @click="submitBtn(1)" v-if="pageType==0 && inspectRemporary">开展检查</view> -->

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -38,10 +38,10 @@
 					<view v-if="pageType==1 || pageType==2" class="photo" @click="lockImg(newData.yhDtoList)">
 						<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
 					</view>
-					<view class="list-li">
+					<!-- <view class="list-li">
 						<view>检查人：</view>
 						<view>{{newData.checkUserName}}</view>
-					</view>
+					</view> -->
 					<view class="list-li">
 						<view>检查时间</view>
 						<view>{{newData.checkTime}}</view>

pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -37,10 +37,10 @@
 					<view class="photo" @click="lockImg(newData.yhDtoList)">
 						<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
 					</view>
-					<view class="list-li">
+					<!-- <view class="list-li">
 						<view>姓名：</view>
 						<view>{{newData.checkUserName}}</view>
-					</view>
+					</view> -->
 					<view class="list-li">
 						<view>检查时间</view>
 						<view>{{newData.checkTime}}</view>

pages_safetyCheck/views/safetyCheck.vue

@@ -130,6 +130,7 @@
 
 		},
 		onShow() {
+			this.$set(this,'securityCheck',false)
 			this.getList()
 		},
 		mounted() {