增加推流转发到国标，尚不完善
This commit is contained in:
panlinlin
@@ -1,283 +0,0 @@
|
||||
<template>
|
||||
<div id="pLatformStreamList">
|
||||
<el-container>
|
||||
<el-header>
|
||||
<uiHeader></uiHeader>
|
||||
</el-header>
|
||||
<el-main>
|
||||
<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>
|
||||
<el-table :data="streamProxyList" border style="width: 100%" :height="winHeight">
|
||||
<el-table-column prop="app" label="应用名" align="center" show-overflow-tooltip/>
|
||||
<el-table-column prop="stream" label="流ID" align="center" show-overflow-tooltip/>
|
||||
<el-table-column prop="gbId" label="国标平台" align="center" show-overflow-tooltip/>
|
||||
|
||||
<el-table-column label="转HLS" width="120" align="center">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<el-tag size="medium" v-if="scope.row.enable_hls">已启用</el-tag>
|
||||
<el-tag size="medium" type="info" v-if="!scope.row.enable_hls">未启用</el-tag>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="MP4录制" width="120" align="center">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<el-tag size="medium" v-if="scope.row.enable_mp4">已启用</el-tag>
|
||||
<el-tag size="medium" type="info" v-if="!scope.row.enable_mp4">未启用</el-tag>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="启用" width="120" align="center">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
<el-tag size="medium" v-if="scope.row.enable">已启用</el-tag>
|
||||
<el-tag size="medium" type="info" v-if="!scope.row.enable">未启用</el-tag>
|
||||
</div>
|
||||
</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" v-if="scope.row.enable" @click="play(scope.row)">播放</el-button>
|
||||
<el-button size="mini" icon="el-icon-close" type="success" v-if="scope.row.enable" @click="stop(scope.row)">停用</el-button>
|
||||
<el-button size="mini" icon="el-icon-check" type="primary" v-if="!scope.row.enable" @click="start(scope.row)">启用</el-button>
|
||||
<el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteStreamProxy(scope.row)">删除</el-button>
|
||||
<!-- <el-button size="mini" icon="el-icon-position" type="primary" >加入国标</el-button> -->
|
||||
</el-button-group>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
style="float: right"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="currentChange"
|
||||
:current-page="currentPage"
|
||||
:page-size="count"
|
||||
:page-sizes="[15, 25, 35, 50]"
|
||||
layout="total, sizes, prev, pager, next"
|
||||
:total="total">
|
||||
</el-pagination>
|
||||
<streamProxyEdit ref="streamProxyEdit" ></streamProxyEdit>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import streamProxyEdit from './dialog/StreamProxyEdit.vue'
|
||||
import devicePlayer from './dialog/devicePlayer.vue'
|
||||
import uiHeader from './UiHeader.vue'
|
||||
export default {
|
||||
name: 'pLatformStreamList',
|
||||
components: {
|
||||
devicePlayer,
|
||||
streamProxyEdit,
|
||||
uiHeader
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
streamProxyList: [],
|
||||
currentPusher: {}, //当前操作设备对象
|
||||
updateLooper: 0, //数据刷新轮训标志
|
||||
currentDeviceChannelsLenth:0,
|
||||
winHeight: window.innerHeight - 200,
|
||||
currentPage:1,
|
||||
count:15,
|
||||
total:0,
|
||||
getListLoading: false
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
},
|
||||
mounted() {
|
||||
this.initData();
|
||||
// this.updateLooper = setInterval(this.initData, 10000);
|
||||
},
|
||||
destroyed() {
|
||||
this.$destroy('videojs');
|
||||
clearTimeout(this.updateLooper);
|
||||
},
|
||||
methods: {
|
||||
initData: function() {
|
||||
this.getStreamProxyList();
|
||||
},
|
||||
currentChange: function(val){
|
||||
this.currentPage = val;
|
||||
this.getStreamProxyList();
|
||||
},
|
||||
handleSizeChange: function(val){
|
||||
this.count = val;
|
||||
this.getStreamProxyList();
|
||||
},
|
||||
getStreamProxyList: function() {
|
||||
let that = this;
|
||||
this.getListLoading = true;
|
||||
this.$axios.get(`/api/proxy/list`,{
|
||||
params: {
|
||||
page: that.currentPage,
|
||||
count: that.count
|
||||
}
|
||||
} )
|
||||
.then(function (res) {
|
||||
console.log(res);
|
||||
console.log(res.data.list);
|
||||
that.total = res.data.total;
|
||||
that.streamProxyList = res.data.list;
|
||||
that.getListLoading = false;
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
that.getListLoading = false;
|
||||
});
|
||||
},
|
||||
addStreamProxy: function(){
|
||||
this.$refs.streamProxyEdit.openDialog(null, this.initData)
|
||||
},
|
||||
saveStreamProxy: function(){
|
||||
},
|
||||
play: function(row){
|
||||
let that = this;
|
||||
this.getListLoading = true;
|
||||
this.$axios.get(`/api/media/getStreamInfoByAppAndStream`,{
|
||||
params: {
|
||||
app: row.app,
|
||||
stream: row.stream
|
||||
}
|
||||
})
|
||||
.then(function (res) {
|
||||
that.getListLoading = false;
|
||||
that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
|
||||
streamInfo: res.data,
|
||||
hasAudio: true
|
||||
});
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
that.getListLoading = false;
|
||||
});
|
||||
|
||||
},
|
||||
deleteStreamProxy: function(row){
|
||||
console.log(1111)
|
||||
let that = this;
|
||||
this.getListLoading = true;
|
||||
this.$axios.get(`/api/proxy/del`,{
|
||||
params: {
|
||||
app: row.app,
|
||||
stream: row.stream
|
||||
}
|
||||
})
|
||||
.then(function (res) {
|
||||
that.getListLoading = false;
|
||||
that.initData()
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
that.getListLoading = false;
|
||||
});
|
||||
},
|
||||
start: function(row){
|
||||
let that = this;
|
||||
this.getListLoading = true;
|
||||
this.$axios.get(`/api/proxy/start`,{
|
||||
params: {
|
||||
app: row.app,
|
||||
stream: row.stream
|
||||
}
|
||||
})
|
||||
.then(function (res) {
|
||||
that.getListLoading = false;
|
||||
that.initData()
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
that.getListLoading = false;
|
||||
});
|
||||
},
|
||||
stop: function(row){
|
||||
let that = this;
|
||||
this.getListLoading = true;
|
||||
this.$axios.get(`/api/proxy/stop`,{
|
||||
params: {
|
||||
app: row.app,
|
||||
stream: row.stream
|
||||
}
|
||||
})
|
||||
.then(function (res) {
|
||||
that.getListLoading = false;
|
||||
that.initData()
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
that.getListLoading = false;
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.videoList {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-content: flex-start;
|
||||
}
|
||||
|
||||
.video-item {
|
||||
position: relative;
|
||||
width: 15rem;
|
||||
height: 10rem;
|
||||
margin-right: 1rem;
|
||||
background-color: #000000;
|
||||
}
|
||||
|
||||
.video-item-img {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
margin: auto;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.video-item-img:after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
z-index: 2;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
margin: auto;
|
||||
width: 3rem;
|
||||
height: 3rem;
|
||||
background-image: url("../assets/loading.png");
|
||||
background-size: cover;
|
||||
background-color: #000000;
|
||||
}
|
||||
|
||||
.video-item-title {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
color: #000000;
|
||||
background-color: #ffffff;
|
||||
line-height: 1.5rem;
|
||||
padding: 0.3rem;
|
||||
width: 14.4rem;
|
||||
}
|
||||
.cpoy-btn {
|
||||
cursor: pointer;
|
||||
margin-right: 10px;
|
||||
}
|
||||
</style>
|
||||
@@ -8,10 +8,8 @@
|
||||
<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>
|
||||
@@ -19,6 +17,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="totalReaderCount" label="在线人数" width="240" align="center">
|
||||
</el-table-column>
|
||||
<el-table-column prop="gbId" label="国标编码" width="150" align="center">
|
||||
</el-table-column>
|
||||
<el-table-column label="开始时间" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<el-button-group>
|
||||
@@ -26,12 +26,19 @@
|
||||
</el-button-group>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="正在推流" align="center" >
|
||||
<template slot-scope="scope">
|
||||
{{!!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,7 +109,7 @@
|
||||
getPushList: function() {
|
||||
let that = this;
|
||||
this.getDeviceListLoading = true;
|
||||
this.$axios.get(`/api/media/list`,{
|
||||
this.$axios.get(`/api/push/list`,{
|
||||
params: {
|
||||
page: that.currentPage,
|
||||
count: that.count
|
||||
@@ -119,12 +127,7 @@
|
||||
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;
|
||||
@@ -149,6 +152,23 @@
|
||||
stopPuhsh: function(row){
|
||||
console.log(row)
|
||||
},
|
||||
addToGB: function(row){
|
||||
this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream}, this.initData);
|
||||
},
|
||||
removeFromGB: function(row){
|
||||
var that = this;
|
||||
that.$axios.post(`/api/push/removeFormGB`, row)
|
||||
.then(function (res) {
|
||||
console.log(res);
|
||||
console.log(res.data == "success");
|
||||
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;
|
||||
|
||||
@@ -64,7 +64,6 @@
|
||||
<el-button size="mini" icon="el-icon-close" type="success" v-if="scope.row.enable" @click="stop(scope.row)">停用</el-button>
|
||||
<el-button size="mini" icon="el-icon-check" type="primary" v-if="!scope.row.enable" @click="start(scope.row)">启用</el-button>
|
||||
<el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteStreamProxy(scope.row)">删除</el-button>
|
||||
<!-- <el-button size="mini" icon="el-icon-position" type="primary" >加入国标</el-button> -->
|
||||
</el-button-group>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
138
web_src/src/components/dialog/addStreamTOGB.vue
Normal file
138
web_src/src/components/dialog/addStreamTOGB.vue
Normal file
@@ -0,0 +1,138 @@
|
||||
<template>
|
||||
<div id="addStreamProxy" v-loading="isLoging">
|
||||
<el-dialog
|
||||
title=" 加入"
|
||||
width="40%"
|
||||
top="2rem"
|
||||
:close-on-click-modal="false"
|
||||
:visible.sync="showDialog"
|
||||
:destroy-on-close="true"
|
||||
@close="close()"
|
||||
>
|
||||
<div id="shared" style="margin-top: 1rem;margin-right: 100px;">
|
||||
<el-form ref="streamProxy" :rules="rules" :model="proxyParam" label-width="140px">
|
||||
<el-form-item label="名称" prop="name">
|
||||
<el-input v-model="proxyParam.name" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="流应用名" prop="app">
|
||||
<el-input v-model="proxyParam.app" clearable :disabled="true"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="流ID" prop="stream">
|
||||
<el-input v-model="proxyParam.stream" clearable :disabled="true"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="国标编码" prop="gbId">
|
||||
<el-input v-model="proxyParam.gbId" placeholder="设置国标编码可推送到国标" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<div style="float: right;">
|
||||
<el-button type="primary" @click="onSubmit">保存</el-button>
|
||||
<el-button @click="close">取消</el-button>
|
||||
</div>
|
||||
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "streamProxyEdit",
|
||||
props: {},
|
||||
computed: {},
|
||||
created() {},
|
||||
data() {
|
||||
// var deviceGBIdRules = async (rule, value, callback) => {
|
||||
// console.log(value);
|
||||
// if (value === "") {
|
||||
// callback(new Error("请输入设备国标编号"));
|
||||
// } else {
|
||||
// var exit = await this.deviceGBIdExit(value);
|
||||
// console.log(exit);
|
||||
// console.log(exit == "true");
|
||||
// console.log(exit === "true");
|
||||
// if (exit) {
|
||||
// callback(new Error("设备国标编号已存在"));
|
||||
// } else {
|
||||
// callback();
|
||||
// }
|
||||
// }
|
||||
// };
|
||||
return {
|
||||
listChangeCallback: null,
|
||||
showDialog: false,
|
||||
isLoging: false,
|
||||
proxyParam: {
|
||||
name: null,
|
||||
app: null,
|
||||
stream: null,
|
||||
gbId: null,
|
||||
},
|
||||
|
||||
rules: {
|
||||
name: [{ required: true, message: "请输入名称", trigger: "blur" }],
|
||||
app: [{ required: true, message: "请输入应用名", trigger: "blur" }],
|
||||
stream: [{ required: true, message: "请输入流ID", trigger: "blur" }],
|
||||
gbId: [{ required: true, message: "请输入国标编码", trigger: "blur" }],
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
openDialog: function (proxyParam, callback) {
|
||||
this.showDialog = true;
|
||||
this.listChangeCallback = callback;
|
||||
if (proxyParam != null) {
|
||||
this.proxyParam = proxyParam;
|
||||
}
|
||||
},
|
||||
onSubmit: function () {
|
||||
console.log("onSubmit");
|
||||
var that = this;
|
||||
that.$axios
|
||||
.post(`/api/push/saveToGB`, that.proxyParam)
|
||||
.then(function (res) {
|
||||
console.log(res);
|
||||
console.log(res.data == "success");
|
||||
if (res.data == "success") {
|
||||
that.$message({
|
||||
showClose: true,
|
||||
message: "保存成功",
|
||||
type: "success",
|
||||
});
|
||||
that.showDialog = false;
|
||||
if (that.listChangeCallback != null) {
|
||||
that.listChangeCallback();
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
});
|
||||
},
|
||||
close: function () {
|
||||
console.log("关闭加入GB");
|
||||
this.showDialog = false;
|
||||
this.$refs.streamProxy.resetFields();
|
||||
},
|
||||
deviceGBIdExit: async function (deviceGbId) {
|
||||
var result = false;
|
||||
var that = this;
|
||||
await that.$axios
|
||||
.post(`/api/platforms/exit/${deviceGbId}`)
|
||||
.then(function (res) {
|
||||
result = res.data;
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
});
|
||||
return result;
|
||||
},
|
||||
checkExpires: function() {
|
||||
if (this.platform.enable && this.platform.expires == "0") {
|
||||
this.platform.expires = "300";
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
@@ -10,8 +10,6 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="gbId" label="国标编码" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column prop="streamType" label="流来源" align="center" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column label="流来源" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<div slot="reference" class="name-wrapper">
|
||||
|
||||
Reference in New Issue
Block a user