From 2f108a46d05e34981d52b447d73f0cfd8e8c30fd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 17 十一月 2021 16:24:31 +0800
Subject: [PATCH] Merge pull request #232 from chenparty/wvp-28181-2.0
---
web_src/src/components/PushVideoList.vue | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 3e155c2..9f1a7db 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,7 +31,7 @@
{{(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>
@@ -107,42 +109,43 @@
getPushList: function() {
let that = this;
this.getDeviceListLoading = true;
- this.$axios.get(`/api/push/list`,{
+ this.$axios({
+ method: 'get',
+ url:`/api/push/list`,
params: {
page: that.currentPage,
count: that.count
}
- } )
- .then(function (res) {
+ }).then(function (res) {
console.log(res);
console.log(res.data.list);
that.total = res.data.total;
that.pushList = res.data.list;
that.getDeviceListLoading = false;
- })
- .catch(function (error) {
+ }).catch(function (error) {
console.log(error);
that.getDeviceListLoading = false;
});
},
-
+
playPuhsh: function(row){
let that = this;
this.getListLoading = true;
- this.$axios.get(`/api/media/getStreamInfoByAppAndStream`,{
+ this.$axios({
+ method: 'get',
+ 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) {
+ }).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) {
+ }).catch(function (error) {
console.log(error);
that.getListLoading = false;
});
@@ -151,21 +154,21 @@
console.log(row)
},
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.post(`/api/push/remove_form_gb`, row)
- .then(function (res) {
- console.log(res);
- console.log(res.data == "success");
- if (res.data == "success") {
+ that.$axios({
+ 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