From b12ff2272307b52f4d6e9efde255f4a77dcecc34 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 28 May 2024 13:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B6=85=E6=97=B6=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/utils.js                   |   3 +-
 src/pages/foam/check.vue              |  28 +++-
 src/pages/foam/downLink.vue           |  26 +++-
 src/pages/foam/foamNoGood.vue         |  27 +++-
 src/pages/foam/input.vue              |  27 +++-
 src/pages/foam/upLink.vue             |  26 +++-
 src/pages/index/index.vue             |  62 +++-----
 src/pages/login/index.vue             |   1 +
 src/pages/plastics/check.vue          |  25 +++-
 src/pages/plastics/input.vue          |  25 +++-
 src/pages/plastics/plasticsNoGood.vue |  26 +++-
 src/pages/plastics/scanCode.vue       |  28 +++-
 src/pages/setter/index.vue            | 201 +++++++++++++-------------
 src/pages/setter/index_bat.vue        | 173 ++++++++++++++++++++++
 src/static/config.js                  |   4 +-
 15 files changed, 492 insertions(+), 190 deletions(-)
 create mode 100644 src/pages/setter/index_bat.vue

diff --git a/src/common/utils.js b/src/common/utils.js
index f30fa7d..9fb9d21 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -14,4 +14,5 @@ export function showConfirmMsg(title, content,showCancel, callback) {
 			}
 		}
 	})
-}
\ No newline at end of file
+}
+
diff --git a/src/pages/foam/check.vue b/src/pages/foam/check.vue
index 2067acb..c3f6689 100644
--- a/src/pages/foam/check.vue
+++ b/src/pages/foam/check.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page-wraper" >
+	<view class="page-wraper" @touchstart="touchScreen">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 			<!-- <view class="flex u-col-center space-between"> -->
@@ -79,6 +79,7 @@
 <script>
 	import customerFrom from "@/mycomponents/form/customerFrom.vue"
 	import winScanNormal from "@/mycomponents/scan/winScanNormal.vue"
