From 58b333604d0762bc8c5c6a9806e31f401f1528c7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十一月 2023 15:30:17 +0800
Subject: [PATCH] 修改错别字
---
web_src/src/components/dialog/recordDownload.vue | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/web_src/src/components/dialog/recordDownload.vue b/web_src/src/components/dialog/recordDownload.vue
old mode 100644
new mode 100755
index b3f46c8..220da8b
--- a/web_src/src/components/dialog/recordDownload.vue
+++ b/web_src/src/components/dialog/recordDownload.vue
@@ -7,6 +7,7 @@
</el-col>
<el-col :span="6" >
<el-button icon="el-icon-download" v-if="percentage < 100" size="mini" title="鐐瑰嚮涓嬭浇鍙皢浠ョ紦瀛橀儴鍒嗕笅杞藉埌鏈湴" @click="download()">鍋滄缂撳瓨骞朵笅杞�</el-button>
+ <el-button icon="el-icon-download" v-if="downloadFile" size="mini" title="鐐瑰嚮涓嬭浇" @click="downloadFileClientEvent()">鐐瑰嚮涓嬭浇</el-button>
</el-col>
</el-row>
</el-dialog>
@@ -21,12 +22,12 @@
export default {
name: 'recordDownload',
created() {
-
+ window.addEventListener('beforeunload', this.stopDownloadRecord)
},
data() {
return {
- title: "鍥涘�嶉�熶笅杞戒腑...",
+ title: "涓嬭浇涓�...",
deviceId: "",
channelId: "",
app: "",
@@ -39,7 +40,8 @@
taskId: null,
getProgressRun: false,
getProgressForFileRun: false,
- timer: null
+ timer: null,
+ downloadFile: null,
};
},
@@ -135,10 +137,11 @@
getFileDownload: function (){
this.$axios({
method: 'get',
- url:`/record_proxy/${this.mediaServerId}/api/record/file/download/task/add`,
+ url:`/api/cloud/record/task/add`,
params: {
app: this.app,
stream: this.stream,
+ mediaServerId: this.mediaServerId,
startTime: null,
endTime: null,
}
@@ -161,16 +164,15 @@
}
setTimeout( ()=>{
if (!this.showDialog) return;
- this.getProgressForFile(this.getProgressForFileTimer())
+ this.getProgressForFile(this.getProgressForFileTimer)
}, 1000)
},
getProgressForFile: function (callback){
this.$axios({
method: 'get',
- url:`/record_proxy/${this.mediaServerId}/api/record/file/download/task/list`,
+ url:`/api/cloud/record/task/list`,
params: {
- app: this.app,
- stream: this.stream,
+ mediaServerId: this.mediaServerId,
taskId: this.taskId,
isEnd: true,
}
@@ -179,13 +181,17 @@
if (res.data.code === 0) {
if (res.data.data.length === 0){
this.percentage = 0
+ // 寰�寰�鍦ㄥ娆¤姹傚悗锛堝疄楠屼簲鍒嗛挓鐨勮棰戞槸涓夋璇锋眰锛夛紝鎵嶄細杩斿洖鏁版嵁锛岀涓�娆¤姹傞�氬父鏄繑鍥炵┖鏁扮粍
+ if (callback)callback()
return
}
- this.percentage = parseFloat(res.data.data.percentage)*100
+ // res.data.data搴旀槸鏁扮粍绫诲瀷
+ this.percentage = parseFloat(res.data.data[0].percentage)*100
if (res.data.data[0].percentage === '1') {
this.getProgressForFileRun = false;
- window.open(res.data.data[0].downloadFile)
- this.close();
+ this.downloadFile = res.data.data[0].downloadFile
+ this.title = "鏂囦欢澶勭悊瀹屾垚锛岀偣鍑绘寜鎵笅杞�"
+ // window.open(res.data.data[0].downloadFile)
}else {
if (callback)callback()
}
@@ -193,7 +199,13 @@
}).catch(function (error) {
console.log(error);
});
- }
+ },
+ downloadFileClientEvent: function (){
+ window.open(this.downloadFile )
+ }
+ },
+ destroyed() {
+ window.removeEventListener('beforeunload', this.stopDownloadRecord)
}
};
</script>
--
Gitblit v1.8.0