1

pages/videoManage/playVideo.vue

@@ -10,10 +10,9 @@
 		<video class="videoBox" id="myVideo" :custom-cache="false" :src="playUrlFilter" controls autoplay></video>
 		<view class="videoName">
 			{{videoInfo.videoName}}
-			<button v-if="videoInfo.videoType==3" type="primary" class="changeBtn btn"
+			<button v-if="videoInfo.videoType==3" type="primary" class="changeBtn btn" @click="changeStreamFn">{{streamType==1?'切换到主码流':'切换到子码流'}}</button>
-				@click="changeStreamFn">{{streamType==1?'切换到主码流':'切换到子码流'}}</button>
 		</view>
-		<view class="videoOperateBox" :class="{'videoOperateBox2':videoFlag}">
+		<view class="videoOperateBox">
 			<view class="box">
 				<image src="../../static/videoControlIcon/bg.png" class="bg"></image>
 				<view class="pic top" @click="controlVideoFn(0,0.2,0,'UP')"></view>
@@ -36,16 +35,11 @@
 <script>
 	import headers from '../../components/headers/headers.vue'
 	export default {
-		components: {
+		components:{headers},
-			headers
-		},
 		data() {
 			return {
 				url:'',//rtsp://admin:jxj12345@192.168.0.64:554/h264/ch1/main/av_stream
-				videoInfo: {
+				videoInfo:{videoName:'',videoType:null},
-					videoName: '',
-					videoType: null
-				},
 				streamType: 1, //1是子码流    2是主码流
 				videoResponseInfo: {},
 				videoFlag:false,
@@ -70,10 +64,7 @@
 			// 跳转到录像回放列表
 			toBackList(){
 				uni.navigateTo({
-					url: './playBackList?obj=' + JSON.stringify({
+					url: './playBackList?obj=' + JSON.stringify({...this.videoResponseInfo,...this.videoInfo})
-						...this.videoResponseInfo,
-						...this.videoInfo
-					})
 				})
 			},
 			changeStreamFn(){
@@ -86,9 +77,7 @@
 			},
 			getPlayUrl(){
 				var that = this
-				var json = {
+				var json ={itemId:this.videoInfo.itemId}
-					itemId: this.videoInfo.itemId
-				}
 				if(this.videoInfo.videoType==3){
 					json.streamType=this.streamType
 					json.type='rtsp'  //rtsp或者hls
@@ -106,10 +95,7 @@
 								that.url=res.result.videoInfo.url
 								break;
 						}
-						that.videoResponseInfo = {
+						that.videoResponseInfo = {...res.result.projectVideoConfig,...res.result.videoInfo};
-							...res.result.projectVideoConfig,
-							...res.result.videoInfo
-						};
 						for(let i in that.videoResponseInfo){
 							if(!that.videoResponseInfo[i]){
 								delete that.videoResponseInfo[i]
@@ -217,7 +203,6 @@
 	background-color: #F4F5FD;
 	height: 100vh;
 }
-
 /* #endif */
  
 /* #ifdef MP-WEIXIN */
@@ -225,7 +210,6 @@
 	background-color: #F4F5FD;
 	height: 100vh;
 }
-
 /* #endif */
  
 /* #ifdef APP-PLUS */
@@ -234,19 +218,16 @@
 	height: auto;
 	padding-bottom: 60rpx;
 }
-
 /* #endif */
 .videoBox{
 	width: 100%;
 }
-
 .videoName{
 	font-size: 16px;
 	color: $uni-text-color;
 	font-weight: bold;
 	margin: 10px 15px;
 	position: relative;
-
 	.changeBtn{
 		position: absolute;
 		right: 0;
@@ -254,7 +235,6 @@
 		font-size: 12px;
 	}
 }
-
 .video-playback{
 	width: 454rpx;
 	height: 108rpx;
@@ -272,11 +252,9 @@
 	// bottom: 80rpx;
 	// left: 145rpx;
 }
-
 .videoOperateBox {
   text-align: center;
   padding-top: 10px;
-
   .bg{
 	  width: 220px;
 	  height: 220px;
@@ -327,19 +305,19 @@
   margin-top: -16px;
 }
 
-	.videoOperateBox2 .left:hover {
+.videoOperateBox .left:hover {
   background: url("../../static/videoControlIcon/left-active.png");
 }
 
-	.videoOperateBox2 .right:hover {
+.videoOperateBox .right:hover {
   background: url("../../static/videoControlIcon/right-active.png");
 }
 
-	.videoOperateBox2 .top:hover {
+.videoOperateBox .top:hover {
   background: url("../../static/videoControlIcon/top-active.png");
 }
 
-	.videoOperateBox2 .bottom:hover {
+.videoOperateBox .bottom:hover {
   background: url("../../static/videoControlIcon/bottom-active.png");
 }