dedsudiyu 9 månader sedan
förälder
incheckning
6dfe02652d

+ 1 - 5
pages/views/login/login.vue

@@ -202,12 +202,8 @@
 					console.log('obj', obj)
 					//文件预览地址
 					uni.setStorageSync('filePreviewUrl', 'https://' + obj.fileExtranetUrl)
-					//摄像头代理访问地址
+					//小程序视频地址
 					uni.setStorageSync('cameraExtranetAgent', 'https://' + obj.cameraExtranetAgent)
-					//摄像头地址ip段
-					uni.setStorageSync('cameraIntranetAgent', obj.cameraIntranetAgent)
-					//摄像头访问地址
-					uni.setStorageSync('cameraUrl', 'https://' + obj.cameraExtranetUrl)
 					//MQTT地址
 					uni.setStorageSync('mqttUrl', Decrypt(obj.mqttExtranetUrl))
 					//MQTT账号

+ 6 - 0
pages_manage/views/laboratory/infoPage.vue

@@ -112,6 +112,12 @@
 
 		},
 		methods: {
+			goVideoPage(){
+				console.log('视频')
+				uni.navigateTo({
+						url: '/pages_manage/views/laboratory/videoPlayer?item='+encodeURIComponent(JSON.stringify(this.newData))
+				});
+			},
 			getIotControlData(){
 				this.$refs['iotControl'].iotAppHardwareFindByType();
 			},

+ 1 - 0
pages_manage/views/laboratory/iotControl.vue

@@ -116,6 +116,7 @@
 						});
 						return
 					}
+					this.$parent.goVideoPage();
 				} else {
 					if (!controlsRestrictVerify('subHardwareControl')) {
 						uni.showToast({

+ 12 - 4
pages_manage/views/laboratory/videoPlayer.vue

@@ -1,6 +1,7 @@
 <template>
 	<view id="videoPlayer">
-		<web-view src="http://10.111.224.196:8080/?type=4&id=1793100035379396609"></web-view>
+		<!-- <web-view src="http://10.111.224.196:8080/?type=4&id=1793100035379396609"></web-view> -->
+		<web-view :src="webViewUrl" v-if="pageType"></web-view>
 	</view>
 </template>
 
@@ -8,14 +9,21 @@
     export default {
         data() {
             return {
-				
+							pageType:false,
+							webViewUrl:'',
             }
         },
         onLoad(option) {
-			
+					let obj = JSON.parse(decodeURIComponent(option.item))
+					let url = uni.getStorageSync('cameraExtranetAgent')+'?type=4&id='+obj.subId
+					this.$set(this,'webViewUrl',url);
+					this.$set(this,'pageType',true);
         },
+				onShow(){
+					
+				},
         methods: {
-			
+					
         }
     }
 </script>