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

Merge branch 'refs/heads/master' into 1078

Browse Source 
# Conflicts:
#	src/main/resources/application.yml
This commit is contained in:
panlinlin
2024-06-27 21:52:59 +08:00
parent a5b48e5b19 26e2e8b2a3
commit 03497c55f0
42 changed files with 330 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web_src/src/components/channelList.vue
View File

@@ -604,12 +604,13 @@ export default {
if (row.location) {
const segements = row.location.split(",");
if (segements.length !== 2) {
console.log(1)
this.$message.warning("位置信息格式有误，例：117.234,36.378");
return;
} else {
row.customLongitude = parseFloat(segements[0]);
row.custom_latitude = parseFloat(segements[1]);
if (!(row.longitude && row.latitude)) {
row.customLatitude = parseFloat(segements[1]);
if (!(row.customLongitude && row.customLatitude)) {
this.$message.warning("位置信息格式有误，例：117.234,36.378");
return;
}

8
web_src/src/components/dialog/devicePlayer.vue
View File

@@ -473,10 +473,14 @@ export default {
},
getUrlByStreamInfo() {
console.log(this.streamInfo)
let streamInfo = this.streamInfo
if (this.streamInfo.transcodeStream) {
streamInfo = this.streamInfo.transcodeStream;
}
if (location.protocol === "https:") {
this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
this.videoUrl = streamInfo[this.player[this.activePlayer][1]]
} else {
this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]]
this.videoUrl = streamInfo[this.player[this.activePlayer][0]]
}
return this.videoUrl;