Merge branch 'SCHOOL-XiBeiNongLin' into lab-xcx-dev

pages_manage/views/laboratory/videoPlayer.vue

@@ -18,11 +18,9 @@
 					console.log('obj',obj)
 					let url = '';
 					if(obj.type == 4){
-						url = uni.getStorageSync('cameraExtranetAgent')+'?type=4&subId='+obj.subId
-						// url = 'http://192.168.1.10:8080/?type=4&subId='+obj.subId
+						url = uni.getStorageSync('cameraExtranetAgent')+'?source=2&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 					}else if(obj.type == 5){
-						url = uni.getStorageSync('cameraExtranetAgent')+'?type=5&floorId='+obj.floorId+'&subId='+obj.subId
-						// url = 'http://192.168.1.10:8080/?type=5&floorId='+obj.floorId+'&subId='+obj.subId
+						url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
 					}
 					this.$set(this,'webViewUrl',url);
 					this.$set(this,'pageType',true);