From 62e82ea9ee6a73cf7cdcfe1ab1a7b49a23f571e3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 十月 2021 17:58:28 +0800
Subject: [PATCH] 录像下载修复
---
web_src/src/components/dialog/devicePlayer.vue | 147 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 115 insertions(+), 32 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 48d295a..5d23f35 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,19 +14,31 @@
</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/"}}-->
- <el-tab-pane label="褰曞儚鏌ヨ" name="record" v-if="showRrecord">
+ <el-tab-pane label="褰曞儚鏌ヨ" name="record" v-if="showRrecord">
<el-date-picker size="mini" v-model="videoHistory.date" type="date" value-format="yyyy-MM-dd" placeholder="鏃ユ湡" @change="queryRecords()"></el-date-picker>
<el-table :data="videoHistory.searchHistoryResult" height="150" v-loading="recordsLoading">
<el-table-column label="鍚嶇О" prop="name"></el-table-column>
@@ -36,7 +48,10 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="scope">
- <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">鎾斁</el-button>
+ <el-button-group>
+ <el-button icon="el-icon-video-play" size="mini" @click="playRecord(scope.row)">鎾斁</el-button>
+ <el-button icon="el-icon-download" size="mini" @click="downloadRecord(scope.row)">涓嬭浇</el-button>
+ </el-button-group>
</template>
</el-table-column>
</el-table>
@@ -70,7 +85,7 @@
<el-slider v-model="controSpeed" :max="255"></el-slider>
</div>
</div>
-
+
<div class="control-panel">
<el-button-group>
<el-tag style="position :absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium" type="info">棰勭疆浣嶇紪鍙�</el-tag>
@@ -105,12 +120,13 @@
</el-tab-pane>
<el-tab-pane label="缂栫爜淇℃伅" name="codec" v-loading="tracksLoading">
<p>
- 鏃犳硶鎾斁鎴栬�呮病鏈夊０闊�?   璇曚竴璇�
+ 鏃犳硶鎾斁鎴栬�呮病鏈夊０闊�?   璇曚竴璇� 
<el-button size="mini" type="primary" v-if="!coverPlaying" @click="coverPlay">杞爜鎾斁</el-button>
<el-button size="mini" type="danger" v-if="coverPlaying" @click="convertStopClick">鍋滄杞爜</el-button>
</p>
<div class="trank" >
- <div v-for="(item, index) in tracks">
+ <p v-if="tracksNotLoaded" style="text-align: center;padding-top: 3rem;">鏆傛棤鏁版嵁</p>
+ <div v-for="(item, index) in tracks" style="width: 50%; float: left" loading>
<span >娴� {{index}}</span>
<div class="trankInfo" v-if="item.codec_type == 0">
<p>鏍煎紡: {{item.codec_id_name}}</p>
@@ -136,7 +152,10 @@
</template>
<script>
-import player from '../dialog/player.vue'
+// import player from '../dialog/rtcPlayer.vue'
+// import LivePlayer from '@liveqing/liveplayer'
+// import player from '../dialog/easyPlayer.vue'
+import player from '../dialog/jessibuca.vue'
export default {
name: 'devicePlayer',
props: {},
@@ -145,9 +164,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
};
}
@@ -163,11 +183,13 @@
},
showVideoDialog: false,
streamId: '',
+ app : '',
+ mediaServerId : '',
convertKey: '',
deviceId: '',
channelId: '',
tabActiveName: 'media',
- hasaudio: false,
+ hasAudio: false,
loadingRecords: false,
recordsLoading: false,
isLoging: false,
@@ -187,6 +209,7 @@
recordPlay: "",
showPtz: true,
showRrecord: true,
+ tracksNotLoaded: false,
};
},
methods: {
@@ -195,15 +218,17 @@
var that = this;
that.tracks = [];
that.tracksLoading = true;
+ that.tracksNotLoaded = false;
if (tab.name == "codec") {
this.$axios({
method: 'get',
- url: '/zlm/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app=rtp&stream='+ this.streamId
+ url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
}).then(function (res) {
that.tracksLoading = false;
if (res.data.code == 0 && res.data.online) {
that.tracks = res.data.tracks;
}else{
+ that.tracksNotLoaded = true;
that.$message({
showClose: true,
message: '鑾峰彇缂栫爜淇℃伅澶辫触,',
@@ -218,6 +243,8 @@
this.channelId = channelId;
this.deviceId = deviceId;
this.streamId = "";
+ this.mediaServerId = "";
+ this.app = "";
this.videoUrl = ""
if (!!this.$refs.videoPlayer) {
this.$refs.videoPlayer.pause();
@@ -228,13 +255,13 @@
break;
case "record":
this.showVideoDialog = true;
-
this.videoHistory.date = param.date;
this.queryRecords()
break;
case "streamPlay":
- this.showRrecord = false,
- this.showPtz = false,
+ this.tabActiveName = "media";
+ this.showRrecord = false;
+ this.showPtz = false;
this.play(param.streamInfo, param.hasAudio)
break;
case "control":
@@ -245,12 +272,34 @@
console.log(val)
},
play: function (streamInfo, hasAudio) {
-
- this.hasaudio = hasAudio;
+ this.hasAudio = hasAudio;
this.isLoging = false;
- this.videoUrl = streamInfo.ws_flv;
+ // this.videoUrl = streamInfo.rtc;
+ this.videoUrl = this.getUrlByStreamInfo(streamInfo);
this.streamId = streamInfo.streamId;
+ this.app = streamInfo.app;
+ this.mediaServerId = streamInfo.mediaServerId;
this.playFromStreamInfo(false, streamInfo)
+ },
+ getUrlByStreamInfo(streamInfo){
+ let baseZlmApi = process.env.NODE_ENV === 'development'?`${location.host}/debug/zlm`:`${location.host}/zlm`
+ // return `${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
+ // return `http://${baseZlmApi}/${streamInfo.app}/${streamInfo.streamId}.flv`;
+ if (location.protocol === "https:") {
+ if (streamInfo.wss_flv === null) {
+ this.$message({
+ showClose: true,
+ message: '濯掍綋鏈嶅姟鍣ㄦ湭閰嶇疆ssl绔彛',
+ type: 'error'
+ });
+ }else {
+ return streamInfo.wss_flv;
+ }
+
+ }else {
+ return streamInfo.ws_flv;
+ }
+
},
coverPlay: function () {
var that = this;
@@ -258,7 +307,7 @@
this.$refs.videoPlayer.pause()
that.$axios({
method: 'post',
- url: '/api/play/' + that.streamId + '/convert'
+ url: '/api/play/convert/' + that.streamId
}).then(function (res) {
if (res.data.code == 0) {
that.convertKey = res.data.key;
@@ -295,7 +344,7 @@
that.$refs.videoPlayer.pause()
this.$axios({
method: 'post',
- url: '/api/play/convert/stop/' + this.convertKey
+ url: '/api/play/convertStop/' + this.convertKey
}).then(function (res) {
if (res.data.code == 0) {
console.log(res.data.msg)
@@ -312,7 +361,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('鍏抽棴瑙嗛');
@@ -366,7 +415,7 @@
var endTime = this.videoHistory.date + " 23:59:59";
this.$axios({
method: 'get',
- url: '/api/record/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
+ url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
}).then(function (res) {
// 澶勭悊鏃堕棿淇℃伅
that.videoHistory.searchHistoryResult = res.data.recordList;
@@ -390,12 +439,14 @@
} else {
this.$axios({
method: 'get',
- url: '/api/playback/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
+ url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
row.endTime
}).then(function (res) {
var streamInfo = res.data;
+ that.app = streamInfo.app;
that.streamId = streamInfo.streamId;
- that.videoUrl = streamInfo.ws_flv;
+ that.mediaServerId = streamInfo.mediaServerId;
+ that.videoUrl = that.getUrlByStreamInfo(streamInfo);
that.recordPlay = true;
});
}
@@ -405,7 +456,39 @@
this.videoUrl = '';
this.$axios({
method: 'get',
- url: '/api/playback/' + this.streamId + '/stop'
+ url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId
+ }).then(function (res) {
+ if (callback) callback()
+ });
+ },
+ downloadRecord: function (row) {
+ let that = this;
+ if (that.streamId != "") {
+ that.stopDownloadRecord(function () {
+ that.streamId = "",
+ that.downloadRecord(row);
+ })
+ } else {
+ this.$axios({
+ method: 'get',
+ url: '/api/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
+ row.endTime + '&downloadSpeed=4'
+ }).then(function (res) {
+ var streamInfo = res.data;
+ that.app = streamInfo.app;
+ that.streamId = streamInfo.streamId;
+ that.mediaServerId = streamInfo.mediaServerId;
+ that.videoUrl = that.getUrlByStreamInfo(streamInfo);
+ that.recordPlay = true;
+ });
+ }
+ },
+ stopDownloadRecord: function (callback) {
+ this.$refs.videoPlayer.pause();
+ this.videoUrl = '';
+ this.$axios({
+ method: 'get',
+ url: '/api/download/stop/' + this.deviceId + "/" + this.channelId
}).then(function (res) {
if (callback) callback()
});
@@ -417,7 +500,7 @@
method: 'post',
// url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?leftRight=' + leftRight + '&upDown=' + upDown +
// '&inOut=' + zoom + '&moveSpeed=50&zoomSpeed=50'
- url: '/api/ptz/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
+ url: '/api/ptz/control/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + (zoom * 16 + upDown * 4 + leftRight) + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
}).then(function (res) {});
},
//////////////////////鎾斁鍣ㄤ簨浠跺鐞�//////////////////////////
@@ -429,7 +512,7 @@
let that = this;
this.$axios({
method: 'post',
- url: '/api/frontEndCommand/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=0¶meter2=' + presetPos + '&combindCode2=0'
+ url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=0¶meter2=' + presetPos + '&combindCode2=0'
}).then(function (res) {});
},
setSpeedOrTime: function (cmdCode, groupNum, parameter) {
@@ -439,7 +522,7 @@
console.log('鍓嶇鎺у埗锛�0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter2.toString(16) + ' 0x' + combindCode2.toString(16));
this.$axios({
method: 'post',
- url: '/api/frontEndCommand/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter2 + '&combindCode2=' + combindCode2
+ url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter2 + '&combindCode2=' + combindCode2
}).then(function (res) {});
},
setCommand: function (cmdCode, groupNum, parameter) {
@@ -447,7 +530,7 @@
console.log('鍓嶇鎺у埗锛�0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter.toString(16) + ' 0x0');
this.$axios({
method: 'post',
- url: '/api/frontEndCommand/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter + '&combindCode2=0'
+ url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '¶meter1=' + groupNum + '¶meter2=' + parameter + '&combindCode2=0'
}).then(function (res) {});
},
formatTooltip: function (val) {
--
Gitblit v1.8.0