From a53dce38c2f58c0bfd37203e46dc57aa56025f45 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 18:22:24 +0800
Subject: [PATCH] Merge pull request #673 from 648540858/wvp-28181-2.0-multi-network
---
web_src/src/components/dialog/recordDownload.vue | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/web_src/src/components/dialog/recordDownload.vue b/web_src/src/components/dialog/recordDownload.vue
index 6b7ca1f..b0b8fea 100644
--- a/web_src/src/components/dialog/recordDownload.vue
+++ b/web_src/src/components/dialog/recordDownload.vue
@@ -84,15 +84,17 @@
method: 'get',
url: `/api/gb_record/download/progress/${this.deviceId}/${this.channelId}/${this.stream}`
}).then((res)=> {
- console.log(res)
- console.log(res.data.progress)
- this.streamInfo = res.data;
- if (parseFloat(res.data.progress) == 1) {
- this.percentage = 100;
- }else {
- this.percentage = (res.data.progress*100).toFixed(1);
+ console.log(res)
+ if (res.data.code === 0) {
+ this.streamInfo = res.data.data;
+ if (parseFloat(res.data.progress) == 1) {
+ this.percentage = 100;
+ }else {
+ this.percentage = (parseFloat(res.data.data.progress)*100).toFixed(1);
+ }
+ if (callback)callback();
}
- if (callback)callback();
+
}).catch((e) =>{
});
@@ -140,7 +142,7 @@
endTime: null,
}
}).then((res) =>{
- if (res.data.code === 0 && res.data.msg === "success") {
+ if (res.data.code === 0 ) {
// 鏌ヨ杩涘害
this.title = "褰曞儚鏂囦欢澶勭悊涓�..."
this.taskId = res.data.data;
@@ -172,7 +174,12 @@
isEnd: true,
}
}).then((res) => {
- if (res.data.code == 0) {
+ console.log(res)
+ if (res.data.code === 0) {
+ if (res.data.data.length === 0){
+ this.percentage = 0
+ return
+ }
this.percentage = parseFloat(res.data.data.percentage)*100
if (res.data.data[0].percentage === '1') {
this.getProgressForFileRun = false;
--
Gitblit v1.8.0