From e4148d9ba90c4699a57fb84170bb383821ac8bcd Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期二, 22 六月 2021 11:32:30 +0800
Subject: [PATCH] 修改console输出
---
web_src/src/components/dialog/devicePlayer.vue | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index f5c7d50..1dfc461 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">
@@ -14,15 +14,27 @@
</div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">鎾斁鍦板潃锛�</span>
- <el-input v-model="getPlayerShared.sharedUrl" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedUrl)"></el-input>
+ <el-input v-model="getPlayerShared.sharedUrl" :disabled="true" >
+ <template slot="append">
+ <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedUrl" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
+ </template>
+ </el-input>
</div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">iframe锛�</span>
- <el-input v-model="getPlayerShared.sharedIframe" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedIframe)"></el-input>
+ <el-input v-model="getPlayerShared.sharedIframe" :disabled="true" >
+ <template slot="append">
+ <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedIframe" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
+ </template>
+ </el-input>
</div>
<div style="display: flex; margin-bottom: 0.5rem; height: 2.5rem;">
<span style="width: 5rem; line-height: 2.5rem; text-align: right;">璧勬簮鍦板潃锛�</span>
- <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true" v-on:click.native="copySharedInfo(getPlayerShared.sharedRtmp)"></el-input>
+ <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true" >
+ <template slot="append">
+ <i class="cpoy-btn el-icon-document-copy" title="鐐瑰嚮鎷疯礉" v-clipboard="getPlayerShared.sharedRtmp" @success="$message({type:'success', message:'鎴愬姛鎷疯礉鍒扮矘璐存澘'})"></i>
+ </template>
+ </el-input>
</div>
</el-tab-pane>
<!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}-->
@@ -148,9 +160,10 @@
},
computed: {
getPlayerShared: function () {
+
return {
- sharedUrl: window.location.host + '/' + this.videoUrl,
- sharedIframe: '<iframe src="' + window.location.host + '/' + this.videoUrl + '"></iframe>',
+ sharedUrl: window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl),
+ sharedIframe: '<iframe src="' + window.location.origin + '/#/play/wasm/' + encodeURIComponent(this.videoUrl) + '"></iframe>',
sharedRtmp: this.videoUrl
};
}
@@ -257,10 +270,17 @@
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`;
},
coverPlay: function () {
var that = this;
@@ -322,7 +342,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('鍏抽棴瑙嗛');
@@ -404,8 +424,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;
});
}
@@ -415,7 +436,7 @@
this.videoUrl = '';
this.$axios({
method: 'get',
- url: '/api/playback/stop/' + this.streamId
+ url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId
}).then(function (res) {
if (callback) callback()
});
--
Gitblit v1.8.0