From f52be3039975b41f24f8df02b71b60911aa7c63a Mon Sep 17 00:00:00 2001 From: walkTtalk <irwenjing@gmail.com> Date: 星期六, 26 二月 2022 00:01:35 +0800 Subject: [PATCH] Fix issue #347: 修改前端启动报错 --- web_src/src/components/CloudRecordDetail.vue | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/web_src/src/components/CloudRecordDetail.vue b/web_src/src/components/CloudRecordDetail.vue index 87182e1..a8d8224 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,8 @@ <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 />--> + <a class="el-icon-download" style="color: #409EFF;font-weight: 600;margin-left: 10px;" :href="`${basePath}/download.html?url=${recordFile.app}/${recordFile.stream}/${chooseDate}/${item}`" target="_blank" /> </li> </ul> </div> @@ -74,7 +76,7 @@ <li class="task-list-item" v-for="item in taskListEnded"> <div class="task-list-item-box" style="height: 2rem;line-height: 2rem;"> <span>{{ item.startTime.substr(10) }}-{{item.endTime.substr(10)}}</span> - <a class="el-icon-download download-btn" :href="basePath + '/' + item.recordFile" download > + <a class="el-icon-download download-btn" :href="basePath + '/download.html?url=../' + item.recordFile" target="_blank"> </a> </div> </li> @@ -110,10 +112,10 @@ components: { uiHeader, player }, - props: ['recordFile', 'mediaServer', 'dateFiles'], + props: ['recordFile', 'mediaServerId', 'dateFiles', 'mediaServerPath'], data() { return { - basePath: process.env.NODE_ENV === 'development'?`${location.origin}/debug/zlm`:`${location.origin}/zlm`, + basePath: `${this.mediaServerPath}`, dateFilesObj: [], detailFiles: [], chooseDate: null, @@ -238,7 +240,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 +265,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.recordFile.app}/${this.recordFile.stream}/${this.chooseDate}/${this.choosedFile}` console.log(this.videoUrl) } @@ -312,7 +314,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 +333,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 +382,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 +407,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