Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro i...

mk1990

2022-05-16 e6790d88fc5b1ac33d239c0d90ce6cdea666b821

 web_src/src/components/dialog/devicePlayer.vue

@@ -453,9 +453,19 @@
                method: 'get',
                url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
            }).then(function (res) {
                // 处理时间信息
                that.videoHistory.searchHistoryResult = res.data.recordList;
                that.recordsLoading = false;
                console.log(res)
                if(res.data.code === 0) {
                  // 处理时间信息
                  that.videoHistory.searchHistoryResult = res.data.data.recordList;
                  that.recordsLoading = false;
                }else {
                  this.$message({
                    showClose: true,
                    message: res.data.msg,
                    type: "error",
                  });
                }

            }).catch(function (e) {
                console.log(e.message);
                // that.videoHistory.searchHistoryResult = falsificationData.recordData;
@@ -671,7 +681,11 @@
          this.$axios({
            method: 'get',
            url: `/api/playback/seek/${this.streamId }/` + Math.floor(this.seekTime * val / 100000)
          }).then(function (res) {});
          }).then( (res)=> {
            setTimeout(()=>{
              this.$refs.videoPlayer.play(this.videoUrl)
            }, 600)
          });
        }

    }