XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

Browse Source 
# Conflicts:
#	sql/mysql.sql
This commit is contained in:
648540858
2022-10-19 10:04:04 +08:00
parent 5327a85739 7bfa85424a
commit c5b16e058d
6 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
web_src/src/components/CloudRecord.vue
View File

@@ -109,15 +109,26 @@
that.mediaServerList = data.data;
if (that.mediaServerList.length > 0) {
that.mediaServerId = that.mediaServerList[0].id
let port = that.mediaServerList[0].httpPort;
if (location.protocol === "https:" && that.mediaServerList[0].httpSSlPort) {
port = that.mediaServerList[0].httpSSlPort
}
that.mediaServerPath = location.protocol + "//" + that.mediaServerList[0].streamIp + ":" + port
that.setMediaServerPath(that.mediaServerId);
that.getRecordList();
}
})
},
setMediaServerPath: function (serverId) {
let that = this;
let i;
for (i = 0; i < that.mediaServerList.length; i++) {
if (serverId === that.mediaServerList[i].id) {
break;
}
}
let port = that.mediaServerList[i].httpPort;
if (location.protocol === "https:" && that.mediaServerList[i].httpSSlPort) {
port = that.mediaServerList[i].httpSSlPort
}
that.mediaServerPath = location.protocol + "//" + that.mediaServerList[i].streamIp + ":" + port
console.log(that.mediaServerPath)
},
getRecordList: function (){
let that = this;
this.$axios({
@@ -146,6 +157,7 @@
console.log(val)
this.total = 0;
this.recordList = [];
this.setMediaServerPath(val);
this.getRecordList();
},
showRecordDetail(row){