From d21a00418e04cc773eaeeff3d220e5931023929a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 15 三月 2022 16:58:50 +0800
Subject: [PATCH] 修复推流关联平台的bug
---
web_src/src/components/PushVideoList.vue | 301 +++++++++++++++++++++++++++++++-------------------
1 files changed, 187 insertions(+), 114 deletions(-)
diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue
index 60a5c9e..4c803da 100644
--- a/web_src/src/components/PushVideoList.vue
+++ b/web_src/src/components/PushVideoList.vue
@@ -1,5 +1,5 @@
<template>
- <div id="app">
+ <div id="pushVideoList">
<el-container>
<el-header>
<uiHeader></uiHeader>
@@ -7,28 +7,66 @@
<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 style="position: absolute; right: 1rem; top: 0.3rem;">
- <el-button icon="el-icon-refresh-right" circle size="mini" :loading="getDeviceListLoading" @click="getDeviceList()"></el-button>
- </div>
</div>
- <!-- <devicePlayer ref="devicePlayer"></devicePlayer> -->
- <el-table :data="deviceList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="schema" label="鍗忚" width="180" align="center">
+ <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;font-size: 14px;">
+
+ 鎼滅储: <el-input @input="getPushList" style="margin-right: 1rem; width: auto;" size="mini" placeholder="鍏抽敭瀛�" prefix-icon="el-icon-search" v-model="searchSrt" clearable> </el-input>
+
+ 娴佸獟浣�: <el-select size="mini" @change="getPushList" style="margin-right: 1rem;" v-model="mediaServerId" placeholder="璇烽�夋嫨" default-first-option>
+ <el-option label="鍏ㄩ儴" value=""></el-option>
+ <el-option
+ v-for="item in mediaServerList"
+ :key="item.id"
+ :label="item.id"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ 鎺ㄦ祦鐘舵��: <el-select size="mini" style="margin-right: 1rem;" @change="getPushList" v-model="pushing" placeholder="璇烽�夋嫨" default-first-option>
+ <el-option label="鍏ㄩ儴" value=""></el-option>
+ <el-option label="鎺ㄦ祦杩涜涓�" value="true"></el-option>
+ <el-option label="鎺ㄦ祦鏈繘琛�" value="false"></el-option>
+ </el-select>
+ <el-button icon="el-icon-upload2" size="mini" style="margin-right: 1rem;" type="primary" @click="importChannel">閫氶亾瀵煎叆</el-button>
+ <el-button icon="el-icon-download" size="mini" style="margin-right: 1rem;" type="primary" >
+ <a style="color: #FFFFFF; text-align: center; text-decoration: none" href="/static/file/鎺ㄦ祦閫氶亾瀵煎叆.zip" download='鎺ㄦ祦閫氶亾瀵煎叆.zip' >涓嬭浇妯℃澘</a>
+ </el-button>
+ <el-button icon="el-icon-delete" size="mini" style="margin-right: 1rem;" :disabled="multipleSelection.length === 0" type="danger" @click="batchDel">鎵归噺绉婚櫎</el-button>
+ </div>
+ <devicePlayer ref="devicePlayer"></devicePlayer>
+ <addStreamTOGB ref="addStreamTOGB"></addStreamTOGB>
+ <el-table ref="pushListTable" :data="pushList" border style="width: 100%" :height="winHeight" @selection-change="handleSelectionChange" :row-key="(row)=> row.app + row.stream">
+ <el-table-column align="center" type="selection" :reserve-selection="true" width="55">
+ </el-table-column>
+ <el-table-column prop="name" label="鍚嶇О" align="center">
</el-table-column>
- <el-table-column prop="streamUrl" label="娴佸湴鍧�" width="240" align="center">
+ <el-table-column prop="app" label="APP" align="center">
</el-table-column>
- <el-table-column prop="online" label="鍦ㄧ嚎浜烘暟" width="240" align="center">
+ <el-table-column prop="stream" label="娴両D" align="center">
</el-table-column>
- <el-table-column prop="startTime" label="寮�濮嬫椂闂�" align="center">
+ <el-table-column prop="gbId" label="鍥芥爣缂栫爜" width="200" align="center">
</el-table-column>
-
+ <el-table-column prop="mediaServerId" label="娴佸獟浣�" width="200" align="center">
+ </el-table-column>
+ <el-table-column label="寮�濮嬫椂闂�" align="center" width="200">
+ <template slot-scope="scope">
+ <el-button-group>
+ {{dateFormat(parseInt(scope.row.createStamp))}}
+ </el-button-group>
+ </template>
+ </el-table-column>
+ <el-table-column label="姝ｅ湪鎺ㄦ祦" align="center" width="100">
+ <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 size="mini" :ref="scope.row.deviceId + 'refbtn' " icon="el-icon-refresh" @click="refDevice(scope.row)">鍒锋柊</el-button>
<el-button-group>
- <el-button size="mini" icon="el-icon-video-play" @click="sendDevicePush(scope.row)">鎾斁</el-button>
- <el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="!!scope.row.streamId" @click="stopDevicePush(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="playPush(scope.row)">鎾斁</el-button>
+ <el-button size="mini" icon="el-icon-delete" type="danger" @click="stopPush(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>
@@ -43,160 +81,195 @@
layout="total, sizes, prev, pager, next"
:total="total">
</el-pagination>
-
+ <streamProxyEdit ref="streamProxyEdit" ></streamProxyEdit>
+ <importChannel ref="importChannel" ></importChannel>
</el-main>
</el-container>
</div>
</template>
<script>
+ import streamProxyEdit from './dialog/StreamProxyEdit.vue'
+ import devicePlayer from './dialog/devicePlayer.vue'
+ import addStreamTOGB from './dialog/addStreamTOGB.vue'
import uiHeader from './UiHeader.vue'
+ import importChannel from './dialog/importChannel.vue'
+ import MediaServer from './service/MediaServer'
export default {
- name: 'app',
+ name: 'pushVideoList',
components: {
- uiHeader
+ devicePlayer,
+ addStreamTOGB,
+ streamProxyEdit,
+ uiHeader,
+ importChannel,
},
data() {
return {
- deviceList: [], //璁惧鍒楄〃
- currentDevice: {}, //褰撳墠鎿嶄綔璁惧瀵硅薄
-
- videoComponentList: [],
+ pushList: [], //璁惧鍒楄〃
+ currentPusher: {}, //褰撳墠鎿嶄綔璁惧瀵硅薄
updateLooper: 0, //鏁版嵁鍒锋柊杞鏍囧織
currentDeviceChannelsLenth:0,
- winHeight: window.innerHeight - 200,
+ winHeight: window.innerHeight - 250,
+ mediaServerObj : new MediaServer(),
currentPage:1,
count:15,
total:0,
+ searchSrt: "",
+ pushing: "",
+ mediaServerId: "",
+ mediaServerList: [],
+ multipleSelection: [],
getDeviceListLoading: false
};
},
computed: {
- getcurrentDeviceChannels: function() {
- let data = this.currentDevice['channelMap'];
- let channels = null;
- if (data) {
- channels = Object.keys(data).map(key => {
- return data[key];
- });
- this.currentDeviceChannelsLenth = channels.length;
- }
-
- console.log("鏁版嵁锛�" + JSON.stringify(channels));
- return channels;
- }
},
mounted() {
this.initData();
- this.updateLooper = setInterval(this.initData, 10000);
+ this.updateLooper = setInterval(this.getPushList, 2000);
},
destroyed() {
- this.$destroy('videojs');
clearTimeout(this.updateLooper);
},
methods: {
initData: function() {
- this.getDeviceList();
+ this.mediaServerObj.getOnlineMediaServerList((data)=>{
+ this.mediaServerList = data.data;
+ })
+ this.getPushList();
},
currentChange: function(val){
this.currentPage = val;
- this.getDeviceList();
+ this.getPushList();
},
handleSizeChange: function(val){
this.count = val;
- this.getDeviceList();
+ this.getPushList();
},
- getDeviceList: function() {
+ getPushList: function() {
let that = this;
this.getDeviceListLoading = true;
- this.$axios.get(`/api/devices`,{
+ this.$axios({
+ method: 'get',
+ url:`/api/push/list`,
params: {
page: that.currentPage,
- count: that.count
+ count: that.count,
+ query: that.searchSrt,
+ pushing: that.pushing,
+ mediaServerId: that.mediaServerId,
}
- } )
- .then(function (res) {
- console.log(res);
- console.log(res.data.list);
+ }).then(function (res) {
that.total = res.data.total;
- that.deviceList = res.data.list;
+ that.pushList = res.data.list;
that.getDeviceListLoading = false;
- })
- .catch(function (error) {
- console.log(error);
+ }).catch(function (error) {
+ console.error(error);
that.getDeviceListLoading = false;
});
-
- },
- showChannelList: function(row) {
- console.log(JSON.stringify(row))
- this.$router.push(`/channelList/${row.deviceId}/0/15/1`);
- },
- showDevicePosition: function(row) {
- console.log(JSON.stringify(row))
- this.$router.push(`/devicePosition/${row.deviceId}/0/15/1`);
},
- //gb28181骞冲彴瀵规帴
- //鍒锋柊璁惧淇℃伅
- refDevice: function(itemData) {
- ///api/devices/{deviceId}/sync
- console.log("鍒锋柊瀵瑰簲璁惧:" + itemData.deviceId);
- var that = this;
- that.$refs[itemData.deviceId + 'refbtn' ].loading = true;
+ playPush: function(row){
+ let that = this;
+ this.getListLoading = true;
this.$axios({
- method: 'post',
- url: '/api/devices/' + itemData.deviceId + '/sync'
- }).then(function(res) {
- console.log("鍒锋柊璁惧缁撴灉锛�"+JSON.stringify(res));
- if (!res.data.deviceId) {
- that.$message({
- showClose: true,
- message: res.data,
- type: 'error'
- });
- }else{
- that.$message({
- showClose: true,
- message: '璇锋眰鎴愬姛',
- type: 'success'
- });
+ method: 'get',
+ url: '/api/media/stream_info_by_app_and_stream',
+ params: {
+ app: row.app,
+ stream: row.stream,
+ mediaServerId: row.mediaServerId
}
- that.initData()
- that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
- }).catch(function(e) {
- console.error(e)
- that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
- });;
+ }).then(function (res) {
+ that.getListLoading = false;
+ that.$refs.devicePlayer.openDialog("streamPlay", null, null, {
+ streamInfo: res.data.data,
+ hasAudio: true
+ });
+ }).catch(function (error) {
+ console.error(error);
+ that.getListLoading = false;
+ });
},
- //閫氱煡璁惧涓婁紶濯掍綋娴�
- sendDevicePush: function(itemData) {
- // let deviceId = this.currentDevice.deviceId;
- // let channelId = itemData.channelId;
- // console.log("閫氱煡璁惧鎺ㄦ祦1锛�" + deviceId + " : " + channelId);
- // let that = this;
- // this.$axios({
- // method: 'get',
- // url: '/api/play/' + deviceId + '/' + channelId
- // }).then(function(res) {
- // let ssrc = res.data.ssrc;
- // that.$refs.devicePlayer.play(ssrc,deviceId,channelId);
- // }).catch(function(e) {
- // });
- },
- transportChange: function (row) {
- console.log(row);
- console.log(`淇敼浼犺緭鏂瑰紡涓� ${row.streamMode}锛�${row.deviceId} `);
+ stopPush: function(row){
let that = this;
- this.$axios({
- method: 'get',
- url: '/api/devices/' + row.deviceId + '/transport/' + row.streamMode
- }).then(function(res) {
-
- }).catch(function(e) {
+ 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.error(error);
});
- }
+ },
+ addToGB: function(row){
+ this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
+ },
+ removeFromGB: function(row){
+ let 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.error(error);
+ });
+ },
+ dateFormat: function(/** timestamp=0 **/) {
+ let ts = arguments[0] || 0;
+ let t,y,m,d,h,i,s;
+ t = ts ? new Date(ts) : new Date();
+ y = t.getFullYear();
+ m = t.getMonth()+1;
+ d = t.getDate();
+ h = t.getHours();
+ i = t.getMinutes();
+ s = t.getSeconds();
+ // 鍙牴鎹渶瑕佸湪杩欓噷瀹氫箟鏃堕棿鏍煎紡
+ return y+'-'+(m<10?'0'+m:m)+'-'+(d<10?'0'+d:d)+' '+(h<10?'0'+h:h)+':'+(i<10?'0'+i:i)+':'+(s<10?'0'+s:s);
+ },
+ importChannel: function () {
+ this.$refs.importChannel.openDialog(()=>{
+ })
+ },
+ batchDel: function () {
+ this.$confirm(`纭畾鍒犻櫎閫変腑鐨�${this.multipleSelection.length}涓�氶亾?`, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ let that = this;
+ that.$axios({
+ method:"delete",
+ url:"/api/push/batchStop",
+ data: {
+ gbStreams: this.multipleSelection
+ }
+ }).then((res)=>{
+ this.initData();
+ this.$refs.pushListTable.clearSelection();
+ }).catch(function (error) {
+ console.error(error);
+ });
+ }).catch(() => {
+
+ });
+ },
+ handleSelectionChange: function (val) {
+ this.multipleSelection = val;
+ },
}
};
</script>
--
Gitblit v1.8.0