From 8716ffd2f149a845ba322b784ab27e2a002fa8b8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 十一月 2021 17:33:45 +0800
Subject: [PATCH] Update issue templates
---
web_src/src/components/PushVideoList.vue | 71 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index bbfc5f8..9f1a7db 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -8,16 +8,16 @@
<div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;">
<span style="font-size: 1rem; font-weight: bold;">鎺ㄦ祦鍒楄〃</span>
</div>
- <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;font-size: 14px;">
- <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="addStreamProxy">娣诲姞浠ｇ悊</el-button>
- </div>
<devicePlayer ref="devicePlayer"></devicePlayer>
+ <addStreamTOGB ref="addStreamTOGB"></addStreamTOGB>
<el-table :data="pushList" border style="width: 100%" :height="winHeight">
<el-table-column prop="app" label="APP" width="180" align="center">
</el-table-column>
<el-table-column prop="stream" label="娴両D" width="240" align="center">
</el-table-column>
- <el-table-column prop="totalReaderCount" label="鍦ㄧ嚎浜烘暟" width="240" align="center">
+ <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">
@@ -26,12 +26,19 @@
</el-button-group>
</template>
</el-table-column>
-
+ <el-table-column label="姝ｅ湪鎺ㄦ祦" align="center" >
+ <template slot-scope="scope">
+ {{(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-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>
</template>
</el-table-column>
@@ -55,11 +62,13 @@
<script>
import streamProxyEdit from './dialog/StreamProxyEdit.vue'
import devicePlayer from './dialog/devicePlayer.vue'
+ import addStreamTOGB from './dialog/addStreamTOGB.vue'
import uiHeader from './UiHeader.vue'
export default {
name: 'pushVideoList',
components: {
devicePlayer,
+ addStreamTOGB,
streamProxyEdit,
uiHeader
},
@@ -80,10 +89,9 @@
},
mounted() {
this.initData();
- // this.updateLooper = setInterval(this.initData, 10000);
+ this.updateLooper = setInterval(this.initData, 2000);
},
destroyed() {
- this.$destroy('videojs');
clearTimeout(this.updateLooper);
},
methods: {
@@ -101,47 +109,43 @@
getPushList: function() {
let that = this;
this.getDeviceListLoading = true;
- this.$axios.get(`/api/media/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;
});
},
- addStreamProxy: function(){
- console.log(2222)
- this.$refs.streamProxyEdit.openDialog(null, this.initData)
- },
- saveStreamProxy: function(){
- },
+
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;
});
@@ -149,6 +153,23 @@
stopPuhsh: function(row){
console.log(row)
},
+ addToGB: function(row){
+ 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") {
+ that.initData()
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+ },
dateFormat: function(/** timestamp=0 **/) {
var ts = arguments[0] || 0;
var t,y,m,d,h,i,s;
--
Gitblit v1.8.0