heyang

api/index.js

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

api/request/config.js

@@ -1,5 +1,5 @@
 const config = {
-	base_url: 'http://192.168.1.9:8080',//柴
+	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//周攀
     // base_url: 'http://192.168.1.8:8080',//高升
@@ -12,7 +12,7 @@ const config = {
     //base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
 	//base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
-    // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
+     base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
       // base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址
 
 	//视频地址
@@ -23,8 +23,8 @@ const config = {
 	// mqtt_url: 'lab.sxitdlc.com/nhmqtt', //矿大MQTT
 	// mqtt_url: 'lab.sxitdlc.com/jdmqtt', //交大MQTT
 	//mqtt_url:'ws://192.168.1.43:1884',
-	// mqtt_url: 'lab.sxitdlc.com/jndxmqtt', //暨大MQTT
-	 mqtt_url: 'lab.sxitdlc.com/kdwcmqtt',  //矿大文昌MQTT
+	 mqtt_url: 'lab.sxitdlc.com/jndxmqtt', //暨大MQTT
+	// mqtt_url: 'lab.sxitdlc.com/kdwcmqtt',  //矿大文昌MQTT
     username: 'mqtt',
     password: 'mqtt@zd1883',
 }

pages_manage/workbench/laboratory/monitor.vue

@@ -7,7 +7,7 @@
       <video
           v-for="(item,index) in urlList" :key="index" :id="urlList.id" :src="item.url"
           :poster="videoCover"
-          :custom-cache='false' :autoplay="true" :controls="true"
+          :custom-cache="false" :autoplay="true" :controls="true"
           :enable-danmu="false" :muted="true" :show-fullscreen-btn="true"
           :show-center-play-btn="false" :show-play-btn="false"
           @error="videoErrorCallback" >
@@ -58,11 +58,11 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { getChannels,wenchangGetStartList,jinanGetStartList,nanhuGetStartList ,getDeviceListBySub ,textParseUrlIps ,voice } from '@/api/index.js'
+import { getChannels,wenchangGetStartList,nanhuGetStartList ,jndxGetStartList,getDeviceListBySub ,textParseUrlIps ,voice } from '@/api/index.js'
 export default {
   data() {
     return {
-	  videoCover:uni.getStorageSync('videoCover'),
+      videoCover:uni.getStorageSync('videoCover'),
       itemData:{},
       urlList:[],
       deptId:"",
@@ -78,8 +78,8 @@ export default {
           value:"2"
         },
       ],
-
       current:1,
+      text:"",
       trumpetList:[],
       //滑动记录
       startPoint:{},
@@ -95,12 +95,7 @@ export default {
     console.log(this.itemData)
     console.log(this.deptId)
 
-    // if(this.deptId == 102){
-    //   this.wenchangGetStartList();
-    // }else if(this.deptId == 113){
-    //   this.nanhuGetStartList();
-    // }
-	this.GetVideoList();
+    this.jndxGetStartList();//暨南大学调用摄像头列表
     this.getDeviceListBySub();
     // this.getChannels();
   },
@@ -142,7 +137,6 @@ export default {
     async voice(){
       let obj = {
         txt:this.text,
-
         type:'1'
       };
       const {data} = await voice(this.itemData.id,obj);
@@ -305,7 +299,7 @@ export default {
           let obj = {
             sn:self.trumpetList[i].deviceSn,
             port:self.trumpetList[i].port,
-			      deviceIp:self.trumpetList[i].deviceIp,
+            deviceIp:self.trumpetList[i].deviceIp,
             type:"",
             name:"",
             speed:"",
@@ -334,7 +328,7 @@ export default {
     //获取喇叭列表
     async getDeviceListBySub(){
       let obj = {
-        floorId:5,
+        floorId:this.itemData.floorId,
         subId:this.itemData.id,
         page:1,
         pageSize:100
@@ -348,18 +342,19 @@ export default {
         // console.log(data);
       }
     },
-    //查询摄像头地址(矿大文昌大学)
-    async GetVideoList(){
+
+    //查询摄像头地址(暨南大学)
+    async jndxGetStartList(){
       let obj = {
         page:'1',
         count:'2',
         deviceIds:this.itemData.hardwareNUM
       };
-      const {data} = await wenchangGetStartList(obj);
+      const {data} = await jndxGetStartList(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.hls;
           url = url.split("rtp/");
           let newUrl = text+'rtp/'+url[1];
@@ -373,8 +368,27 @@ export default {
         this.urlList = list;
       }
     },
-
-	videoErrorCallback(e){
+    //查询摄像头地址
+    async getChannels(){
+      let obj = {
+        page:'1',
+        count:'2',
+        deviceIds:this.itemData.hardwareNUM
+      };
+      const {data} = await getChannels(obj);
+      if(data.code == 200){
+        let list = [];
+        for(let i=0;i<data.data.length;i++){
+          let obj = {
+            id:data.data[i].result.body.data.deviceID,
+            url:data.data[i].result.body.data.fmp4,
+          }
+          list.push(obj)
+        }
+        this.urlList = list;
+      }
+    },
+    videoErrorCallback(e){
       console.log("播放失败",e);
       // uni.showToast({
       //     title: '视频播放失败',
@@ -469,7 +483,7 @@ export default {
         margin-top :22rpx;
         .trumpet-for-box{
           display:inline-block !important;
-          width:204rpx;
+          width:200rpx;
           height:60rpx;
           line-height:60rpx;
           font-size:24rpx;