Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2021-10-29 c35932e24cf9dda9ef396ab5a45fb1a6e5539748

 web_src/src/components/PushVideoList.vue

@@ -133,7 +133,7 @@
            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,
@@ -142,7 +142,7 @@
            }).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) {
@@ -154,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;