From 07b182da98ac54fffa8f36b8db27d6212e1e0bf7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 26 十二月 2023 15:38:40 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into feature/record
---
web_src/src/components/CloudRecordDetail.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/web_src/src/components/CloudRecordDetail.vue b/web_src/src/components/CloudRecordDetail.vue
index c32f598..551df6f 100755
--- a/web_src/src/components/CloudRecordDetail.vue
+++ b/web_src/src/components/CloudRecordDetail.vue
@@ -37,11 +37,11 @@
<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,index) in detailFiles" :key="index" class="infinite-list-item record-list-item" >
- <el-tag v-if="choosedFile !== item.filename" @click="chooseFile(item)">
+ <el-tag v-if="choosedFile !== item.fileName" @click="chooseFile(item)">
<i class="el-icon-video-camera" ></i>
{{ getFileShowName(item) }}
</el-tag>
- <el-tag type="danger" v-if="choosedFile === item.filename">
+ <el-tag type="danger" v-if="choosedFile === item.fileName">
<i class="el-icon-video-camera" ></i>
{{ getFileShowName(item) }}
</el-tag>
@@ -135,7 +135,7 @@
<script>
// TODO 鏍规嵁鏌ヨ鐨勬椂闂村垪琛ㄨ缃粦杞ㄧ殑鏈�澶у�间笌鏈�灏忓�硷紝
import uiHeader from '../layout/UiHeader.vue'
- import player from './dialog/easyPlayer.vue'
+ import player from './common/easyPlayer.vue'
import moment from 'moment'
import axios from "axios";
export default {
@@ -480,12 +480,13 @@
let that = this;
this.$axios({
method: 'get',
- url:`/record_proxy/${that.mediaServerId}/api/record/file/download/task/add`,
+ url:`/api/cloud/record/task/add`,
params: {
- app: that.app,
- stream: that.stream,
- startTime: moment(this.taskTimeRange[0]).format('YYYY-MM-DD HH:mm:ss'),
- endTime: moment(this.taskTimeRange[1]).format('YYYY-MM-DD HH:mm:ss'),
+ app: this.app,
+ stream: this.stream,
+ mediaServerId: this.mediaServerId,
+ startTime: moment(this.taskTimeRange[0]).format('YYYY-MM-DD HH:mm:ss'),
+ endTime: moment(this.taskTimeRange[1]).format('YYYY-MM-DD HH:mm:ss'),
}
}).then(function (res) {
if (res.data.code === 0 ) {
@@ -505,8 +506,9 @@
let that = this;
this.$axios({
method: 'get',
- url:`/record_proxy/${that.mediaServerId}/api/record/file/download/task/list`,
+ url:`/api/cloud/record/task/list`,
params: {
+ mediaServerId: this.mediaServerId,
isEnd: isEnd,
}
}).then(function (res) {
--
Gitblit v1.8.0