dedsudiyu 2 年之前
父節點
當前提交
da5b486c14
共有 2 個文件被更改,包括 32 次插入18 次删除
  1. 8 0
      api/index.js
  2. 24 18
      pages_manage/workbench/laboratory/monitor.vue

+ 8 - 0
api/index.js

@@ -1223,6 +1223,14 @@ export const nanhuGetStartList  = (data) => {
     })
 };
 
+//获取实验室视频地址(暨南大学)
+export const jinanGetStartList  = (data) => {
+    return apiResquestFormVideo({
+        url: `/jinandaxue/api/play/startList/`,
+        method: 'GET',
+        data: data,
+    })
+};
 
 //扫码兑换调用
 export const exchangePoints  = (data) => {

+ 24 - 18
pages_manage/workbench/laboratory/monitor.vue

@@ -58,7 +58,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { getChannels,wenchangGetStartList,nanhuGetStartList ,getDeviceListBySub ,textParseUrlIps ,voice } from '@/api/index.js'
+import { getChannels,wenchangGetStartList,jinanGetStartList,nanhuGetStartList ,getDeviceListBySub ,textParseUrlIps ,voice } from '@/api/index.js'
 export default {
   data() {
     return {
@@ -94,11 +94,12 @@ export default {
     console.log(this.itemData)
     console.log(this.deptId)
 
-    if(this.deptId == 102){
-      this.wenchangGetStartList();
-    }else if(this.deptId == 113){
-      this.nanhuGetStartList();
-    }
+    // if(this.deptId == 102){
+    //   this.wenchangGetStartList();
+    // }else if(this.deptId == 113){
+    //   this.nanhuGetStartList();
+    // }
+	this.jinanGetStartList();
     this.getDeviceListBySub();
     // this.getChannels();
   },
@@ -344,18 +345,18 @@ export default {
         // console.log(data);
       }
     },
-    //查询摄像头地址(文昌)
-    async wenchangGetStartList(){
+    //查询摄像头地址(暨南大学)
+    async jinanGetStartList(){
       let obj = {
         page:'1',
         count:'2',
         deviceIds:this.itemData.hardwareNUM
       };
-      const {data} = await wenchangGetStartList(obj);
+      const {data} = await jinanGetStartList(obj);
       if(data.code == 200){
         let list = [];
         for(let i=0;i<data.data.length;i++){
-          let text = 'https://lab.sxitdlc.com/wenchang/stream/';
+          let text = 'https://lab.sxitdlc.com/jinandaxue/stream/';
           let url = data.data[i].result.body.data.fmp4;
           url = url.split("rtp/");
           let newUrl = text+'rtp/'+url[1];
@@ -369,18 +370,18 @@ export default {
         this.urlList = list;
       }
     },
-    //查询摄像头地址(南湖)
-    async nanhuGetStartList(){
+    //查询摄像头地址(文昌)
+    async wenchangGetStartList(){
       let obj = {
         page:'1',
         count:'2',
         deviceIds:this.itemData.hardwareNUM
       };
-      const {data} = await nanhuGetStartList(obj);
+      const {data} = await wenchangGetStartList(obj);
       if(data.code == 200){
         let list = [];
         for(let i=0;i<data.data.length;i++){
-          let text = 'https://lab.sxitdlc.com/nanhu/stream/';
+          let text = 'https://lab.sxitdlc.com/wenchang/stream/';
           let url = data.data[i].result.body.data.fmp4;
           url = url.split("rtp/");
           let newUrl = text+'rtp/'+url[1];
@@ -394,22 +395,27 @@ export default {
         this.urlList = list;
       }
     },
-    //查询摄像头地址
-    async getChannels(){
+    //查询摄像头地址(南湖)
+    async nanhuGetStartList(){
       let obj = {
         page:'1',
         count:'2',
         deviceIds:this.itemData.hardwareNUM
       };
-      const {data} = await getChannels(obj);
+      const {data} = await nanhuGetStartList(obj);
       if(data.code == 200){
         let list = [];
         for(let i=0;i<data.data.length;i++){
+          let text = 'https://lab.sxitdlc.com/nanhu/stream/';
+          let url = data.data[i].result.body.data.fmp4;
+          url = url.split("rtp/");
+          let newUrl = text+'rtp/'+url[1];
           let obj = {
             id:data.data[i].result.body.data.deviceID,
-            url:data.data[i].result.body.data.fmp4,
+            url:newUrl,
           }
           list.push(obj)
+          console.log("obj",obj)
         }
         this.urlList = list;
       }