From d563527289927f2ac2f2f9ae25e0b59c5d532684 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期二, 12 一月 2021 13:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
web_src/src/components/gb28181/devicePlayer.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue
index 329503a..2341831 100644
--- a/web_src/src/components/gb28181/devicePlayer.vue
+++ b/web_src/src/components/gb28181/devicePlayer.vue
@@ -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;
});
}
},
--
Gitblit v1.8.0