From bb6ecb15529851daa10eefe04e918c24b00459a3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 29 三月 2024 19:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web_src/src/components/CloudRecord.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
index 4a4a74b..9f8d7a0 100755
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -264,14 +264,16 @@
});
},
formatTime(time) {
- const h = parseInt(time / 3600)
- const minute = parseInt(time / 60 % 60)
- const second = Math.ceil(time % 60)
-
- return (h > 0 ? h + `灏忔椂` : '') + (minute > 0 ? minute + '鍒�' : '') + second + '绉�'
+ const h = parseInt(time / 3600 / 1000)
+ const minute = parseInt((time - h * 3600 * 1000) / 60 / 1000)
+ let second = Math.ceil((time - h * 3600 * 1000 - minute * 60 * 1000) / 1000)
+ if (second < 0) {
+ second = 0;
+ }
+ return (h > 0 ? h + `灏忔椂` : '') + (minute > 0 ? minute + '鍒�' : '') + (second > 0 ? second + '绉�' : '')
},
formatTimeStamp(time) {
- return moment.unix(time).format('yyyy-MM-DD HH:mm:ss')
+ return moment.unix(time/1000).format('yyyy-MM-DD HH:mm:ss')
}
}
--
Gitblit v1.8.0