From 26bdf2e7768ee5dfc400c3970a5aa129fed49453 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 15:31:43 +0800
Subject: [PATCH] Merge branch '级联' into main-dev
---
web_src/src/components/dialog/devicePlayer.vue | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 1987348..61cf066 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -299,6 +299,10 @@
</el-tab-pane>
<el-tab-pane label="璇煶瀵硅" name="broadcast">
+ <div style="padding: 0 10px">
+ <el-switch v-model="broadcastMode" :disabled="broadcastStatus !== -1" active-color="#409EFF" active-text="鍠婅瘽"
+ inactive-text="瀵硅"></el-switch>
+ </div>
<div class="trank" style="text-align: center;">
<el-button @click="broadcastStatusClick()" :type="getBroadcastStatus()" :disabled="broadcastStatus === -2"
circle icon="el-icon-microphone" style="font-size: 32px; padding: 24px;margin-top: 24px;"/>
@@ -390,6 +394,7 @@
recordStartTime: 0,
showTimeText: "00:00:00",
streamInfo: null,
+ broadcastMode: true,
broadcastRtc: null,
broadcastStatus: -1, // -2 姝ｅ湪閲婃斁璧勬簮 -1 榛樿鐘舵�� 0 绛夊緟鎺ラ�� 1 鎺ラ�氭垚鍔�
};
@@ -640,23 +645,23 @@
return "danger"
}
- },
- broadcastStatusClick() {
- if (this.broadcastStatus == -1) {
- // 榛樿鐘舵�侊紝 寮�濮�
- this.broadcastStatus = 0
- // 鍙戣捣璇煶鍠婅瘽
- this.$axios({
- method: 'get',
- url: '/api/play/broadcast/' + this.deviceId + '/' + this.channelId + "?timeout=30"
- }).then( (res)=> {
- if (res.data.code == 0) {
- let streamInfo = res.data.data.streamInfo;
- if (document.location.protocol.includes("https")) {
- this.startBroadcast(streamInfo.rtcs.url)
- }else {
- this.startBroadcast(streamInfo.rtc.url)
- }
+ },
+ broadcastStatusClick() {
+ if (this.broadcastStatus == -1) {
+ // 榛樿鐘舵�侊紝 寮�濮�
+ this.broadcastStatus = 0
+ // 鍙戣捣璇煶瀵硅
+ this.$axios({
+ method: 'get',
+ url: '/api/play/broadcast/' + this.deviceId + '/' + this.channelId + "?timeout=30&broadcastMode=" + this.broadcastMode
+ }).then( (res)=> {
+ if (res.data.code == 0) {
+ let streamInfo = res.data.data.streamInfo;
+ if (document.location.protocol.includes("https")) {
+ this.startBroadcast(streamInfo.rtcs)
+ }else {
+ this.startBroadcast(streamInfo.rtc)
+ }
}else {
this.$message({
--
Gitblit v1.8.0