diff --git a/components/tree-node/index.vue b/components/tree-node/index.vue
index fcff0383..f06db969 100644
--- a/components/tree-node/index.vue
+++ b/components/tree-node/index.vue
@@ -2,9 +2,11 @@
 <template>
 	<view class="tree-content-compontent">
 		<view class="content-box" @click="expandFn">
+			<u-icon name="arrow-right" color="#D5D5D5" size="44" v-if="!expanded && item.children && item.children.length" style="margin-right: 10rpx;"></u-icon>
+			<u-icon name="arrow-down" color="#D5D5D5" size="44" v-if="expanded && item.children && item.children.length" style="margin-right: 10rpx;"></u-icon>
 			<text class="box-text" @click.stop="toggleNodes(item)">{{ item.groupName }}</text>
-			<u-icon name="arrow-right" color="#D5D5D5" size="44" v-if="!expanded && item.children && item.children.length"></u-icon>
-			<u-icon name="arrow-down" color="#D5D5D5" size="44" v-if="expanded && item.children && item.children.length"></u-icon>
+			<image v-if="(!item.children || !item.children.length)" style="width:60rpx;height:60rpx;" src="../../static/videoControlIcon/videoIcon.png" mode="">
+			</image>
 			<!-- <image style="width:80rpx;height:80rpx;float:left" src="../../static/icon-down-black.png" mode="">
 			</image> -->
 		</view>