+	import config from '@/static/config.js'
 	import {
 		getCurrDateTime,
 		deepCopyData
@@ -104,6 +105,9 @@
 				deviceCheckCode: "",
 				deviceName: "",
 				worker: this.$store.state.user.name,
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut: config.pageTimeOut,
 				dataList: [],
 				formData: [{
 						type: "stateSelect",
@@ -226,13 +230,29 @@
 			}
 		},
 		computed: {},
-		onLoad() {
 
+		onShow() {
+			this.lastTime = new Date().getTime()
 		},
+		
+
 		mounted() {
 			this.$refs.inputDevice.focused = true
 		},
 		methods: {
+			touchScreen() {
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
+				}
+			},
 			getScanResult(result) {
 				uni.showLoading({
 					title: "加载中",
@@ -305,8 +325,8 @@
 				this.deviceName = "";
 				this.dateTime = "";
 				this.dateTime = "",
-				this.deviceName = "",
-				this.worker = ""
+					this.deviceName = "",
+					this.worker = ""
 				this.dataList = []
 				// this.reset();
 			},
diff --git a/src/pages/foam/downLink.vue b/src/pages/foam/downLink.vue
index 27eb484..b0ea468 100644
--- a/src/pages/foam/downLink.vue
+++ b/src/pages/foam/downLink.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page-wraper">
+	<view class="page-wraper" @touchstart="touchScreen">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 
@@ -90,6 +90,7 @@
 		getCurrDateTime,
 	} from "@/common/basic.js"
 	import selectClickList from "@/mycomponents/popup/selectClickList.vue"
+	import config from '@/static/config.js'
 
 	export default {
 		components: {
@@ -108,18 +109,31 @@
 				planList: [],
 				scanCode: "",
 				scanCheckCode:"",
-
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut: config.pageTimeOut
 
 			}
 		},
 		computed: {},
-		onLoad() {},
-		onUnload() {},
-		onReady() {
-
+		onShow(){
+			this.lastTime = new Date().getTime()
 		},
 
 		methods: {
+			touchScreen() {
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
+				}
+			},
 			submit() {
 				if (this.scanCheckCode == "") {
 					this.scanCheckCode=""
diff --git a/src/pages/foam/foamNoGood.vue b/src/pages/foam/foamNoGood.vue
index 42c6eb5..49bd100 100644
--- a/src/pages/foam/foamNoGood.vue
+++ b/src/pages/foam/foamNoGood.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page-wraper">
+	<view class="page-wraper" @touchstart="touchScreen">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 
@@ -151,6 +151,7 @@
 		getCurrDateTime,
 	} from "@/common/basic.js"
 	import selectClickList from "@/mycomponents/popup/selectClickList.vue"
+	import config from '@/static/config.js'
 
 	export default {
 		components: {
@@ -176,19 +177,33 @@
 				type: "",
 				typeCode:"",
 				mode: 'selector',
-				reasonRange: ['破损', '返工与返修'],
+				reasonRange: [],
 				typeRange: ["隔离", "报废"],
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut: config.pageTimeOut
 
 			}
 		},
 		computed: {},
-		onLoad() {},
-		onUnload() {},
-		onReady() {
-
+		onShow(){
+			this.lastTime = new Date().getTime()
 		},
 
 		methods: {
+			touchScreen() {
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
+				}
+			},
 
 			showTypePicker() {
 				this.showType = true;
diff --git a/src/pages/foam/input.vue b/src/pages/foam/input.vue
index 88d5ccb..156f5b2 100644
--- a/src/pages/foam/input.vue
+++ b/src/pages/foam/input.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page-wraper">
+	<view class="page-wraper" @touchstart="touchScreen">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 			<!-- <view class="flex u-col-center space-between">
@@ -111,6 +111,7 @@
 		getCurrDateTime,
 	} from "@/common/basic.js"
 	import selectClickList from "@/mycomponents/popup/selectClickList.vue"
+	import config from '@/static/config.js'
 
 	export default {
 		components: {
@@ -130,19 +131,33 @@
 					origin: []
 				},
 				materialList: [],
-				planList: []
+				planList: [],
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut: config.pageTimeOut
 
 
 			}
 		},
 		computed: {},
-		onLoad() {},
-		onUnload() {},
-		onReady() {
-
+		onShow(){
+			this.lastTime = new Date().getTime()
 		},
 
 		methods: {
+			touchScreen() {
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
+				}
+			},
 			submit() {
 				if (this.planNumber == "") {
 					this.showMessage("请选择计划单号")
diff --git a/src/pages/foam/upLink.vue b/src/pages/foam/upLink.vue
index 24f8743..a61d52b 100644
--- a/src/pages/foam/upLink.vue
+++ b/src/pages/foam/upLink.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page-wraper">
+	<view class="page-wraper" @touchstart="touchScreen">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 		</view>
@@ -109,6 +109,7 @@
 		getCurrDateTime,
 	} from "@/common/basic.js"
 	import selectClickList from "@/mycomponents/popup/selectClickList.vue"
+	import config from '@/static/config.js'
 
 	export default {
 		components: {
@@ -128,18 +129,31 @@
 				planList: [],
 				scanCode: "",
 				scanCheckCode:"",
-
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut: config.pageTimeOut
 
 			}
 		},
 		computed: {},
-		onLoad() {},
-		onUnload() {},
-		onReady() {
-
+		onShow(){
+			this.lastTime = new Date().getTime()
 		},
 
 		methods: {
+			touchScreen() {
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
+				}
+			},
 			submit() {
 				if (this.planNumber == "") {
 					this.showMessage("请选择计划单号")
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 09cb767..1a61697 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="u-wrap" @touchstart="touchScreen" @touchcancel="touchMove">
+	<view class="u-wrap" @touchstart="touchScreen">
 		<!-- <view class="serch txt-16">
 			<uni-search-bar class="flex1" placeholder="请输入菜单名称" @confirm="search" @input="input" cancelButton="none"
 				@clear="clearfilterlist">
@@ -69,7 +69,7 @@
 
 <script>
 	import classifyData from '@/common/classify.data.js';
-	import config from '../../static/config.js'
+	import config from '@/static/config.js'
 	export default {
 		components: {},
 		data() {
@@ -93,16 +93,16 @@
 				filterList: [],
 				serchval: "",
 				backButtonPress: 0,
-				pageTimeOut: config.pageTimeOut,
-				timeCount: null
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut:config.pageTimeOut,// 设置超时时间:30分钟
+
 			}
 		},
 		onLoad() {
-
 			var test = ""
 			if (uni.getStorageSync("hasLogin")) {
 				this.tabbar = this.getPowersByRoles();
-				this.startTimer();
 			} else {
 				this.tabbar = []
 			}
@@ -113,13 +113,7 @@
 			}
 
 		},
-		beforeDestroy() {
-			if (this.timeCount) {
-				clearInterval(this.timeCount);
-				this.timeCount = null;
-			}
 
-		},
 		onHide() {},
 		onShow() {
 			if (uni.getStorageSync("hasLogin") == null || uni.getStorageSync("hasLogin") == false) {
@@ -142,9 +136,10 @@
 						}
 					}
 				})
+			} else {
+				this.lastTime = new Date().getTime()
 			}
 		},
-		onUnload() {},
 		// onBackPress(e) {
 		// 	// 此处一定要return为true，否则页面不会返回到指定路径
 		// 	this.backButtonPress++;
@@ -160,37 +155,21 @@
 		// },
 		mounted() {},
 		methods: {
-			startTimer(){
-				var that = this;
-				this.timeCount = setInterval(()=> {
-					console.log("记时", that.pageTimeOut)
-					if(that.pageTimeOut>0&&that.pageTimeOut<=config.pageTimeOut){
-						that.pageTimeOut--;
-					}else {
-						console.log("停止", that.pageTimeOut)
-						clearInterval(this.timeCount);
-						 this.timeCount = null;
-						 uni.reLaunch({
-						 	url: "../login/index"
-						 })
-					}
-				}, 1000)
-			},
-			
+
 			touchScreen() {
-				this.pageTimeOut = config.pageTimeOut
-				if (this.timeCount) {
-					clearInterval(this.timeCount);
-					this.timeCount = null;
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
 				}
-				this.startTimer();
-				console.log("页面点击touchScreen", this.pageTimeOut)
 			},
-			touchMove(){
-				this.pageTimeOut = config.pageTimeOut
-				console.log("页面点击touchMove", this.pageTimeOut)
-			},
-			
+
 			getPowersByRoles() {
 				var permissionList = this.$store.state.user.powers
 				var tempList = [];
@@ -345,7 +324,6 @@
 				uni.navigateTo({
 					url: url
 				});
-
 			},
 
 
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index a59c9a8..c12cae6 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -132,6 +132,7 @@
 			
 		},
 		onLoad() {
+			 uni.setStorageSync("hasLogin",false)
 			// #ifdef APP-PLUS
 			// checkVersion(false)
 			// #endif
diff --git a/src/pages/plastics/check.vue b/src/pages/plastics/check.vue
index d56f239..92757f3 100644
--- a/src/pages/plastics/check.vue
+++ b/src/pages/plastics/check.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page-wraper">
+	<view class="page-wraper" @touchstart="touchScreen">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 			<!-- <view class="flex u-col-center space-between"> -->
@@ -85,6 +85,7 @@
 <script>
 	import customerFrom from "@/mycomponents/form/customerFrom.vue"
 	import winScanNormal from "@/mycomponents/scan/winScanNormal.vue"
+	import config from '@/static/config.js'
 	import {
 		getCurrDateTime,
 		deepCopyData
@@ -109,6 +110,9 @@
 				deviceCheckCode:"",
 				deviceName: "",
 				worker: this.$store.state.user.name,
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut: config.pageTimeOut,
 				dataList: [],
 				formData: [{
 						type: "stateSelect",
@@ -231,13 +235,28 @@
 			}
 		},
 		computed: {},
-		onLoad() {
-
+		onShow(){
+			this.lastTime = new Date().getTime()
 		},
+		
 		mounted() {
 			this.$refs.inputDevice.focused = true
 		},
 		methods: {
+			touchScreen() {
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
+				}
+				
+			},
 			getScanResult(result) {
 				uni.showLoading({
 					title: "加载中",
diff --git a/src/pages/plastics/input.vue b/src/pages/plastics/input.vue
index b11fac6..8799473 100644
--- a/src/pages/plastics/input.vue
+++ b/src/pages/plastics/input.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page-wraper">
+	<view class="page-wraper" @touchstart="touchScreen">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 			<!-- <view class="flex u-col-center space-between">
@@ -126,6 +126,7 @@
 	} from "@/common/basic.js"
 	
 	import selectClickList from "@/mycomponents/popup/selectClickList.vue"
+	import config from '@/static/config.js'
 
 	export default {
 		components: {
@@ -149,14 +150,32 @@
 				referenceCode: "",
 				supplierCode: "",
 				weight: "",
-
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut: config.pageTimeOut
 
 			}
 		},
 		computed: {},
-		onLoad() {},
+		onShow(){
+			this.lastTime = new Date().getTime()
+		},
+		  
 
 		methods: {
+			touchScreen() {
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
+				}
+			},
 			itemClear() {
 				this.itemCode = ""
 				this.itemCheckCode = "";
diff --git a/src/pages/plastics/plasticsNoGood.vue b/src/pages/plastics/plasticsNoGood.vue
index a57eafb..c05862c 100644
--- a/src/pages/plastics/plasticsNoGood.vue
+++ b/src/pages/plastics/plasticsNoGood.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page-wraper">
+	<view class="page-wraper" @touchstart="touchScreen">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 
@@ -150,6 +150,7 @@
 		getCurrDateTime,
 	} from "@/common/basic.js"
 	import selectClickList from "@/mycomponents/popup/selectClickList.vue"
+	import config from '@/static/config.js'
 
 	export default {
 		components: {
@@ -177,17 +178,32 @@
 				mode: 'selector',
 				reasonRange: [],
 				typeRange: ["隔离", "报废"],
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut: config.pageTimeOut
 
 			}
 		},
 		computed: {},
-		onLoad() {},
-		onUnload() {},
-		onReady() {
-
+		onShow(){
+			this.lastTime = new Date().getTime()
 		},
 
 		methods: {
+			
+			touchScreen() {
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
+				}
+			},
 			showTypePicker() {
 				this.showType = true;
 			},
diff --git a/src/pages/plastics/scanCode.vue b/src/pages/plastics/scanCode.vue
index cf8eb31..2490fbe 100644
--- a/src/pages/plastics/scanCode.vue
+++ b/src/pages/plastics/scanCode.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page-wraper">
+	<view class="page-wraper" @touchstart="touchScreen">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 
@@ -88,6 +88,7 @@
 		getCurrDateTime,
 	} from "@/common/basic.js"
 	import selectClickList from "@/mycomponents/popup/selectClickList.vue"
+	import config from '@/static/config.js'
 
 	export default {
 		components: {
@@ -104,19 +105,32 @@
 					origin: []
 				},
 				scanCode: "",
-				scanCheckCode:""
-
+				scanCheckCode:"",
+				lastTime: null, // 最后一次点击的时间
+				currentTime: null, // 当前点击的时间
+				timeOut: config.pageTimeOut
 
 			}
 		},
 		computed: {},
-		onLoad() {},
-		onUnload() {},
-		onReady() {
-
+		onShow(){
+			this.lastTime = new Date().getTime()
 		},
 
 		methods: {
+			touchScreen() {
+				this.currentTime = new Date().getTime() // 记录这次点击的时间
+				console.log("当前时间", this.currentTime)
+				if (this.currentTime - this.lastTime > this.timeOut) { // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于30分钟
+					console.log("当前时间跳转")
+					uni.reLaunch({
+						url: "../login/index"
+					})
+				} else {
+					this.lastTime = new Date().getTime() // 如果在30分钟内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+					console.log("当前时间跳转赋值，没跳转" + this.lastTime)
+				}
+			},
 			submit() {
 				if (this.scanCheckCode == "") {
 					this.showMessage("请扫描产品码")
diff --git a/src/pages/setter/index.vue b/src/pages/setter/index.vue
index 0dc6985..94a3963 100644
--- a/src/pages/setter/index.vue
+++ b/src/pages/setter/index.vue
@@ -1,33 +1,30 @@
 <template>
-	<view class="personal">
+	<view class="personal" @touchstart="touchScreen">
 		<view class="txbox">
 			<image src="/static/avatar.png" class="tx"></image>
 			<!-- 	<view class="text">admin</view> -->
 		</view>
 		<view class="">
-			<u-cell-group >
-				<u-cell-item  icon="account-fill" title="姓名" :arrow="false">{{userName}}</u-cell-item>
-				<u-cell-item v-if="userInfo!=null" icon="file-text" title="部门" :arrow="false">{{userInfo.dept.name}}</u-cell-item>
-				<u-cell-item v-if="userInfo!=null" icon="photo" title="岗位" :arrow="false">{{(userInfo.posts || []).map(post => post.name).join(',')}}</u-cell-item>
-				<u-cell-item icon="level" v-if="userInfo!=null" title="角色" :arrow="false">{{(userInfo.roles || []).map(role => role.name).join(',')}}</u-cell-item>
+			<u-cell-group>
+				<u-cell-item icon="account-fill" title="姓名" :arrow="false">{{userName}}</u-cell-item>
 				<!-- <u-cell-item icon="trash" title="清除缓存" @click="clear()" ></u-cell-item> -->
 				<u-cell-item icon="file-text" title="访问地址" :arrow="false">{{requestUrl}}</u-cell-item>
-				<u-cell-item icon="order" title="版本号" :arrow="false" @click="test111"  >{{version}}</u-cell-item>
+				<u-cell-item icon="order" title="版本号" :arrow="false">{{version}}</u-cell-item>
 				<!-- #ifdef APP -->
 				<u-cell-item icon="reload" title="检查更新" @click="update">{{version}}</u-cell-item>
 				<!-- #endif -->
-				
+
 			</u-cell-group>
 		</view>
-		
+
 		<view>
-			<button  type="primary" style="margin:70rpx;"  @click="handlerlogout">退出登录</button>
+			<button type="primary" style="margin:70rpx;" @click="handlerlogout">退出登录</button>
 		</view>
 
 	</view>
 </template>
 
-<script setup>
+<script>
 	import {
 		logout,
 		getUserProfile
@@ -39,101 +36,107 @@
 	import {
 		removeToken
 	} from '@/common/utils/auth'
-	
+
 	import config from '@/static/config.js'
-	
 	// #ifdef APP-PLUS
 	import {
 		checkVersion
 	} from "@/pages/appUpdate/appUpdate.js"
 	// #endif
-	import {
-		ref,
-		reactive,
-		nextTick,
-		createApp
-	} from "vue";
-	import {
-		onLoad
-	} from "@dcloudio/uni-app";
-	const app = createApp({});
-	// app.component({
-	// });
-	const userName = ref(store.state.user.name);
-	let version = ref();
-	let userInfo = ref(null);
-	let requestUrl =ref(null)
-	onLoad(() => {
-		requestUrl =config.request_url
-		getAppVersion()
-		getUserProfile().then(res => {
-			userInfo.value = res.data
-			// nextTick(()=>{
-			// 	const userInfo = res.data.nickname
-			// 	 console.log("打印",userInfo)
-			// 	})
-
-		})
-	});
-
-
-	function handlerlogout() {
-		clearStorage();
-		// #ifdef H5
-		uni.reLaunch({
-			url: '../login/index'
-		})
-		// #endif
-		
-		// #ifdef APP
-		 plus.runtime.quit()
-		// #endif
-		
-		
-	};
-
-	function clearStorage() {
-		uni.clearStorageSync()
-		removeToken();
-
-	};
-	
-	function test111(){
-		uni.navigateTo({
-			url:"./test"
-		})
-	}
-
-	function clear() {
-		clearCacheData()
-		uni.showToast({
-			title: "清理缓存成功"
-		})
+	export default {
+		data() {
+			return {
+				userName: "",
+				requestUrl: "",
+				version: "",
+				pageTimeOut: config.pageTimeOut,
+				timerCount: null,
+			}
+		},
+		onShow(){
+			// this.startTimer();
+		},
+		onHide() {
+			console.log('当前页面被关闭onHide');
+			setTimeout(res=>{
+				this.clearTimeout();
+			},500)
+			
+		  },
+		  
+		onUnload() {
+			console.log('当前页面被关闭onUnload');
+			this.clearTimeout();
+		},
+		onLoad() {
+			this.userName = this.$store.state.user.name
+			this.requestUrl =config.request_url
+			this.getAppVersion()
+		},
+		methods: {
+			startTimer() {
+				var that = this;
+				this.timerCount = setInterval(() => {
+					console.log("记时_setting", that.pageTimeOut)
+					if (that.pageTimeOut > 0 && that.pageTimeOut <= config.pageTimeOut) {
+						that.pageTimeOut--;
+					} else {
+						console.log("停止", that.pageTimeOut)
+						this.clearTimeout()
+						uni.reLaunch({
+							url: "../login/index"
+						})
+					}
+				}, 1000)
+			},
+			clearTimeout() {
+				console.log("清除", this.timerCount)
+				if (this.timerCount) {
+					clearInterval(this.timerCount);
+					this.timerCount = null;
+				}
+			},
+			touchScreen() {
+				this.pageTimeOut = config.pageTimeOut
+				this.clearTimeout()
+				this.startTimer();
+				console.log("页面点击touchScreen", this.pageTimeOut)
+			},
+			getAppVersion() {
+				const systemInfo = uni.getSystemInfoSync();
+				// #ifdef H5
+				this.version = systemInfo.appVersion;
+				console.log(systemInfo.appVersion, '版本号');
+				// #endif
+
+				// #ifdef APP
+				this.version = systemInfo.appWgtVersion;
+				// #endif
+			},
+			update() {
+				checkVersion(true)
+			},
+
+			handlerlogout() {
+				clearStorage();
+				// #ifdef H5
+				uni.reLaunch({
+					url: '../login/index'
+				})
+				// #endif
+
+				// #ifdef APP
+				plus.runtime.quit()
+				// #endif
+
+			},
+			clearStorage() {
+				uni.clearStorageSync()
+				removeToken();
+			}
+
+		}
 	}
-
-	function getAppVersion() {
-		const systemInfo = uni.getSystemInfoSync();
-		// #ifdef H5
-		version.value = systemInfo.appVersion;
-		console.log(systemInfo.appVersion, '版本号');
-		// #endif
-
-		// #ifdef APP
-		version.value = systemInfo.appWgtVersion;
-		// #endif
-
-	}
-
-	function update() {
-		console.log("update");
-		checkVersion(true)
-	}
-	function modifiedPassWord() {
-		uni.navigateTo({
-			url:"./passwordpage"
-		})
-	}
-
 </script>
 
 <style>
diff --git a/src/pages/setter/index_bat.vue b/src/pages/setter/index_bat.vue
new file mode 100644
index 0000000..0dc6985
--- /dev/null
+++ b/src/pages/setter/index_bat.vue
@@ -0,0 +1,173 @@
+<template>
+	<view class="personal">
+		<view class="txbox">
+			<image src="/static/avatar.png" class="tx"></image>
+			<!-- 	<view class="text">admin</view> -->
+		</view>
+		<view class="">
+			<u-cell-group >
+				<u-cell-item  icon="account-fill" title="姓名" :arrow="false">{{userName}}</u-cell-item>
+				<u-cell-item v-if="userInfo!=null" icon="file-text" title="部门" :arrow="false">{{userInfo.dept.name}}</u-cell-item>
+				<u-cell-item v-if="userInfo!=null" icon="photo" title="岗位" :arrow="false">{{(userInfo.posts || []).map(post => post.name).join(',')}}</u-cell-item>
+				<u-cell-item icon="level" v-if="userInfo!=null" title="角色" :arrow="false">{{(userInfo.roles || []).map(role => role.name).join(',')}}</u-cell-item>
+				<!-- <u-cell-item icon="trash" title="清除缓存" @click="clear()" ></u-cell-item> -->
+				<u-cell-item icon="file-text" title="访问地址" :arrow="false">{{requestUrl}}</u-cell-item>
+				<u-cell-item icon="order" title="版本号" :arrow="false" @click="test111"  >{{version}}</u-cell-item>
+				<!-- #ifdef APP -->
+				<u-cell-item icon="reload" title="检查更新" @click="update">{{version}}</u-cell-item>
+				<!-- #endif -->
+				
+			</u-cell-group>
+		</view>
+		
+		<view>
+			<button  type="primary" style="margin:70rpx;"  @click="handlerlogout">退出登录</button>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		logout,
+		getUserProfile
+	} from '@/api/request2.js';
+	import store from '@/store'
+	import {
+		clearCacheData
+	} from '@/common/directory.js';
+	import {
+		removeToken
+	} from '@/common/utils/auth'
+	
+	import config from '@/static/config.js'
+	
+	// #ifdef APP-PLUS
+	import {
+		checkVersion
+	} from "@/pages/appUpdate/appUpdate.js"
+	// #endif
+	import {
+		ref,
+		reactive,
+		nextTick,
+		createApp
+	} from "vue";
+	import {
+		onLoad
+	} from "@dcloudio/uni-app";
+	const app = createApp({});
+	// app.component({
+	// });
+	const userName = ref(store.state.user.name);
+	let version = ref();
+	let userInfo = ref(null);
+	let requestUrl =ref(null)
+	onLoad(() => {
+		requestUrl =config.request_url
+		getAppVersion()
+		getUserProfile().then(res => {
+			userInfo.value = res.data
+			// nextTick(()=>{
+			// 	const userInfo = res.data.nickname
+			// 	 console.log("打印",userInfo)
+			// 	})
+
+		})
+	});
+
+
+	function handlerlogout() {
+		clearStorage();
+		// #ifdef H5
+		uni.reLaunch({
+			url: '../login/index'
+		})
+		// #endif
+		
+		// #ifdef APP
+		 plus.runtime.quit()
+		// #endif
+		
+		
+	};
+
+	function clearStorage() {
+		uni.clearStorageSync()
+		removeToken();
+
+	};
+	
+	function test111(){
+		uni.navigateTo({
+			url:"./test"
+		})
+	}
+
+	function clear() {
+		clearCacheData()
+		uni.showToast({
+			title: "清理缓存成功"
+		})
+	}
+
+	function getAppVersion() {
+		const systemInfo = uni.getSystemInfoSync();
+		// #ifdef H5
+		version.value = systemInfo.appVersion;
+		console.log(systemInfo.appVersion, '版本号');
+		// #endif
+
+		// #ifdef APP
+		version.value = systemInfo.appWgtVersion;
+		// #endif
+
+	}
+
+	function update() {
+		console.log("update");
+		checkVersion(true)
+	}
+	function modifiedPassWord() {
+		uni.navigateTo({
+			url:"./passwordpage"
+		})
+	}
+
+</script>
+
+<style>
+	.txbox {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.tx {
+		width: 200rpx;
+		height: 200rpx;
+		margin: 30rpx 0 30rpx;
+		border-radius: 150upx;
+	}
+
+	.text {
+		font-size: 20upx;
+		text-align: center;
+	}
+
+	.footbox {
+		display: flex;
+		align-items: center;
+
+	}
+
+	.footbtn {
+		margin-top: 120rpx;
+		width: 300rpx;
+		border-radius: 50rpx;
+		background-color: #fff;
+		font-size: .825rem;
+		color: #333;
+		line-height: 90rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/src/static/config.js b/src/static/config.js
index a9a176a..77a4ee0 100644
--- a/src/static/config.js
+++ b/src/static/config.js
@@ -2,8 +2,8 @@ let request_url = "http://123.56.115.74:8088/api"
 // let request_url = "http://192.168.0.113:12080/admin-api"
 
 let isDevelopment = true
-//10秒
-let pageTimeOut =30
+//30分钟
+let pageTimeOut =30*60*1000
 
 export default {
 	request_url,