From 102c7d7dc9f5af873f19c86a0d17d5d6addcbc32 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 九月 2023 17:39:28 +0800
Subject: [PATCH] 项目优化
---
src/views/mdc/base/modules/deviceLog/LogList.vue | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/LogList.vue b/src/views/mdc/base/modules/deviceLog/LogList.vue
index d58caea..a1a33bf 100644
--- a/src/views/mdc/base/modules/deviceLog/LogList.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogList.vue
@@ -101,7 +101,27 @@
const hour = parseInt(ss / 3600) < 10 ? '0' + parseInt(ss / 3600) : parseInt(ss / 3600)
const min = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
const sec = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
- return hour + '鏃�' + min + '鍒�' + sec + '绉�'
+ if(min == '00') {
+ if(sec == '00'){
+ return hour + '灏忔椂'
+ }else{
+ return hour + '灏忔椂'+ sec + '绉�'
+ }
+
+ }else{
+ if(sec == '00') {
+ return hour + '灏忔椂' + min + '鍒�'
+ }else{
+ return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
+ }
+ }
+ // if(sec == '00'){
+ // return hour + '灏忔椂' + min + '鍒�'
+ // }
+ // if(min == '00' && sec == '00'){
+ // return hour + '灏忔椂'
+ // }
+ // return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
}else if(60<ss && ss<3600){
const min1 = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
@@ -118,7 +138,7 @@
{
title: '绋嬪簭鍙�',
align: 'center',
- dataIndex: 'sequencenumber'
+ dataIndex: 'sequenceNumber'
}
]
}
--
Gitblit v1.9.3