@@ -44,7 +46,7 @@ export default {
  
 <style lang="scss" scoped>
 .tree-content-compontent{
-	background: #FFFFFF;
+	background: #F5F5F5;
 	.content-box{
 		display: flex;
 		align-items: center;
@@ -65,8 +67,14 @@ export default {
 			text-overflow: ellipsis;
 		}
 	}
+	.sub-component{
+		background: #FFFFFF;
+		.tree-content-compontent{
+			background: #FFFFFF;
+		}
+	}
 	.expandedStyle{
-		margin-left: 40rpx;
+		margin-left: 60rpx;
 	}
 }
 </style>
\ No newline at end of file
diff --git a/main.js b/main.js
index a722b9a1..f0f913e7 100644
--- a/main.js
+++ b/main.js
@@ -44,8 +44,8 @@ if (process.env.NODE_ENV === 'development') {
   // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
   // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
   // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
-  Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
-  // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
+  // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
+  Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
   // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
   // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
   // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
diff --git a/pages/projectEnd/ekashManage/ekashManage.vue b/pages/projectEnd/ekashManage/ekashManage.vue
index c03cb09f..8ed54b47 100644
--- a/pages/projectEnd/ekashManage/ekashManage.vue
+++ b/pages/projectEnd/ekashManage/ekashManage.vue
@@ -13,7 +13,7 @@
 					<span class="ukashList-look">查看明细</span>
 				</view>
 				<view class="ukashList-time">企业: {{item.enterpriseName}}</view>
-				<view class="ukashList-time">入场时间: {{item.entryTime}}</view>
+				<view class="ukashList-time">出场有效时间: {{item.entryBeginTime}}至{{item.entryEndTime}}</view>
 			</view>
 		</view>
 		<view class="no-data" v-else>
@@ -97,7 +97,10 @@
 				let data = {
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
-					name: e.detail.value ? e.detail.value : null
+					type: 2
+				}
+				if(e.detail.value){
+					data.name = e.detail.value;
 				}
 				let _this = this
 				this.sendRequest({
@@ -108,7 +111,7 @@
 						console.log(res);
 						// this.dataList = this.dataList.concat(res.result.records)
 						
-						this.dataList = [...this.dataList, ...res.result.records]
+						this.dataList = res.result.records
 						// console.log(this.dataList , res.result.total);
 						// this.dataList = res.result.records
 						if (res.result.records.length < this.pageSize) {
@@ -143,7 +146,7 @@
 		}
 
 		.ukashList {
-			height: 90px;
+			min-height: 90px;
 			background-color: #fff;
 			margin: 10px 10px;
 			border-radius: 15px;
diff --git a/pages/projectEnd/ukashManage/ukashManage.vue b/pages/projectEnd/ukashManage/ukashManage.vue
index 3d096530..efd8b1b0 100644
--- a/pages/projectEnd/ukashManage/ukashManage.vue
+++ b/pages/projectEnd/ukashManage/ukashManage.vue
@@ -13,7 +13,7 @@
 					<span class="ukashList-look">查看明细</span>
 				</view>
 				<view class="ukashList-time">企业: {{item.enterpriseName}}</view>
-				<view class="ukashList-time">入场时间: {{item.entryTime}}</view>
+				<view class="ukashList-time">入场有效时间: {{item.entryBeginTime}}至{{item.entryEndTime}}</view>
 			</view>
 		</view>
 		<view class="no-data" v-else>
@@ -97,7 +97,10 @@
 				let data = {
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
-					name: e.detail.value ? e.detail.value : null
+					type: 1
+				}
+				if(e.detail.value){
+					data.name = e.detail.value;
 				}
 				let _this = this
 				this.sendRequest({
@@ -108,7 +111,7 @@
 						console.log(res);
 						// this.dataList = this.dataList.concat(res.result.records)
 						
-						this.dataList = [...this.dataList, ...res.result.records]
+						this.dataList = res.result.records
 						// console.log(this.dataList , res.result.total);
 						// this.dataList = res.result.records
 						if (res.result.records.length < this.pageSize) {
@@ -143,7 +146,7 @@
 		}
 
 		.ukashList {
-			height: 90px;
+			min-height: 90px;
 			background-color: #fff;
 			margin: 10px 10px;
 			border-radius: 15px;
diff --git a/pages/videoManage/playBackList.vue b/pages/videoManage/playBackList.vue
index 2b60edec..2f0accba 100644
--- a/pages/videoManage/playBackList.vue
+++ b/pages/videoManage/playBackList.vue
@@ -16,9 +16,9 @@
 					<image src="/static/no_poster.png" class="no_poster"></image>
 				</view>
 				<view class="back-time">
-					<text class="date-time">2024-05-11 00:00:00</text>
+					<text class="date-time">{{item.beginTime}}</text>
 					<text class="divider-text">至</text>
-					<text class="date-time">2024-05-11 00:00:00</text>
+					<text class="date-time">{{item.endTime}}</text>
 				</view>
 			</view>
 		</view>
@@ -32,6 +32,9 @@
 </template>
 
 <script>
+	import {
+		dateformat
+	} from "@/utils/tool.js"
 	export default {
 		data() {
 			return {
@@ -75,8 +78,13 @@
 				this.loadData();
 			},
 			playVideoFn(item) {
+				let passData = {
+					...item,
+					videoName: this.pageSupportData.videoName,
+					...this.pageSupportData
+				}
 				uni.navigateTo({
-					url: './playBackVideo'
+					url: './playBackVideo?obj='+JSON.stringify(passData)
 				})
 			},
 			//获取项目视频
@@ -97,7 +105,11 @@
 					method: "POST",
 					success(res) {
 						console.log('找封面', res)
-						that.videoList = res.result.videoList
+						that.videoList = res.result.list
+						that.videoList.map(item => {
+							item.beginTime = dateformat(item.beginTime);
+							item.endTime = dateformat(item.endTime);
+						})
 					}
 				})
 			},
diff --git a/pages/videoManage/playBackVideo.vue b/pages/videoManage/playBackVideo.vue
index 4c917ef3..ecb8dc79 100644
--- a/pages/videoManage/playBackVideo.vue
+++ b/pages/videoManage/playBackVideo.vue
@@ -7,10 +7,12 @@
 		</headers>
 		<!-- <video class="videoBox" id="myVideo" :custom-cache="false" :src="url" controls autoplay></video> -->
 		<!-- 外网IP地址访问视频监控 -->
-		<video class="videoBox" id="myVideo" :custom-cache="false" :src="'rtsp://42.180.188.17:'+url.substring(20)" controls autoplay></video>
+		<!-- <video class="videoBox" id="myVideo" :custom-cache="false" :src="'rtsp://42.180.188.17:'+url.substring(20)" controls autoplay></video> -->
+		<video class="videoBox" id="myVideo" :custom-cache="false" :src="url" controls autoplay></video>
 		<view class="videoName">
-			<text>南山科技创新中心--标段总承包1#吊塔</text>
-			<text>2024-05-11 00:00:00</text>
+			<text>{{passData.videoName}}</text>
+			<text>{{passData.beginTime}}<br />至<br />{{passData.endTime}}</text>
+			
 		</view>
 	</view>
 </template>
@@ -22,124 +24,41 @@
 		data() {
 			return {
 				url:'',//rtsp://admin:jxj12345@192.168.0.64:554/h264/ch1/main/av_stream
-				videoInfo:{videoName:'',videoType:null},
 				streamType: 1, //1是子码流    2是主码流
+				passData: {}
 			};
 		},
 		onLoad(options) {
 			//videoType    1萤石云，2乐橙，3ISC，4大华，5宇视，6国标
 			// this.url = options.url
-			this.videoInfo=uni.getStorageSync('videoInfo')
-			if(this.videoInfo.videoType==2){
-				this.url= this.videoInfo.liveRadioUrl
-			}else{
-				this.getPlayUrl()
+			if(options.obj){
+				this.passData = JSON.parse(options.obj)
 			}
+			console.log(this.passData,777888)
+			this.loadData()
 		},
 		methods:{
-			// 跳转到录像回放列表
-			toBackList(){
-				uni.navigateTo({
-					url: './playBackList'
-				})
-			},
-			getPlayUrl(){
+			//获取项目视频
+			loadData() {
 				var that = this
-				var json ={itemId:this.videoInfo.itemId}
-				if(this.videoInfo.videoType==3){
-					json.streamType=this.streamType
-					json.type='rtsp'  //rtsp或者hls
+				let requestData = {
+					projectSn: that.passData.projectSn,
+					serialNumber: that.passData.serialNumber
 				}
-				this.sendRequest({
-					url: "xmgl/videoItem/getVideoItemInfo",
-					data: json,
-					method: "post",
-					success(res){
-						switch (that.videoInfo.videoType){
-							case 1:
-								that.url=res.result.videoInfo.hdFlvAddress
-								break;
-							default:
-								that.url=res.result.videoInfo.url
-								break;
-						}
+				if(that.passData.beginTime && that.passData.endTime){
+					requestData.beginTime = that.passData.beginTime
+					requestData.endTime = that.passData.endTime
+				}
+				that.sendRequest({
+					url: "xmgl/videoItem/callPostPlaybackURLsV2",
+					data: requestData,
+					method: "POST",
+					success(res) {
+						console.log('找封面', res)
+						that.url = res.result.url
 					}
 				})
 			},
-			controlVideoFn(pan, tilt, zoom,opType){
-				if(this.videoInfo.deviceType!=2){
-					uni.showToast({
-						title:'该设备不是球机，不支持此操作',
-						icon:'none'
-					})
-					return false
-				}
-				switch (this.videoInfo.videoType){
-					case 3:
-						this.controlVideoFn_isc(opType)
-						break;
-					case 4:
-						this.controlVideoFn_dh(pan, tilt, zoom)
-						break;
-					default:
-						uni.showToast({
-							title:'暂不支持',
-							icon:'none'
-						})
-						break;
-				}
-			},
-			controlVideoFn_isc(opType){
-				let json = {
-					// cameraId: this.videoInfo.deviceSerial,
-					itemId:this.videoInfo.itemId,
-					opType: opType,
-					opSize: 20,
-					opCode: 1
-				};
-				var that = this
-				this.sendRequest({
-					url: "xmgl/videoItem/getHikPtzControl",
-					data: json,
-					method: "post",
-					success(res){
-						uni.showToast({
-							title:'控制成功',
-							icon:'none'
-						})
-					}
-				})
-			},
-			controlVideoFn_dh(pan, tilt, zoom){
-				var code = '';
-				var jsonStr = {
-					pan: pan,
-					tilt: tilt,
-					zoom: zoom,
-					duration: 100
-				};
-				let json = {
-					ip: this.videoInfo.ip,
-					port: this.videoInfo.port,
-					username: this.videoInfo.username,
-					password: this.videoInfo.password,
-					chnnelcode: this.videoInfo.chnnelcode,
-					jsonStr: JSON.stringify(jsonStr),
-					data: new Date()
-				};
-				var that = this
-				this.sendRequest({
-					url: "xmgl/video/putPTZ",
-					data: json,
-					method: "get",
-					success(res){
-						uni.showToast({
-							title:'控制成功',
-							icon:'none'
-						})
-					}
-				})
-			}
 		}
 	}
 </script>
diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue
index 6c3227c6..0edb89cc 100644
--- a/pages/videoManage/playVideo.vue
+++ b/pages/videoManage/playVideo.vue
@@ -26,9 +26,9 @@
 				<view class="zoom zoomout" @click="controlVideoFn(0,0,-0.2,'ZOOM_OUT')"></view>
 			</view>
 		</view>
-		<!-- <view class="video-playback" @click="toBackList">
+		<view class="video-playback" @click="toBackList">
 			视频回放
-		</view> -->
+		</view>
 	</view>
 </template>
 
@@ -63,7 +63,7 @@
 			// 跳转到录像回放列表
 			toBackList(){
 				uni.navigateTo({
-					url: './playBackList?obj=' + JSON.stringify(this.videoResponseInfo)
+					url: './playBackList?obj=' + JSON.stringify({...this.videoResponseInfo,...this.videoInfo})
 				})
 			},
 			changeStreamFn(){
diff --git a/pages/videoManage/videoList.vue b/pages/videoManage/videoList.vue
index 5b780db9..05b8886c 100644
--- a/pages/videoManage/videoList.vue
+++ b/pages/videoManage/videoList.vue
@@ -24,7 +24,7 @@
 				</view>
 			</view>
 		</scroll-view>
-		<footers v-if="pageType=='company'" :activeTab="'videoManage'"></footers>
+		<!-- <footers v-if="pageType=='company'" :activeTab="'videoManage'"></footers> -->
 	</view>
 </template>
 
diff --git a/static/videoControlIcon/videoIcon.png b/static/videoControlIcon/videoIcon.png
new file mode 100644
index 00000000..c35f796e
Binary files /dev/null and b/static/videoControlIcon/videoIcon.png differ