From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/mdc/base/modules/deviceLog/LogList.vue | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/LogList.vue b/src/views/mdc/base/modules/deviceLog/LogList.vue
index 69a3f5e..a1a33bf 100644
--- a/src/views/mdc/base/modules/deviceLog/LogList.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogList.vue
@@ -48,6 +48,9 @@
default: false
}
},
+ watch:{
+
+ },
data() {
return {
statusName: '',
@@ -90,13 +93,52 @@
title: '鎸佺画鏃堕棿',
align: 'center',
dataIndex: 'duration',
+ customRender:(t,r,index) =>{
+ // console.log(t)
+ var ss = parseInt(t)
+ if(ss>=3600){
+ // 鏍规嵁绉掓暟杞崲鎴愬搴旂殑鏃跺垎绉�
+ 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)
+ 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)
+ const sec1 = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
+ return min1 + '鍒�' + sec1 + "绉�"
+ }else{
+ const sec2 = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
+ return sec2 + '绉�'
+ }
+ }
// defaultSortOrder:'descend',
// sorter: (a, b) => {return a.duration>b.duration?1:-1}
},
{
title: '绋嬪簭鍙�',
align: 'center',
- dataIndex: 'sequencenumber'
+ dataIndex: 'sequenceNumber'
}
]
}
--
Gitblit v1.9.3