From c35932e24cf9dda9ef396ab5a45fb1a6e5539748 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 29 十月 2021 11:22:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- web_src/src/components/PushVideoList.vue | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/web_src/src/components/PushVideoList.vue b/web_src/src/components/PushVideoList.vue index f40fe3c..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> @@ -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) { @@ -151,7 +154,7 @@ 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; -- Gitblit v1.8.0