|
@@ -258,7 +258,7 @@
|
|
|
import mqtt from 'mqtt'
|
|
|
import flvjs from 'flv.js'
|
|
|
import { hardWareControl,alarmControl } from "@/api/laboratory/hardware";
|
|
|
- import { authListSubject,subjectInfo,updateSubject,mangerVoice,startUrl,startUrlNH,startUrlWC } from "@/api/laboratory/subject";
|
|
|
+ import { authListSubject,subjectInfo,updateSubject,mangerVoice,startUrl,startUrlJiNanDaXue } from "@/api/laboratory/subject";
|
|
|
import { listDepartments } from "@/api/system/dept";
|
|
|
import addSubject from "./addSubject.vue";
|
|
|
import deviceList from "./deviceList.vue";
|
|
@@ -547,68 +547,32 @@
|
|
|
}
|
|
|
});
|
|
|
}else{
|
|
|
- if(response.data.deptId == 102){
|
|
|
- startUrlWC(obj).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
- if(!res.data[0]){
|
|
|
- this.msgError("视频配置异常请联系管理员")
|
|
|
- this.newData.videoData = [];
|
|
|
- this.pageType = 6;
|
|
|
- }else{
|
|
|
- let videoList = [];
|
|
|
- for(let i=0;i<res.data.length;i++){
|
|
|
- // let text = window.location.href.split('://')[0]+'://' + 'lab.sxitdlc.com/wenchang/stream/';
|
|
|
- // let url = res.data[i].result.body.data.flv;
|
|
|
- let text = 'ws://lab.sxitdlc.com/wenchang/stream/';
|
|
|
- let url = res.data[i].result.body.data.ws_flv;
|
|
|
- url = url.split("rtp/");
|
|
|
- let newUrl = text+'rtp/'+url[1];
|
|
|
- let obj = {
|
|
|
- name:response.data.name + response.data.subAddrr.room,
|
|
|
- videoType:"flv",
|
|
|
- divId:'divId'+i,
|
|
|
- url:newUrl,
|
|
|
- }
|
|
|
- videoList.push(obj)
|
|
|
- }
|
|
|
- this.$set(this.newData,'videoData',videoList);
|
|
|
- this.pageType = 6;
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- }else if(response.data.deptId == 113){
|
|
|
- startUrlNH(obj).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
- if(!res.data[0]){
|
|
|
- this.msgError("视频配置异常请联系管理员")
|
|
|
- this.newData.videoData = [];
|
|
|
- this.pageType = 6;
|
|
|
- }else{
|
|
|
- let videoList = [];
|
|
|
- for(let i=0;i<res.data.length;i++){
|
|
|
- // let text = window.location.href.split('://')[0]+'://' + 'lab.sxitdlc.com/nanhu/stream/';
|
|
|
- // let url = res.data[i].result.body.data.flv;
|
|
|
- let text = 'ws://lab.sxitdlc.com/nanhu/stream/';
|
|
|
- let url = res.data[i].result.body.data.ws_flv;
|
|
|
- url = url.split("rtp/");
|
|
|
- let newUrl = text+'rtp/'+url[1];
|
|
|
- let obj = {
|
|
|
- name:response.data.name + response.data.subAddrr.room,
|
|
|
- videoType:"flv",
|
|
|
- divId:'divId'+i,
|
|
|
- url:newUrl,
|
|
|
- }
|
|
|
- videoList.push(obj)
|
|
|
+ startUrlJiNanDaXue(obj).then(res => {
|
|
|
+ if(res.code == 200){
|
|
|
+ if(!res.data[0]){
|
|
|
+ this.msgError("视频配置异常请联系管理员")
|
|
|
+ this.newData.videoData = [];
|
|
|
+ this.pageType = 6;
|
|
|
+ }else{
|
|
|
+ let videoList = [];
|
|
|
+ for(let i=0;i<res.data.length;i++){
|
|
|
+ let text = 'ws://lab.sxitdlc.com/jinandaxue/stream/';
|
|
|
+ let url = res.data[i].result.body.data.ws_flv;
|
|
|
+ url = url.split("rtp/");
|
|
|
+ let newUrl = text+'rtp/'+url[1];
|
|
|
+ let obj = {
|
|
|
+ name:response.data.name + response.data.subAddrr.room,
|
|
|
+ videoType:"flv",
|
|
|
+ divId:'divId'+i,
|
|
|
+ url:newUrl,
|
|
|
}
|
|
|
- this.$set(this.newData,'videoData',videoList);
|
|
|
- this.pageType = 6;
|
|
|
+ videoList.push(obj)
|
|
|
}
|
|
|
+ this.$set(this.newData,'videoData',videoList);
|
|
|
+ this.pageType = 6;
|
|
|
}
|
|
|
- });
|
|
|
- }else{
|
|
|
- this.$set(this.newData,'videoData',[]);
|
|
|
- this.pageType = 6;
|
|
|
- }
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -692,69 +656,34 @@
|
|
|
}
|
|
|
});
|
|
|
}else{
|
|
|
- if(this.checkedSubject.deptId == 102){
|
|
|
- startUrlWC(obj).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
- if(!res.data[0]){
|
|
|
- this.msgError("视频配置异常请联系管理员")
|
|
|
- return
|
|
|
- }
|
|
|
- let videoList = [];
|
|
|
- for(let i=0;i<res.data.length;i++){
|
|
|
- // let text = window.location.href.split('://')[0]+'://' + 'lab.sxitdlc.com/wenchang/stream/';
|
|
|
- // let url = res.data[i].result.body.data.flv;
|
|
|
- let text = 'ws://lab.sxitdlc.com/wenchang/stream/';
|
|
|
- let url = res.data[i].result.body.data.ws_flv;
|
|
|
- url = url.split("rtp/");
|
|
|
- let newUrl = text+'rtp/'+url[1];
|
|
|
- let obj = {
|
|
|
- name:self.checkedSubject.name + self.checkedSubject.subAddrr.room,
|
|
|
- videoType:"flv",
|
|
|
- divId:'divId'+i,
|
|
|
- url:newUrl,
|
|
|
- }
|
|
|
- videoList.push(obj)
|
|
|
- }
|
|
|
- this.$set(this.checkedSubject,'videoData',videoList);
|
|
|
- if(this.rightButtonType == 3){
|
|
|
- setTimeout(function(){
|
|
|
- self.videoFunction();
|
|
|
- },1000);
|
|
|
- }
|
|
|
+ startUrlJiNanDaXue(obj).then(res => {
|
|
|
+ if(res.code == 200){
|
|
|
+ if(!res.data[0]){
|
|
|
+ this.msgError("视频配置异常请联系管理员")
|
|
|
+ return
|
|
|
}
|
|
|
- });
|
|
|
- }else if(this.checkedSubject.deptId == 113){
|
|
|
- startUrlNH(obj).then(res => {
|
|
|
- if(res.code == 200){
|
|
|
- if(!res.data[0]){
|
|
|
- this.msgError("视频配置异常请联系管理员")
|
|
|
- return
|
|
|
- }
|
|
|
- let videoList = [];
|
|
|
- for(let i=0;i<res.data.length;i++){
|
|
|
- // let text = window.location.href.split('://')[0]+'://' + 'lab.sxitdlc.com/nanhu/stream/';
|
|
|
- // let url = res.data[i].result.body.data.flv;
|
|
|
- let text = 'ws://lab.sxitdlc.com/nanhu/stream/';
|
|
|
- let url = res.data[i].result.body.data.ws_flv;
|
|
|
- url = url.split("rtp/");
|
|
|
- let newUrl = text+'rtp/'+url[1];
|
|
|
- let obj = {
|
|
|
- name:self.checkedSubject.name + self.checkedSubject.subAddrr.room,
|
|
|
- videoType:"flv",
|
|
|
- divId:'divId'+i,
|
|
|
- url:newUrl,
|
|
|
- }
|
|
|
- videoList.push(obj)
|
|
|
- }
|
|
|
- this.$set(this.checkedSubject,'videoData',videoList);
|
|
|
- if(this.rightButtonType == 3){
|
|
|
- setTimeout(function(){
|
|
|
- self.videoFunction();
|
|
|
- },1000);
|
|
|
+ let videoList = [];
|
|
|
+ for(let i=0;i<res.data.length;i++){
|
|
|
+ let text = 'ws://lab.sxitdlc.com/jinandaxue/stream/';
|
|
|
+ let url = res.data[i].result.body.data.ws_flv;
|
|
|
+ url = url.split("rtp/");
|
|
|
+ let newUrl = text+'rtp/'+url[1];
|
|
|
+ let obj = {
|
|
|
+ name:self.checkedSubject.name + self.checkedSubject.subAddrr.room,
|
|
|
+ videoType:"flv",
|
|
|
+ divId:'divId'+i,
|
|
|
+ url:newUrl,
|
|
|
}
|
|
|
+ videoList.push(obj)
|
|
|
}
|
|
|
- });
|
|
|
- }
|
|
|
+ this.$set(this.checkedSubject,'videoData',videoList);
|
|
|
+ if(this.rightButtonType == 3){
|
|
|
+ setTimeout(function(){
|
|
|
+ self.videoFunction();
|
|
|
+ },1000);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
}else{
|
|
|
this.$set(this.checkedSubject,'videoData',[]);
|