zc

pages/views/login/login.vue

@@ -1,5 +1,6 @@
 <template>
 	<view id="login">
+		<img class="logo-img" :src="imagesUrl('commonality/logo%401x.png')">
 		<view class="title-1">欢迎使用</view>
 		<view class="title-2">实验室安全智慧化管控系统</view>
 		<view class="null-p"></view>
@@ -51,6 +52,11 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
+		.logo-img{
+			width:370rpx;
+			height:68rpx;
+			margin:320rpx 190rpx 0;
+		}
 		.position-top-right-box{
 			position: absolute;
 			top:0;
@@ -77,7 +83,7 @@
 			height:55rpx;
 			text-align: center;
 			color:#333;
-			margin:200rpx 0 31rpx;
+			margin:90rpx 0 31rpx;
 		}
 		.title-2{
 			font-size:38rpx;

pages_basics/views/photoInspection.vue

@@ -176,9 +176,7 @@
 				let self = this;
 				let obj = {
 					photoList: [],
-				}
-				if(this.isotope){
-					obj.isotope = true;
+					isotope:this.isotope
 				}
 				for (let i = 0; i < self.outCheckData.list.length; i++) {
 					obj.photoList.push({
@@ -207,10 +205,8 @@
 			async laboratoryAppletSignOutSubmit() {
 				let self = this;
 				let obj = {
-					subId:this.subId
-				}
-				if(this.isotope){
-					obj.isotope = true;
+					subId:this.subId,
+					isotope:this.isotope,
 				}
 				const {
 					data

pages_basics/views/record/index.vue

@@ -29,6 +29,7 @@
 						</view>
 						<view class="position-right"></view>
 					</view>
+					<view class="titme-bottom-p">{{minItem.subName}}{{minItem.roomNum?'('+minItem.roomNum+')':''}}</view>
 					<view class="titme-bottom-p">签到时间：{{minItem.inTime?minItem.inTime:'-'}}</view>
 					<view class="titme-bottom-p">离开时间：{{minItem.outTime?minItem.outTime:'-'}}</view>
 					<view class="titme-bottom-p">停留时间：{{minItem.hoursMinutes?minItem.hoursMinutes:'-'}}</view>

pages_basics/views/record/infoPage.vue

@@ -13,6 +13,7 @@
 				</view>
 				<view class="position-right"></view>
 			</view>
+			<view class="titme-bottom-p">{{minItem.subName}}{{minItem.roomNum?'('+minItem.roomNum+')':''}}</view>
 			<view class="titme-bottom-p">签到时间：{{minItem.inTime?minItem.inTime:'-'}}</view>
 			<view class="titme-bottom-p">离开时间：{{minItem.outTime?minItem.outTime:'-'}}</view>
 			<view class="titme-bottom-p">停留时间：{{minItem.hoursMinutes?minItem.hoursMinutes:'-'}}</view>

pages_manage/api/index.js

@@ -301,3 +301,15 @@ export function systemSubjectGetAppSubjectByLogin(data) {
 }
 
 
+//远程开门-记录开门时间/开门状态
+export function laboratoryLabOpenLockLogUpdateLockData(data) {
+	return apiResquest({
+		url: '/laboratory/labOpenLockLog/updateLockData',
+		method: 'post',
+		data: {
+			...data
+		}
+	})
+}
+
+

pages_manage/views/accessControl/remoteOpen.vue

@@ -43,7 +43,8 @@
 	import {
 		systemSubjectGetAppSubjectByLogin,
 		laboratoryApplyRemoteOpenLock,
-		applyRemoteOpenLockConfirm
+		applyRemoteOpenLockConfirm,
+		laboratoryLabOpenLockLogUpdateLockData
 	} from '@/pages_manage/api/index.js'
 	export default {
 		components: {
@@ -118,7 +119,7 @@
 						this.$set(this, 'msgId', data.data[0])
 						this.$set(this, 'authorizeStatus', 3)
 						this.$set(this, 'successVisible', true)
-						this.getMsg();
+						this.getMsg(row.subId);
 					}else{
 						this.$set(this, 'authorizeStatus', 2)
 						this.$set(this, 'successVisible', true)
@@ -126,7 +127,7 @@
 					}
 				}
 			},
-			async applyRemoteOpenLockConfirm() {
+			async applyRemoteOpenLockConfirm(subId) {
 				let self = this;
 				let obj = {
 					messageId: this.msgId,
@@ -138,15 +139,32 @@
 					if (data.data) {
 						this.$set(this, 'authorizeStatus', 1)
 						this.$set(this, 'successVisible', true)
+						this.laboratoryLabOpenLockLogUpdateLockData(subId,1);
 						this.getCode();
 					} else {
 						this.$set(this, 'authorizeStatus', 2)
 						this.$set(this, 'successVisible', true)
+						this.laboratoryLabOpenLockLogUpdateLockData(subId,0);
 						this.getCode();
 					}
 					this.$set(this, 'msgId','')
 				}
 			},
+			async laboratoryLabOpenLockLogUpdateLockData(subId,type) {
+				let self = this;
+				let obj = {
+					subjectId: subId,
+					userId: uni.getStorageSync('userId'),
+					openStatus:type
+				}
+				const {
+					data
+				} = await laboratoryLabOpenLockLogUpdateLockData(obj);
+				if(data.code == 200) {
+					
+				}
+			},
+			
 			//滚动加载事件
 			scrollGet() {
 				let self = this;
@@ -199,7 +217,7 @@
 				this.systemSubjectGetAppSubjectByLogin();
 			},
 			//关闭弹框倒计时
-			getMsg() {
+			getMsg(subId) {
 				let self = this;
 				const TIME_COUNT = 5;
 				if (!self.timer) {
@@ -212,7 +230,7 @@
 							self.successVisible = false;
 							clearInterval(self.timer);
 							self.timer = null;
-							self.applyRemoteOpenLockConfirm();
+							self.applyRemoteOpenLockConfirm(subId);
 						}
 					}, 1000);
 				}