From c8b6ed5823fbe8e7eeef2e733859b4406b2ba4c5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 一月 2021 13:22:07 +0800
Subject: [PATCH] Merge pull request #38 from lawrencehj/wvp-28181-2.0
---
web_src/src/components/gb28181/devicePlayer.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue
index c99ce79..2341831 100644
--- a/web_src/src/components/gb28181/devicePlayer.vue
+++ b/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;
});
}
},
--
Gitblit v1.8.0