From c35932e24cf9dda9ef396ab5a45fb1a6e5539748 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 29 十月 2021 11:22:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/CloudRecordDetail.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/web_src/src/components/CloudRecordDetail.vue b/web_src/src/components/CloudRecordDetail.vue
index 87182e1..5d6ca90 100644
--- a/web_src/src/components/CloudRecordDetail.vue
+++ b/web_src/src/components/CloudRecordDetail.vue
@@ -6,8 +6,8 @@
<el-date-picker size="mini" v-model="chooseDate" :picker-options="pickerOptions" type="date" value-format="yyyy-MM-dd" placeholder="鏃ユ湡" @change="dateChange()"></el-date-picker>
<div class="record-list-box" :style="recordListStyle">
<ul v-if="detailFiles.length >0" class="infinite-list record-list" v-infinite-scroll="infiniteScroll" >
- <li v-for="item in detailFiles" class="infinite-list-item record-list-item" @click="chooseFile(item)">
- <el-tag v-if="choosedFile != item">
+ <li v-for="item in detailFiles" class="infinite-list-item record-list-item" >
+ <el-tag v-if="choosedFile != item" @click="chooseFile(item)">
<i class="el-icon-video-camera" ></i>
{{ item.substring(0,17)}}
</el-tag>
@@ -15,6 +15,7 @@
<i class="el-icon-video-camera" ></i>
{{ item.substring(0,17)}}
</el-tag>
+ <a class="el-icon-download" style="color: #409EFF;font-weight: 600;margin-left: 10px;" :href="`${basePath}/${mediaServerId}/record/${recordFile.app}/${recordFile.stream}/${chooseDate}/${item}`" download />
</li>
</ul>
</div>
@@ -110,10 +111,10 @@
components: {
uiHeader, player
},
- props: ['recordFile', 'mediaServer', 'dateFiles'],
+ props: ['recordFile', 'mediaServerId', 'dateFiles'],
data() {
return {
- basePath: process.env.NODE_ENV === 'development'?`${location.origin}/debug/zlm`:`${location.origin}/zlm`,
+ basePath: process.env.NODE_ENV === 'development'?`${location.origin}/debug/zlm/${this.mediaServerId}`:`${location.origin}/zlm/${this.mediaServerId}`,
dateFilesObj: [],
detailFiles: [],
chooseDate: null,
@@ -238,7 +239,7 @@
let that = this;
that.$axios({
method: 'get',
- url:`/record_proxy/${that.mediaServer.generalMediaServerId}/api/record/file/list`,
+ url:`/record_proxy/${that.mediaServerId}/api/record/file/list`,
params: {
app: that.recordFile.app,
stream: that.recordFile.stream,
@@ -263,7 +264,7 @@
this.videoUrl = "";
}else {
// TODO 鎺у埗鍒楄〃婊氬姩鏉�
- this.videoUrl = `${this.basePath}/${this.mediaServer.recordAppName}/${this.recordFile.app}/${this.recordFile.stream}/${this.chooseDate}/${this.choosedFile}`
+ this.videoUrl = `${this.basePath}/${this.mediaServerId}/record/${this.recordFile.app}/${this.recordFile.stream}/${this.chooseDate}/${this.choosedFile}`
console.log(this.videoUrl)
}
@@ -312,7 +313,7 @@
let that = this;
this.$axios({
method: 'delete',
- url:`/record_proxy/${that.mediaServer.generalMediaServerId}/api/record/delete`,
+ url:`/record_proxy/${that.mediaServerId}/api/record/delete`,
params: {
page: that.currentPage,
count: that.count
@@ -331,7 +332,7 @@
that.dateFilesObj = {};
this.$axios({
method: 'get',
- url:`/record_proxy/${that.mediaServer.generalMediaServerId}/api/record/date/list`,
+ url:`/record_proxy/${that.mediaServerId}/api/record/date/list`,
params: {
app: that.recordFile.app,
stream: that.recordFile.stream
@@ -380,7 +381,7 @@
let that = this;
this.$axios({
method: 'get',
- url:`/record_proxy/${that.mediaServer.generalMediaServerId}/api/record/file/download/task/add`,
+ url:`/record_proxy/${that.mediaServerId}/api/record/file/download/task/add`,
params: {
app: that.recordFile.app,
stream: that.recordFile.stream,
@@ -405,7 +406,7 @@
let that = this;
this.$axios({
method: 'get',
- url:`/record_proxy/${that.mediaServer.generalMediaServerId}/api/record/file/download/task/list`,
+ url:`/record_proxy/${that.mediaServerId}/api/record/file/download/task/list`,
params: {
isEnd: isEnd,
}
--
Gitblit v1.8.0