与master分支同步

Lawrence

2021-01-12 5257c7c9f4b7ef3e8ef074c2fb2fc582f3bdcf05

 web_src/src/components/gb28181/devicePlayer.vue

@@ -67,7 +67,7 @@
                            <div style="position: absolute; left: 7.25rem; top: 1.25rem" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in control-zoom-btn" style="font-size: 1.875rem;"></i></div>
                            <div style="position: absolute; left: 7.25rem; top: 3.25rem; font-size: 1.875rem;" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out control-zoom-btn"></i></div>
                             <div class="contro-speed" style="position: absolute; left: 4px; top: 7rem; width: 9rem;">
                                 <el-slider v-model="controSpeed"></el-slider>
                                 <el-slider v-model="controSpeed" :max="255"></el-slider>
                             </div>
                        </div>
                       
@@ -183,7 +183,8 @@
            scanGroup: 0,
            tracks: [],
            coverPlaying:false,
            tracksLoading: false
            tracksLoading: false,
            recordPlay: ""
        };
    },
    methods: {
@@ -318,6 +319,10 @@
              this.convertStop();
            }
            this.convertKey = ''
            if (this.recordPlay != '') {
              this.stopPlayRecord();
            }
            this.recordPlay = ''
        },

        copySharedInfo: function (data) {
@@ -384,6 +389,7 @@
                    var streamInfo = res.data;
                    that.streamId = streamInfo.streamId;
                    that.videoUrl = streamInfo.ws_flv;
                    that.recordPlay = true;
                });
            }
        },