From dc20ccfce84d46f86209309ea70ba81d0360e070 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 05 一月 2022 15:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/PushVideoList.vue | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index f40fe3c..6131d60 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -17,6 +17,8 @@
</el-table-column>
<el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="150" align="center">
</el-table-column>
+ <el-table-column prop="mediaServerId" label="娴佸獟浣�" width="150" align="center">
+ </el-table-column>
<el-table-column label="寮�濮嬫椂闂�" align="center" >
<template slot-scope="scope">
<el-button-group>
@@ -29,12 +31,12 @@
{{(scope.row.status == false && scope.row.gbId == null) || scope.row.status ?'鏄�':'鍚�'}}
</template>
</el-table-column>
-
+
<el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
<template slot-scope="scope">
<el-button-group>
- <el-button size="mini" icon="el-icon-video-play" @click="playPuhsh(scope.row)">鎾斁</el-button>
- <el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="!!scope.row.streamId" @click="stopPuhsh(scope.row)">鍋滄</el-button>
+ <el-button size="mini" icon="el-icon-video-play" v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status" @click="playPuhsh(scope.row)">鎾斁</el-button>
+ <el-button size="mini" icon="el-icon-switch-button" type="danger" @click="stopPuhsh(scope.row)">绉婚櫎</el-button>
<el-button size="mini" icon="el-icon-position" type="primary" v-if="!!!scope.row.gbId" @click="addToGB(scope.row)">鍔犲叆鍥芥爣</el-button>
<el-button size="mini" icon="el-icon-position" type="primary" v-if="!!scope.row.gbId" @click="removeFromGB(scope.row)">绉诲嚭鍥芥爣</el-button>
</el-button-group>
@@ -125,21 +127,22 @@
that.getDeviceListLoading = false;
});
},
-
+
playPuhsh: function(row){
let that = this;
this.getListLoading = true;
this.$axios({
method: 'get',
- url:`/api/media/stream_info_by_app_and_stream`,
+ url: '/api/media/stream_info_by_app_and_stream',
params: {
app: row.app,
- stream: row.stream
+ stream: row.stream,
+ mediaServerId: row.mediaServerId
}
}).then(function (res) {
that.getListLoading = false;
that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
- streamInfo: res.data,
+ streamInfo: res.data.data,
hasAudio: true
});
}).catch(function (error) {
@@ -148,24 +151,38 @@
});
},
stopPuhsh: function(row){
- console.log(row)
+ var that = this;
+ that.$axios({
+ method:"post",
+ url:"/api/push/stop",
+ params: {
+ app: row.app,
+ streamId: row.stream
+ }
+ }).then((res)=>{
+ if (res.data == "success") {
+ that.initData()
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
},
addToGB: function(row){
- this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream}, this.initData);
+ this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
},
removeFromGB: function(row){
var that = this;
that.$axios({
- method:"delete",
- url:"/api/push/remove_form_gb",
- data:row
- }).then((res)=>{
- if (res.data == "success") {
+ method:"delete",
+ url:"/api/push/remove_form_gb",
+ data:row
+ }).then((res)=>{
+ if (res.data == "success") {
that.initData()
}
- }).catch(function (error) {
- console.log(error);
- });
+ }).catch(function (error) {
+ console.log(error);
+ });
},
dateFormat: function(/** timestamp=0 **/) {
var ts = arguments[0] || 0;
--
Gitblit v1.8.0