zc

pages/views/videoPlayer.vue

@@ -21,7 +21,7 @@
 			// 	url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&mpegts=true&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 			// }
 			if(obj.type == 4){
-				url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=2&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+				url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=2&type=4&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 			}else if(obj.type == 5){
 				url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=5&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 			}

pages_manage/views/laboratory/infoPage.vue

@@ -113,10 +113,10 @@
 		},
 		methods: {
 			goVideoPage(){
-				console.log('视频')
 				let obj = {
 					type:4,
-					subId:this.newData.subId
+					subId:this.newData.subId,
+					floorId:this.newData.floorId,
 				}
 				uni.navigateTo({
 						url: '/pages_manage/views/laboratory/videoPlayer?item='+encodeURIComponent(JSON.stringify(obj))

pages_manage/views/laboratory/safetyCardScan.vue

@@ -249,10 +249,10 @@
 				}
 			},
 			goVideoPage() {
-				console.log('视频')
 				let obj = {
 					type: 4,
-					subId: this.newData.subId
+					subId: this.newData.subId,
+					floorId: this.newData.floorId,
 				}
 				uni.navigateTo({
 					url: '/pages_manage/views/laboratory/videoPlayer?item=' + encodeURIComponent(JSON.stringify(

pages_manage/views/laboratory/videoPlayer.vue

@@ -15,7 +15,6 @@
         },
         onLoad(option) {
 					let obj = JSON.parse(decodeURIComponent(option.item))
-					console.log('obj',obj)
 					let url = '';
 					// if(obj.type == 4){
 					// 	url = uni.getStorageSync('cameraExtranetAgent')+'?source=2&mpegts=true&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
@@ -23,7 +22,7 @@
 					// 	url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&mpegts=true&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 					// }
 					if(obj.type == 4){
-						url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=2&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+						url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=2&type=4&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 					}else if(obj.type == 5){
 						url = uni.getStorageSync('cameraExtranetAgent')+'?mpegts=true&source=5&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 					}