Merge remote-tracking branch 'upstream/master'

Lawrence

2021-01-12 d563527289927f2ac2f2f9ae25e0b59c5d532684

 web_src/src/components/gb28181/devicePlayer.vue

@@ -1,6 +1,6 @@
<template>
<div id="devicePlayer" v-loading="isLoging">
    

    <el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="close()">
        <!-- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></LivePlayer> -->
        <player ref="videoPlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasaudio" fluent autoplay live></player>
@@ -125,7 +125,7 @@
                                <p>采样率: {{item.sample_rate}}</p>
                            </div>
                        </div>
                        

                    </div>

                </el-tab-pane>
@@ -183,7 +183,8 @@
            scanGroup: 0,
            tracks: [],
            coverPlaying:false,
            tracksLoading: false
            tracksLoading: false,
            recordPlay: ""
        };
    },
    methods: {
@@ -237,7 +238,7 @@
            console.log(val)
        },
        play: function (streamInfo, hasAudio) {
            

            this.hasaudio = hasAudio;
            this.isLoging = false;
            this.videoUrl = streamInfo.ws_flv;
@@ -318,8 +319,12 @@
              this.convertStop();
            }
            this.convertKey = ''
            if (this.recordPlay != '') {
              this.stopPlayRecord();
            }
            this.recordPlay = ''
        },
        

        copySharedInfo: function (data) {
            console.log('复制内容：' + data);
            this.coverPlaying = false;
@@ -384,6 +389,7 @@
                    var streamInfo = res.data;
                    that.streamId = streamInfo.streamId;
                    that.videoUrl = streamInfo.ws_flv;
                    that.recordPlay = true;
                });
            }
        },