diff --git a/App.vue b/App.vue
index 1edfab9..b4d7361 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,4 @@
 <script>
-	import soket from "/utils/soket.js"
 	import upapp from "/utils/upapp.js"
 	export default {
 		onLaunch: function() {
@@ -21,7 +20,6 @@
 			// #endif
 			uni.setStorageSync('cid', _Android)
 			if (uni.getStorageSync('token')) {
-				soket()
 				uni.reLaunch({
 					url: "/pages/index",
 					success() {
diff --git a/components/dateSelection/dateSelection.vue b/components/dateSelection/dateSelection.vue
index 0ab59ca..435fb6d 100644
--- a/components/dateSelection/dateSelection.vue
+++ b/components/dateSelection/dateSelection.vue
@@ -72,14 +72,16 @@
 			}
 			return _data;
 		}
+		
 		return {
 			day,
 			monthGroups:Object.values(monthGroups)
 		}
 	}
 	daydata.value = getCompleteMonthData()
-	// chooseday.value=daydata.value.day[0]
 	
+	
+	reset()
 	function close(){
 		Props.modelValue=false;
 		adssEmits("update:modelValue",false)
@@ -94,8 +96,9 @@
 		
 	}
 	function reset(){
-		// chooseday.value=daydata.value.day[0];
+		chooseday.value=daydata.value.day[0];
 		dayindex.value=0;
+		adssEmits("change",chooseday.value)
 	}
 	defineExpose({
 		reset
diff --git a/main.js b/main.js
index c1caf36..c8611f5 100644
--- a/main.js
+++ b/main.js
@@ -1,22 +1,26 @@
 import App from './App'
-
+import soket from "/utils/soket.js"
 // #ifndef VUE3
 import Vue from 'vue'
 import './uni.promisify.adaptor'
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
-  ...App
+	...App
 })
 app.$mount()
+soket()
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+	createSSRApp
+} from 'vue'
 export function createApp() {
-  const app = createSSRApp(App)
-  return {
-    app
-  }
+	const app = createSSRApp(App)
+	soket()
+	return {
+		app
+	}
 }
 // #endif
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index f403812..448a0f3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "区间测速",
     "appid" : "__UNI__E207F22",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -146,7 +146,7 @@
             //配置跨域
             "proxy" : {
                 "/api" : {
-                    "target" : "http://speed-bl.renyizhi.cc",
+                    "target" : "http://192.168.1.7:9005",
                     "changeOrigin" : true,
                     "secure" : false
                 }
diff --git a/pages.json b/pages.json
index 5487309..e86dc31 100644
--- a/pages.json
+++ b/pages.json
@@ -70,7 +70,10 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "区间测速",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"pageOrientation": "portrait"
+		"pageOrientation": "portrait",
+		"app-plus": {
+			"bounce": "none"
+		}
 
 	},
 	"uniIdRouter": {}
diff --git a/pages/index.vue b/pages/index.vue
index c7ac481..f50b045 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -13,31 +13,31 @@
 				<view class="tabnav">
 					<view class="li" :class="{on:selectindex==0}" @click="settab(0)">
 						<view class="l">
-							<image src="/static/tab/1.png"></image>
+							<image :src="`/static/tab/${selectindex==0?11:1}.png`"></image>
 						</view>
 						<view class="text">预警信息</view>
 					</view>
 					<view class="li" :class="{on:selectindex==1}" @click="settab(1)">
 						<view class="l">
-							<image src="/static/tab/2.png"></image>
+							<image :src="`/static/tab/${selectindex==1?22:2}.png`"></image>
 						</view>
 						<view class="text">过车信息</view>
 					</view>
 					<view class="li" :class="{on:selectindex==2}" @click="settab(2)">
 						<view class="l">
-							<image src="/static/tab/3.png"></image>
+							<image :src="`/static/tab/${selectindex==2?33:3}.png`"></image>
 						</view>
 						<view class="text">历史记录</view>
 					</view>
 					<view class="li" :class="{on:selectindex==3}" @click="settab(3)">
 						<view class="l">
-							<image src="/static/tab/4.png"></image>
+							<image :src="`/static/tab/${selectindex==3?44:4}.png`"></image>
 						</view>
 						<view class="text">统计数据</view>
 					</view>
 					<view class="li" :class="{on:selectindex==4}" @click="settab(4)">
 						<view class="l">
-							<image src="/static/tab/5.png"></image>
+							<image :src="`/static/tab/${selectindex==4?55:5}.png`"></image>
 						</view>
 						<view class="text">预警设置</view>
 					</view>
@@ -145,8 +145,10 @@
 	uni.$on('LOGOUT', () => {
 		// 清除token
 		// 断WebSocket
-		uni.$emit('Socketclose')
 		uni.removeStorageSync("token");
+		uni.removeStorageSync("USERID")
+		uni.$emit('Socketclose')
+		
 		// h5 弹窗
 		// #ifdef H5
 		showout.value = true;
@@ -170,7 +172,8 @@
 	// 退出登录
 	function outsignOut() {
 		showout.value = false;
-		
+		uni.removeStorageSync("token");
+		uni.removeStorageSync("USERID")
 		// 跳转登录页
 		uni.reLaunch({
 			url: "/pages/signIn"
@@ -181,8 +184,10 @@
 
 	function hidesub() {
 		_is = true;
+		// #ifdef APP
 		let subNVue = uni.getSubNVueById("hkcamera")
 		subNVue.hide('fade-out', 300)
+		// #endif
 		showsignOut.value = false;
 		uni.$emit("camerahide")
 
@@ -520,6 +525,8 @@
 			width: 600rpx;
 			margin-left: 150rpx;
 			background: #E7E7ED;
+			overflow: hidden;
+			height: 100vh;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/pages/details.vue b/pages/pages/details.vue
index fa2d5d0..c204cf3 100644
--- a/pages/pages/details.vue
+++ b/pages/pages/details.vue
@@ -17,149 +17,160 @@
 					</view>
 				</view>
 			</block>
-			<block v-if="type==2">
-				<view class="fn fx" v-if="!yesok" @click="showupimg=true">放行</view>
-				<view class="fn yfx" :class="{aft:tips}" v-if="yesok" @click="setrelease">
-					确认放行
-					<view class="tc" v-if="tips">
-						<image src="/static/dp.png"></image> 是否确定放行该车辆，请点击此按钮。
+			<block v-else-if="type==2">
+				<block v-if="info.type">
+					<view class="fn fx" v-if="!yesok" @click="showupimg=true">放行</view>
+					<view class="fn yfx" :class="{aft:tips}" v-if="yesok" @click="setrelease">
+						确认放行
+						<view class="tc" v-if="tips">
+							<image src="/static/dp.png"></image> 是否确定放行该车辆，请点击此按钮。
+						</view>
 					</view>
-				</view>
+				</block>
+				<block v-else>
+					<view class="fn fx grey" v-if="!yesok" @click="showtips">放行</view>
+				</block>
+				
+			</block>
+			<block v-else>
+				<view class="fn fx" style="opacity: 0;">站位</view>
 			</block>
 		</view>
 	</view>
-	<view class="detailspage" @click="tips=false">
-		<view class="time">
-			<view class="l">超速信息</view>
-			<view class="r" v-if="info.releaseInfo?.releaseTime">放行时间：{{info.releaseInfo?.releaseTime}}</view>
-		</view>
-		<view class="form">
-			<view class="item">
-				<view class="title">
-					车牌号码
-				</view>
-				<view class="txt">
-					<view class="number">{{info.basicInfo?.vehicleNumber}}</view>
-				</view>
-				<view class="title">超速等级</view>
-				<view class="txt">
-					{{info.overspeedInfo?.overspeedLevelInformation}}
-				</view>
+	<scroll-view :scroll-y="true" :scroll-top="scrolltop">
+		<view class="detailspage" @click="tips=false">
+			<view class="time">
+				<view class="l">超速信息</view>
+				<view class="r" v-if="info.releaseInfo?.releaseTime">放行时间：{{info.releaseInfo?.releaseTime}}</view>
 			</view>
-			<view class="item">
-				<view class="title">
-					设备{{info.intervalInfo?.startId}}位置
-				</view>
-				<view class="txt">
-					{{info.intervalInfo?.startDeviceJson?.position}}
-					<view>{{info.intervalInfo?.startDeviceJson?.longitude}} / {{info.intervalInfo?.startDeviceJson?.latitude}}</view>
+			<view class="form">
+				<view class="item">
+					<view class="title">
+						车牌号码
+					</view>
+					<view class="txt">
+						<view class="number">{{info.basicInfo?.vehicleNumber}}</view>
+					</view>
+					<view class="title">超速等级</view>
+					<view class="txt">
+						{{info.overspeedInfo?.overspeedLevelInformation}}
+					</view>
 				</view>
+				<view class="item">
+					<view class="title">
+						设备{{info.intervalInfo?.startId}}位置
+					</view>
+					<view class="txt">
+						{{info.intervalInfo?.startDeviceJson?.position}}
+						<view>{{info.intervalInfo?.startDeviceJson?.longitude}} / {{info.intervalInfo?.startDeviceJson?.latitude}}</view>
+					</view>
 
-			</view>
-			<view class="item">
-				<view class="title">
-					设备{{info.intervalInfo?.endId}}位置
 				</view>
-				<view class="txt">
-					{{info.intervalInfo?.endDeviceJson?.position}}
-					<view>{{info.intervalInfo?.endDeviceJson?.longitude}} / {{info.intervalInfo?.endDeviceJson?.latitude}}</view>
-				</view>
-			
-			</view>
-			<view class="item">
-				<view class="title">
-					通过设备{{info.intervalInfo?.startId}}时间
-				</view>
-				<view class="txt">
-					{{info.intervalInfo?.startDeviceTime}}
-				</view>
-				<view class="title">区间距离</view>
-				<view class="txt">
-					{{info.intervalInfo?.zoneDistanceText}}
-				</view>
-			</view>
-			<view class="item">
-				<view class="title">
-					通过设备{{info.intervalInfo?.endId}}时间
-				</view>
-				<view class="txt">
-					{{info.intervalInfo?.endDeviceTime}}
-				</view>
-				<view class="title">区间限速</view>
-				<view class="txt">
-					{{info.intervalInfo?.speedText}}
-				</view>
-			</view>
-			<view class="item">
-				<view class="title">
-					最短行驶时长
-				</view>
-				<view class="txt">
-					{{info.intervalInfo?.passingTimeText}}
-				</view>
-				<view class="title">实际行驶时长</view>
-				<view class="txt">
-					{{info.overspeedInfo?.exerciseDurationText}}
-				</view>
-			</view>
-			<view class="item">
-				<view class="title">
-					平均车速
-				</view>
-				<view class="txt">
-					{{info.overspeedInfo?.averageSpeedText}}
-				</view>
-				<view class="title">待休息时长</view>
-				<view class="txt">
-					{{info.overspeedInfo?.restDurationText}}
-				</view>
-			</view>
-		</view>
-		<view class="imgs">
-			<view class="item">
-				<view class="title">
-					设备{{info.intervalInfo?.startId}} 抓取照片
-				</view>
-				<view class="img">
-					<image @click="openimg(info.imageInfo?.startDeviceImage)" :src="info.imageInfo?.startDeviceImage"></image>
-					<view class="time">{{info.intervalInfo?.startDeviceTime}}</view>
-				</view>
-			</view>
-			<view class="item">
-				<view class="title">
-					设备{{info.intervalInfo?.endId}} 抓取照片
-				</view>
-				<view class="img">
-					<image @click="openimg(info.imageInfo?.endDeviceImage)" :src="info.imageInfo?.endDeviceImage"></image>
-					<view class="time">{{info.intervalInfo?.endDeviceTime}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="info">
-			<view class="title">
-				暂扣信息
-			</view>
-			<view class="tbody">
-				<view class="ul">
-					<view class="title">暂扣时间</view>
-					<view class="txt">{{info.detainInfo?.detainTime || '/'}}</view>
-					<view class="title">放行时间</view>
-					<view class="txt">{{info.releaseInfo?.releaseTime || '/'}}</view>
-				</view>
-				<view class="ul">
-					<view class="title">暂扣照片</view>
-					<view class="txt img">
-						<image  @click="openimg(info.imageInfo?.detainStartImage)"  v-if="info.imageInfo?.detainStartImage" :src="info.imageInfo?.detainStartImage"></image>
+				<view class="item">
+					<view class="title">
+						设备{{info.intervalInfo?.endId}}位置
 					</view>
-					<view class="title">放行照片</view>
-					<view class="txt img">
-						<image @click="openimg(info.imageInfo?.releaseImage)" v-if="info.imageInfo?.releaseImage"  :src="info.imageInfo?.releaseImage"></image>
+					<view class="txt">
+						{{info.intervalInfo?.endDeviceJson?.position}}
+						<view>{{info.intervalInfo?.endDeviceJson?.longitude}} / {{info.intervalInfo?.endDeviceJson?.latitude}}</view>
+					</view>
+				
+				</view>
+				<view class="item">
+					<view class="title">
+						通过设备{{info.intervalInfo?.startId}}时间
+					</view>
+					<view class="txt">
+						{{info.intervalInfo?.startDeviceTime}}
+					</view>
+					<view class="title">区间距离</view>
+					<view class="txt">
+						{{info.intervalInfo?.zoneDistanceText}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="title">
+						通过设备{{info.intervalInfo?.endId}}时间
+					</view>
+					<view class="txt">
+						{{info.intervalInfo?.endDeviceTime}}
+					</view>
+					<view class="title">区间限速</view>
+					<view class="txt">
+						{{info.intervalInfo?.speedText}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="title">
+						最短行驶时长
+					</view>
+					<view class="txt">
+						{{info.intervalInfo?.passingTimeText}}
+					</view>
+					<view class="title">实际行驶时长</view>
+					<view class="txt">
+						{{info.overspeedInfo?.exerciseDurationText}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="title">
+						平均车速
+					</view>
+					<view class="txt">
+						{{info.overspeedInfo?.averageSpeedText}}
+					</view>
+					<view class="title">待休息时长</view>
+					<view class="txt">
+						{{info.overspeedInfo?.restDurationText}}
+					</view>
+				</view>
+			</view>
+			<view class="imgs">
+				<view class="item">
+					<view class="title">
+						设备{{info.intervalInfo?.startId}} 抓取照片
+					</view>
+					<view class="img">
+						<image @click="openimg(info.imageInfo?.startDeviceImage)" :src="info.imageInfo?.startDeviceImage"></image>
+						<view class="time">{{info.intervalInfo?.startDeviceTime}}</view>
+					</view>
+				</view>
+				<view class="item">
+					<view class="title">
+						设备{{info.intervalInfo?.endId}} 抓取照片
+					</view>
+					<view class="img">
+						<image @click="openimg(info.imageInfo?.endDeviceImage)" :src="info.imageInfo?.endDeviceImage"></image>
+						<view class="time">{{info.intervalInfo?.endDeviceTime}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="info">
+				<view class="title">
+					暂扣信息
+				</view>
+				<view class="tbody">
+					<view class="ul">
+						<view class="title">暂扣时间</view>
+						<view class="txt">{{info.detainInfo?.detainTime || '/'}}</view>
+						<view class="title">放行时间</view>
+						<view class="txt">{{info.releaseInfo?.releaseTime || '/'}}</view>
+					</view>
+					<view class="ul">
+						<view class="title">暂扣照片</view>
+						<view class="txt img">
+							<image  @click="openimg(info.imageInfo?.detainStartImage)"  v-if="info.imageInfo?.detainStartImage" :src="info.imageInfo?.detainStartImage"></image>
+						</view>
+						<view class="title">放行照片</view>
+						<view class="txt img">
+							<image @click="openimg(info.imageInfo?.releaseImage)" v-if="info.imageInfo?.releaseImage"  :src="info.imageInfo?.releaseImage"></image>
+						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-	</view>
-	<view style="height: 20rpx;"></view>
+		<view style="height: 20rpx;"></view>
+	</scroll-view>
 	<view class="okfication" v-if="showupimg" @click.stop="showupimg=false">
 		<view class="box" @click.stop="showupimg=true">
 			<view class="close" @click.stop="showupimg=false"> <uni-icons type="closeempty" color="#585757"
@@ -199,7 +210,7 @@
 		detainVehicle,
 		releaseVehicle
 	} from "/appapi/index.js"
-
+	const scrolltop=ref(0)
 	const type = ref("");
 	const showupimg = ref(false)
 	const yesok = ref(false);
@@ -210,7 +221,36 @@
 	const info=ref({})
 
 	const time=ref("")
-    
+    let timer;
+	
+	function showtips(){
+		uni.showToast({
+			title:"未到放行时间",
+			icon:"error"
+		})
+	}
+	// 更新放行状态
+	// 只在是暂扣点进来的时候
+	function upreleasetype(){
+		// 清除定制任务 避免多个定时任务
+		clearInterval(timer)
+		function gettype(){
+			if(new Date().getTime()>new Date(info.value.detainInfo.restDurationEndtime).getTime()){
+				// 可放行
+				info.value['type']=1;
+			}else{
+				// 不可放行
+				info.value['type']=0;
+			}
+		}
+		gettype()
+		// 重启定时任务 
+		timer=setInterval(()=>{
+			gettype()
+		},1000)
+	}
+	
+	
 	watch(()=>showupimg.value,()=>{
 		formatTime()
 	})
@@ -300,12 +340,19 @@
 		encoding.value=id;
 		type.value = indextype
 		showupimg.value = true;
+		scrolltop.value=10;
 		getinfo()
 	}
 	
 	function getinfo(){
 		getdetails({encoding:encoding.value}).then(res=>{
 			info.value=res.data;
+			scrolltop.value=0;
+			if(type.value==2){
+				
+				upreleasetype()
+			}
+				
 		})
 	}
 	// 确认暂扣
@@ -357,6 +404,10 @@
 	})
 </script>
 <style scoped lang="scss">
+	scroll-view{
+		box-sizing: border-box;
+		height: calc(100vh - 35rpx);
+	}
 	.okfication {
 		position: fixed;
 		width: 100vw;
@@ -364,7 +415,7 @@
 		left: 0px;
 		top: 0px;
 		background: rgba(0, 0, 0, 0.3);
-
+		z-index: 22;
 		.box {
 			position: absolute;
 			width: 340rpx;
@@ -386,8 +437,8 @@
 				align-items: center;
 
 				image {
-					width: 46rpx;
-					height: 46rpx;
+					width: 31rpx;
+					height: 31rpx;
 					margin-right: 15rpx;
 				}
 
@@ -460,11 +511,11 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 15rpx;
+		padding: 10rpx 15rpx;
 		background: #E7E7ED;
 		position: sticky;
 		top: 0rpx;
-
+		z-index: 22;
 		.back {
 			display: flex;
 			align-items: center;
@@ -542,7 +593,9 @@
 			&.fx {
 				background: #08A05F;
 			}
-
+			&.grey{
+				background: #666666;
+			}
 			&.yfx {
 				background: linear-gradient(45deg, #4F8AFF 0%, #4B5EFF 100%);
 			}
@@ -553,7 +606,7 @@
 		background: #fff;
 		border-radius: 8rpx;
 		margin: 1rpx 15rpx;
-		padding: 15rpx;
+		padding:10rpx 15rpx;
 
 		.time {
 			display: flex;
@@ -574,23 +627,23 @@
 		}
 
 		.form {
-			margin: 15rpx 0;
+			margin: 10rpx 0rpx 0rpx;
 			border-radius: 3rpx;
 			overflow: hidden;
-			border: 1px solid #979797;
+			border: 1px solid #A0A0A0;
 
 			.item {
 				display: flex;
 				// align-items: center;
 				justify-content: space-between;
-				border-bottom: 1px solid #979797;
+				border-bottom: 1px solid #A0A0A0;
 
 				&>view {
 					&:nth-last-of-type(1) {
 						border: none;
 					}
 
-					border-right: 1px solid #979797;
+					border-right: 1px solid #A0A0A0;
 				}
 
 				&:nth-last-of-type(1) {
@@ -613,7 +666,7 @@
 					flex: 1;
 					font-size: 9rpx;
 					text-align: left;
-					padding: 7rpx;
+					padding:10rpx 7rpx;
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
@@ -635,7 +688,7 @@
 				flex: 1;
 
 				.title {
-					margin: 7rpx 0;
+					margin: 10rpx 0;
 					font-size: 11rpx;
 					font-weight: 800;
 				}
@@ -672,7 +725,7 @@
 			}
 
 			.tbody {
-				border: 1px solid #979797;
+				border: 1px solid #A0A0A0;
 				border-radius: 3rpx;
 				overflow: hidden;
 
@@ -684,7 +737,7 @@
 						border: none;
 					}
 
-					border-bottom: 1px solid #979797;
+					border-bottom: 1px solid #A0A0A0;
 
 					.title {
 						font-size: 9rpx;
@@ -692,8 +745,8 @@
 						text-align: center;
 						background: #F3F5F8;
 						padding: 7rpx;
-						border-left: 1px solid #979797;
-						border-right: 1px solid #979797;
+						border-left: 1px solid #A0A0A0;
+						border-right: 1px solid #A0A0A0;
 
 						&:nth-of-type(1) {
 							border-left: none;
diff --git a/pages/pages/history.vue b/pages/pages/history.vue
index 87401c7..8ff2aaf 100644
--- a/pages/pages/history.vue
+++ b/pages/pages/history.vue
@@ -37,8 +37,10 @@
 					<view>{{item.restDurationText}}</view>
 				</view>
 			</view>
+			
 			<view class="right " :class="{red:item.status==2}">{{item.statusText}}</view>
 		</view>
+		<view style="height: 10rpx;"></view>
 		<nynull txt="暂无历史数据" v-if="!list.length"></nynull>
 	</scroll-view>
 	<pageanimation v-model="showdetails" @close="refdetails.hide()" >
@@ -120,9 +122,10 @@
 	}
 	// 重置
 	function reset(){
-		Selectiondate.value.reset();
+	
 		queryDate.value="";
 		vehicleNumber.value=""
+		Selectiondate.value.reset();
 		showdate.value=false;
 		hasNextPage.value=true;
 		pageNum.value=1;
@@ -148,11 +151,9 @@
 
 
 	.scroll-view {
-		height: calc(100vh - 70rpx);
+		height: calc(100vh - 60rpx);
 		padding: 1rpx 15rpx;
-
 		box-sizing: border-box;
-
 		.item {
 			display: flex;
 			align-items: center;
@@ -162,43 +163,35 @@
 			margin-bottom: 10rpx;
 			overflow: hidden;
 			padding: 10rpx 15rpx;
-
 			.left {
 				.t {
 					display: flex;
 					align-items: center;
 					font-size: 9rpx;
 					color: #333333;
-
 					image {
 						width: 13rpx;
 						height: 13rpx;
 						margin-right: 8rpx;
 					}
 				}
-
 				.num {
 					width: 81rpx;
 					line-height: 20rpx;
 					margin-top: 8rpx;
 					text-align: center;
-					
 					font-weight: 800;
 					font-size: 11rpx;
-
 				}
 			}
-
 			.center {
 				border-radius: 5rpx;
 				overflow: hidden;
 				border: 1rpx solid rgba(162, 181, 207, 0.67);
-
 				.thead {
 					background: rgba(162, 181, 207, 0.13);
 					padding: 7rpx 0;
 					display: flex;
-
 					view {
 						width: 90rpx;
 						text-align: center;
@@ -206,7 +199,6 @@
 						color: #76849D;
 						flex: 1;
 						position: relative;
-
 						&:before {
 							content: "";
 							position: absolute;
@@ -217,7 +209,6 @@
 							top: 50%;
 							transform: translate(-0, -50%);
 						}
-
 						&:nth-of-type(1) {
 							&:before {
 								display: none;
@@ -225,10 +216,8 @@
 						}
 					}
 				}
-
 				.tbody {
 					display: flex;
-
 					view {
 						text-align: center;
 						padding: 7rpx 0;
@@ -238,9 +227,7 @@
 					}
 				}
 			}
-
 			.right {
-				
 				font-size: 11rpx;
 				width: 60rpx;
 				text-align: center;
diff --git a/pages/pages/passingTheCar.vue b/pages/pages/passingTheCar.vue
index f2dc1a2..f36955b 100644
--- a/pages/pages/passingTheCar.vue
+++ b/pages/pages/passingTheCar.vue
@@ -5,7 +5,7 @@
 				<view  v-for="item in devices" :class="{on:deviceId==item.encoding}" @click="setdeviceid(item.encoding)">设备{{item.encoding}}</view>
 			</view>
 			<view class="r">
-				{{infodata.queryTime}}
+				{{timeFormat(getdata,"yyyy年mm月dd日hh时MM分ss秒")}}
 				<view>区间测速实时监测中</view>
 			</view>
 		</view>
@@ -15,7 +15,8 @@
 				<view class="title">当天过车数量</view>
 			</view>
 			<view class="item">
-				<view class="num">{{infodata.lastMonitoringTime}}</view>
+				<view class="num" v-if="list.length">{{showday}}</view>
+				<view class="num" v-if="!list.length">-</view>
 				<view class="title">距离最后一次监测，已过去：</view>
 			</view>
 		</view>
@@ -46,12 +47,12 @@
 	const devices=ref([]);
 	const infodata=ref({})
 	const list=ref([])
-	
+	import { timeFormat  } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
 	// 分页相关
 	const pageSize=ref(40);
 	const pageNum=ref(1);
 	const hasNextPage=ref(true)
-	
+	const getdata=ref(new Date().getTime())
 	function load() {
 		console.log('过车信息load')
 	}
@@ -82,33 +83,60 @@
 		})
 	}
 	// 获取过车信息
+	const daytiem=ref(new Date().getTime());
+	const showday=ref("刚刚")
+	let _eliminate;
 	function getinfo() {
+		clearInterval(_eliminate)
 		getpassingTheCar({deviceId:deviceId.value,pageNum:pageNum.value,pageSize:pageSize.value}).then(r=>{
 			infodata.value=r.data;
+			daytiem.value=r.data.vehicleList[0]?new Date(r.data.vehicleList[0].queryTime).getTime():0;
 			list.value=list.value.concat(r.data.vehicleList)
-			hasNextPage.value=r.data.hasNextPage
+			hasNextPage.value=r.data.hasNextPage;
+			settiem()
 		})
 	}
 	// 触底
 	function bottomingOut(){
-		if(hasNextPage.value){
-			pageNum.value=pageNum.value+1;
-			getinfo()
-		}
+		// if(hasNextPage.value){
+		// 	pageNum.value=pageNum.value+1;
+		// 	getinfo()
+		// }
 	}
 	
 	// 监听推送数据
-	let _clet;
 	uni.onSkt("SERCHNEWDATA", (res) => {
-		// console.log(res)
-		// scroll.value=10;
-		list.value = [...res, ...list.value]
-		// clearTimeout(_clet)
-		// _clet=setTimeout(()=>{
-		// 	scroll.value=0;
-		// },500)
+		if(res.deviceId==deviceId.value){
+				list.value = [...res.viewList, ...list.value]
+				infodata.value.todayCount=infodata.value.todayCount+res.viewList.length;
+				daytiem.value=new Date().getTime();
+				clearInterval(_eliminate)
+				settiem()
+		}
+		
 		// 预警列表接收推送数据
 	})
+	function timeAgo() {
+	    const now = new Date();
+	    const past = new Date(daytiem.value);
+	    const seconds = Math.floor((now - past) / 1000);
+	    const minutes = Math.floor(seconds / 60);
+	    const hours = Math.floor(minutes / 60);
+	    const days = Math.floor(hours / 24);
+	    const years = Math.floor(days / 365);
+	    if (years > 0) return `${years}年前`;
+	    if (days > 0) return `${days}天前`;
+	    if (hours > 0) return `${hours}小时前`;
+	    if (minutes > 0) return `${minutes}分钟前`;
+	    return `${seconds}秒前`;
+	}
+	function  settiem(){
+		_eliminate=setInterval(()=>{
+			getdata.value=new Date().getTime()
+			showday.value=timeAgo()
+		},500)
+	}
+	
 	
 	// 重置
 	function reset(){
@@ -206,7 +234,7 @@
 
 		scroll-view {
 			box-sizing: border-box;
-			height: calc(100vh - 175rpx);
+			height: calc(100vh - 160rpx);
 
 			.li {
 				display: flex;
@@ -230,7 +258,7 @@
 						border-radius: 3rpx;
 						margin-left: 15rpx;
 						
-						font-weight: 800;
+						
 						font-size: 11rpx;
 					}
 				}
diff --git a/pages/pages/setUp.vue b/pages/pages/setUp.vue
index 952883d..6df945e 100644
--- a/pages/pages/setUp.vue
+++ b/pages/pages/setUp.vue
@@ -106,77 +106,17 @@
 
 <!-- renderjs 嵌入百度地图了 -->
 <script module="mapbaidu" lang="renderjs">
+	
+	let BAIDUKEY="LuRvyI4RAQNUQzVYE0Z8negUY3AD3dOo";
 	let suspend = false;
 	let timing;
 	let imgb64 =
 		"data:image/png;base64,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"
 
-	let _map;
+	let _map="";
 	export default {
 		mounted() {
-			// 加载百度地图JS
-			window.BMAP_PROTOCOL = "https";
-			window.BMapGL_loadScriptTime = new Date().getTime();
-			var script = document.createElement('script');
-			script.type = 'text/javascript';
-			script.src =
-				'https://api.map.baidu.com/getscript?type=webgl&v=1.0&ak=5VQleLOrEoKTkOFqd2lD3RWHBjkHsXPE&services=&t=2025082517022';
-			document.body.appendChild(script);
-
-			var script = document.createElement('script');
-			script.type = 'text/javascript';
-			script.src =
-				'https://api.map.baidu.com/getscript?v=3.0&ak=5VQleLOrEoKTkOFqd2lD3RWHBjkHsXPE&services=&t=2025082517022';
-			document.body.appendChild(script);
-
-			var link = document.createElement("link");
-			link.rel = "stylesheet";
-			link.type = "text/css";
-			link.href = "https://api.map.baidu.com/res/webgl/10/bmap.css";
-			document.body.appendChild(link);
-
-			// 加载点位样式
-			var style = document.createElement('style');
-			style.type = 'text/css';
-			style.innerText =
-				`#imgs {
-					display: inline-block;
-					text-align: center;
-					 margin-top: -17px;
-				 }
-				 #imgs .rq{
-					 position: relative;
-					 display: inline-block;
-				 }
-				  #imgs .rq span{
-					 display: inline-block;
-					 width: 15px;
-					 height: 15px;
-					 background: #4D7BFF;
-					 position: absolute;
-					 bottom: -6px;
-					 left: 50%;
-					 transform: translate(-50%,0) rotate(45deg);
-				  }
-				 #imgs #titl {
-					background: #4D7BFF;
-					color: #fff;
-					font-size: 13px;
-					padding: 7px 10px;
-					border-radius: 5px;
-					 position: relative;
-					 z-index: 2;
-					 white-space: nowrap;
-				 }
-				 
-				 #imgs img {
-					
-					width: 20px;
-					 margin-top: 13px;
-					display: inline-block;
-				 }`
-
-			document.head.appendChild(style);
+			this.createMap()
 		},
 		data() {
 			return {
@@ -191,6 +131,71 @@
 			}
 		},
 		methods: {
+			createMap(){
+					// 加载百度地图JS
+					window.BMAP_PROTOCOL = "https";
+					window.BMapGL_loadScriptTime = new Date().getTime();
+					var script = document.createElement('script');
+					script.type = 'text/javascript';
+					script.src =
+						`https://api.map.baidu.com/getscript?type=webgl&v=1.0&ak=${BAIDUKEY}&services=&t=2025082517022`;
+					document.body.appendChild(script);
+					
+					var script = document.createElement('script');
+					script.type = 'text/javascript';
+					script.src =
+						`https://api.map.baidu.com/getscript?v=3.0&ak=${BAIDUKEY}&services=&t=2025082517022`;
+					document.body.appendChild(script);
+					
+					var link = document.createElement("link");
+					link.rel = "stylesheet";
+					link.type = "text/css";
+					link.href = "https://api.map.baidu.com/res/webgl/10/bmap.css";
+					document.body.appendChild(link);
+					
+					// 加载点位样式
+					var style = document.createElement('style');
+					style.type = 'text/css';
+					style.innerText =
+						`#imgs {
+							display: inline-block;
+							text-align: center;
+							 margin-top: -17px;
+						 }
+						 #imgs .rq{
+							 position: relative;
+							 display: inline-block;
+						 }
+						  #imgs .rq span{
+							 display: inline-block;
+							 width: 15px;
+							 height: 15px;
+							 background: #4D7BFF;
+							 position: absolute;
+							 bottom: -6px;
+							 left: 50%;
+							 transform: translate(-50%,0) rotate(45deg);
+						  }
+						 #imgs #titl {
+							background: #4D7BFF;
+							color: #fff;
+							font-size: 13px;
+							padding: 7px 10px;
+							border-radius: 5px;
+							 position: relative;
+							 z-index: 2;
+							 white-space: nowrap;
+						 }
+						 
+						 #imgs img {
+							
+							width: 20px;
+							 margin-top: 13px;
+							display: inline-block;
+						 }`
+					
+					document.head.appendChild(style);
+			},
 			init(e) {
 				let _this = this;
 				console.log(999999)
@@ -234,6 +239,7 @@
 			showsetcenter(e) {
 				if (_map) {
 					console.log(e)
+					_map.clearOverlays()
 					var point = new BMapGL.Point(e.data.longitude, e.data.latitude);
 					_map.setCenter(point);
 					this.mapsetEmit({
@@ -389,7 +395,10 @@
 				
 				
 				// 删除所有覆盖物
-				_map.clearOverlays()
+				if(_map){
+					_map.clearOverlays()
+				}
+				
 				
 				// 设置坐标信息
 				this.marker1.point = e.data.point1.point;
@@ -435,12 +444,13 @@
 			},
 			// renderjs 和页面通讯相关方法
 			mapgetEmit(e) {
-
+				
 				if (e.type && suspend == false) {
 					suspend = true;
 					this[e.type](e);
 					console.log(e.type)
 				}
+				
 				clearTimeout(timing)
 				// 一秒没回馈清除
 				timing = setTimeout(function() {
@@ -464,6 +474,7 @@
 		getpassingTheCar,
 		setSettings
 	} from "/appapi/index.js"
+	
 	export default {
 		data() {
 			return {
diff --git a/pages/pages/statistics.vue b/pages/pages/statistics.vue
index 7a93a37..28beaa4 100644
--- a/pages/pages/statistics.vue
+++ b/pages/pages/statistics.vue
@@ -58,32 +58,31 @@
 				script.src = 'static/echarts.min.js'
 				document.head.appendChild(script)
 			}
-
 		},
 		methods: {
 			init(e) {
 				if (!window.echarts) {
 					return
 				}
-
-
 			},
 			updata(r) {
-
+				
 				if (window.echarts && r.overspeedStatistics) {
-					let allnum=r.overspeedStatistics.overspeedOver50+r.overspeedStatistics.overspeed20To50+r.overspeedStatistics.overspeed10To20+r.overspeedStatistics.overspeedUnder10
+					let allnum = r.overspeedStatistics.overspeedOver50 + r.overspeedStatistics.overspeed20To50 + r
+						.overspeedStatistics.overspeed10To20 + r.overspeedStatistics.overspeedUnder10
 					myChart = echarts.init(document.getElementById("echart"))
 					myChart.setOption({
 						grid: {
 							top: 20,
-							right: 0,
+							// right: 0,
 							bottom: 15,
 							left: 0,
-
 						},
 						xAxis: {
 							type: 'value',
-							axisLabel: { interval: 0 }
+							axisLabel: {
+								interval: 0
+							}
 						},
 						yAxis: {
 							type: 'category',
@@ -96,14 +95,47 @@
 								color: "#4D7BFF",
 								label: {
 									show: true,
-									position: 'right',
+									position: 'insideRight',
 									interval: 0,
-									formatter:function(a){
-										return Number(a.value/allnum*100 || 0).toFixed(2)+'%';
+									color:"#fff",
+									textMargin: [0, 100],
+									formatter :function(a){
+										return a.value?a.value:""
 									}
 								},
-								emphasis:{
-									disabled:true
+								emphasis: {
+									disabled: true
+								},
+								markPoint: {
+									symbolSize: 0,
+									symbol: "pin",
+									label: {
+										color: "#000",
+										position:"right"
+									},
+									data: [
+										{
+											value: Number(r.overspeedStatistics.overspeedOver50/allnum*100 || 0).toFixed(2)+'%',
+											xAxis: r.overspeedStatistics.overspeedOver50,
+											yAxis: 0
+										},
+										{
+											value: Number(r.overspeedStatistics.overspeed20To50/allnum*100 || 0).toFixed(2)+'%',
+											xAxis: r.overspeedStatistics.overspeed20To50,
+											yAxis: 1
+										},
+										{
+											value: Number(r.overspeedStatistics.overspeed10To20/allnum*100 || 0).toFixed(2)+'%',
+											xAxis: r.overspeedStatistics.overspeed10To20,
+											yAxis: 2
+										},
+										{
+											value: Number(r.overspeedStatistics.overspeedUnder10/allnum*100 || 0).toFixed(2)+'%',
+											xAxis: r.overspeedStatistics.overspeedUnder10,
+											yAxis: 3
+										},
+
+									]
 								},
 								data: [
 									r.overspeedStatistics.overspeedOver50,
@@ -111,51 +143,6 @@
 									r.overspeedStatistics.overspeed10To20,
 									r.overspeedStatistics.overspeedUnder10,
 								],
-							},
-							{
-								barGap: "-100%",
-								silent: true,
-								barWidth: 20,
-								type: 'bar',
-								color: "#4D7BFF",
-								label: {
-									show: true,
-									position: 'insideTopRight',
-									color: "#fff"
-								},
-								emphasis:{
-									disabled:true
-								},
-								data: [
-									r.overspeedStatistics.overspeedOver50,
-									r.overspeedStatistics.overspeed20To50,
-									r.overspeedStatistics.overspeed10To20,
-									r.overspeedStatistics.overspeedUnder10,
-								],
-							},
-							{
-								barGap: "-100%",
-								silent: true,
-								barWidth: 20,
-								type: 'bar',
-								
-								itemStyle:{
-									color: "rgba(255,255,255,0)",
-								},
-								emphasis:{
-									disabled:true
-								},
-								label: {
-									show: true,
-									position: 'insideTopRight',
-									color: "#fff"
-								},
-								data: [
-									r.overspeedStatistics.overspeed50Plus+10,
-									r.overspeedStatistics.overspeed20To50+10,
-									r.overspeedStatistics.overspeed10To20+10,
-									r.overspeedStatistics.overspeedUnder10+10,
-								],
 							}
 						]
 					})
diff --git a/pages/pages/warningInformation.vue b/pages/pages/warningInformation.vue
index b0047e0..02d5b76 100644
--- a/pages/pages/warningInformation.vue
+++ b/pages/pages/warningInformation.vue
@@ -87,8 +87,11 @@
 				</view>
 			</view>
 			<view class="right red" v-if="status==2" @click.stop="withhold(item.encoding,1)">暂扣</view>
-			<view class="right green" v-if="status==3" @click.stop="withhold(item.encoding,2)">放行</view>
+			
+			<view class="right grey" v-if="status==3 && !item.type" @click.stop="tips">放行</view>
+		    <view class="right green" v-if="status==3 && item.type" @click.stop="withhold(item.encoding,2)">放行</view>
 		</view>
+		<view style="height: 10rpx;"></view>
 		<nynull v-if="!info.data?.length"></nynull>
 	</scroll-view>
 	<pageanimation v-model="showdetails" @close="refdetails.hide()">
@@ -113,7 +116,7 @@
 	const pageSize = ref(50);
 	const pageNum = ref(1);
 	const hasNextPage = ref(true)
-
+	let timer;
 
 	const info = ref({
 		data: []
@@ -123,6 +126,37 @@
 	function load() {
 		console.log('预警信息load')
 	}
+	function tips(){
+		uni.showToast({
+			title:"未到放行时间",icon:"error"
+		})
+	}
+	// 更新放行状态
+	upreleasetype()
+	function upreleasetype(){
+		// 清除定制任务 避免多个定时任务
+		clearInterval(timer)
+		function gettype(){
+			// 只有暂扣车辆列表
+			if(status.value==3){
+				info.value.data.map((res,index)=>{
+					if(new Date().getTime()>new Date(res.restDurationEndtime).getTime()){
+						// 可放行
+						info.value.data[index]['type']=1;
+					}else{
+						// 不可放行
+						info.value.data[index]['type']=0;
+					}
+				})
+			}
+		}
+		gettype()
+		// 重启定时任务 
+		timer=setInterval(()=>{
+			gettype()
+		},1000)
+	}
+	
 
 	function opneshowdetails() {
 		showdetails.value = true;
@@ -181,9 +215,7 @@
 
 	function show() {
 		getinfo()
-		// #ifdef APP
-		uni.setAppBadgeNumber(0)
-		// #endif
+
 	}
 
    const itemanimation=ref(false)
@@ -231,9 +263,9 @@
 
 <style scoped lang="scss">
 	.scroll-view {
-		height: calc(100vh - 140rpx);
+		height: calc(100vh - 110rpx);
 		padding: 1rpx 15rpx;
-
+		padding-bottom: 20rpx;
 		box-sizing: border-box;
 
 		.item {
@@ -286,7 +318,7 @@
 					margin-top: 8rpx;
 					text-align: center;
 
-					font-weight: 800;
+					
 					font-size: 11rpx;
 
 				}
@@ -453,7 +485,7 @@
 			}
 
 			.num {
-				font-weight: 800;
+			
 				font-size: 13rpx;
 				color: #4D7BFF;
 
diff --git a/pages/signIn.vue b/pages/signIn.vue
index c666fa2..a007388 100644
--- a/pages/signIn.vue
+++ b/pages/signIn.vue
@@ -36,7 +36,7 @@
 	import {
 		applogin
 	} from "/appapi/index.js"
-	import soket from "/utils/soket.js"
+
 	import {
 		onShow
 	} from "@dcloudio/uni-app"
@@ -80,9 +80,7 @@
 			password: password.value,
 			deviceType: " android"
 		}).then(r => {
-			// 创建soket连接
 			uni.setStorageSync('USERID', r.data.user.userId)
-			soket()
 			uni.reLaunch({
 				url: "/pages/index"
 			})