From e48ef997c03b49c8090970f5fbb29ce80b0ac6df Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期三, 14 七月 2021 15:57:39 +0800
Subject: [PATCH] 更换播放器， 修正和优化sql脚本，
---
web_src/src/components/dialog/devicePlayer.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 3205101..9653833 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -1,9 +1,9 @@
<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()">
+ <el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @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>
+ <player ref="videoPlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :height="false" :hasaudio="hasaudio" fluent autoplay live ></player>
<div id="shared" style="text-align: right; margin-top: 1rem;">
<el-tabs v-model="tabActiveName" @tab-click="tabHandleClick">
<el-tab-pane label="瀹炴椂瑙嗛" name="media">
@@ -151,7 +151,8 @@
<script>
// import player from '../dialog/rtcPlayer.vue'
// import LivePlayer from '@liveqing/liveplayer'
-import player from '../dialog/easyPlayer.vue'
+// import player from '../dialog/easyPlayer.vue'
+import player from '../dialog/jessibuca.vue'
export default {
name: 'devicePlayer',
props: {},
@@ -270,10 +271,18 @@
this.hasaudio = hasAudio;
this.isLoging = false;
// this.videoUrl = streamInfo.rtc;
- this.videoUrl = streamInfo.ws_flv;
+ this.videoUrl = this.getUrlByStreamInfo(streamInfo);
this.streamId = streamInfo.streamId;
this.app = streamInfo.app;
this.playFromStreamInfo(false, streamInfo)
+ },
+ getUrlByStreamInfo(streamInfo){
+ let baseZlmApi = process.env.NODE_ENV === 'development'?`${location.host}/debug/zlm`:`${location.host}/zlm`
+ console.log(12121212)
+ console.log(baseZlmApi)
+ // return `${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
+ // return `http://${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
+ return streamInfo.ws_flv;
},
coverPlay: function () {
var that = this;
@@ -335,7 +344,7 @@
playFromStreamInfo: function (realHasAudio, streamInfo) {
this.showVideoDialog = true;
this.hasaudio = realHasAudio && this.hasaudio;
- this.$refs.videoPlayer.play(streamInfo.ws_flv)
+ this.$refs.videoPlayer.play(this.getUrlByStreamInfo(streamInfo))
},
close: function () {
console.log('鍏抽棴瑙嗛');
@@ -417,8 +426,9 @@
row.endTime
}).then(function (res) {
var streamInfo = res.data;
+ that.app = streamInfo.app;
that.streamId = streamInfo.streamId;
- that.videoUrl = streamInfo.ws_flv;
+ that.videoUrl = that.getUrlByStreamInfo(streamInfo);
that.recordPlay = true;
});
}
--
Gitblit v1.8.0