heyang 2 年之前
父节点
当前提交
4c1d73f162
共有 3 个文件被更改,包括 24 次插入24 次删除
  1. 16 16
      pages/alarmInfo/alarmInfoMonitor.vue
  2. 5 5
      pages/emergencyEvacuationBig.vue
  3. 3 3
      pages_manage/workbench/laboratory/monitor.vue

+ 16 - 16
pages/alarmInfo/alarmInfoMonitor.vue

@@ -89,22 +89,22 @@
 				deviceIds:'4401020049200000000100209'
 			  };
 			  const {data} = await GetStartList(obj);
-			  if(data.code == 200){
-				let list = [];
-				for(let i=0;i<data.data.length;i++){
-				  let text = uni.getStorageSync('cameraUrl');
-				  let url = data.data[i].result.body.data.hls;
-				  url = url.split("rtp/");
-				  let newUrl = text+'rtp/'+url[1];
-				  let obj = {
-					id:data.data[i].result.body.data.deviceID,
-					url:newUrl,
-				  }
-				  list.push(obj)
-				  console.log("obj",obj)
-				}
-				this.urlList = list;
-			  }
+        if(data.code == 200){
+          let list = [];
+          for(let i=0;i<data.data.length;i++){
+            let text = uni.getStorageSync('cameraUrl');
+            let url = data.data[i].hls;
+            url = url.split("rtp/");
+            let newUrl = text+'rtp/'+url[1];
+            let obj = {
+              id:data.data[i].deviceID,
+              url:newUrl,
+            }
+            list.push(obj)
+            console.log("obj",obj)
+          }
+          this.urlList = list;
+        }
 			},
 		},
 

+ 5 - 5
pages/emergencyEvacuationBig.vue

@@ -773,16 +773,16 @@ export default {
       } = await GetStartList(obj)
       if (data.code == 200) {
         let list = [];
-       for(let i=0;i<data.data.data.length;i++){
+       for(let i=0;i<data.data.length;i++){
           let text = uni.getStorageSync('cameraUrl');
-           let url = data.data.data[i].hls;
+           let url = data.data[i].hls;
           url = url.split("rtp/");
           let newUrl = text + 'rtp/' + url[1];
           let obj = {
             name: "楼道监控" + (i + 1),
-            id:data.data.data[i].deviceID,
+            id:data.data[i].deviceID,
             url: newUrl,
-			videoContext:wx.createVideoContext(data.data.data[i].deviceID)
+			videoContext:wx.createVideoContext(data.data[i].deviceID)
           }
           list.push(obj)
         }
@@ -1364,7 +1364,7 @@ export default {
             console.log('疏散通知', data)
 			let pages = getCurrentPages();
 			let currPage = pages[pages.length - 1]
-			
+
 			console.log('pages',pages)
 			// let currPage = pages[pages.length - 1] //当前页面
 			// let prePage = pages[pages.length - 2] //上一个页面

+ 3 - 3
pages_manage/workbench/laboratory/monitor.vue

@@ -365,13 +365,13 @@ export default {
       const {data} = await GetStartList(obj);
       if(data.code == 200){
         let list = [];
-        for(let i=0;i<data.data.data.length;i++){
+        for(let i=0;i<data.data.length;i++){
           let text = uni.getStorageSync('cameraUrl');
-          let url = data.data.data[i].hls;
+          let url = data.data[i].hls;
           url = url.split("rtp/");
           let newUrl = text+'rtp/'+url[1];
           let obj = {
-            id:data.data.data[i].deviceID,
+            id:data.data[i].deviceID,
             url:newUrl,
           }
           list.push(obj)