From f02cf09eb0c6933dd5ccc4dac6c6c09c3b5f3d3c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 25 八月 2025 15:17:03 +0800
Subject: [PATCH] 1、根据最新设计方案调整设备管理模块点击弹窗样式 2、mdc公司级首页设备管理模块与点击功能联调

---
 src/views/mdc/base/modules/deviceLog/AlarmLogList.vue |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/src/views/mdc/base/modules/deviceLog/AlarmLogList.vue b/src/views/mdc/base/modules/deviceLog/AlarmLogList.vue
index 40f73fd..4aa3935 100644
--- a/src/views/mdc/base/modules/deviceLog/AlarmLogList.vue
+++ b/src/views/mdc/base/modules/deviceLog/AlarmLogList.vue
@@ -77,7 +77,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)

--
Gitblit v1.9.3