From d340a37a00c8d5ea2605ca0f40a920efbeb9546f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 11:31:30 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
---
web_src/src/components/dialog/devicePlayer.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index a5e46aa..e640d6f 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -121,6 +121,10 @@
<el-tag >RTC:</el-tag>
<span>{{ streamInfo.rtc.url }}</span>
</el-dropdown-item>
+ <el-dropdown-item :command="streamInfo.rtcs.url">
+ <el-tag >RTCS:</el-tag>
+ <span>{{ streamInfo.rtcs }}</span>
+ </el-dropdown-item>
<el-dropdown-item :command="streamInfo.rtmp.url">
<el-tag >RTMP:</el-tag>
<span>{{ streamInfo.rtmp.url }}</span>
@@ -322,7 +326,7 @@
player: {
jessibuca : ["ws_flv", "wss_flv"],
livePlayer : ["ws_flv", "wss_flv"],
- webRTC: ["rtc", "rtc"],
+ webRTC: ["rtc", "rtcs"],
},
videoHistory: {
date: '',
@@ -393,7 +397,7 @@
changePlayer: function (tab) {
console.log(this.player[tab.name][0])
this.activePlayer = tab.name;
- this.videoUrl = this.streamInfo[this.player[tab.name][0]].url
+ this.videoUrl = this.getUrlByStreamInfo()
console.log(this.videoUrl)
},
openDialog: function (tab, deviceId, channelId, param) {
--
Gitblit v1.8.0