From a8771e1a819e9bd8dfdfccae564a9a8c05773281 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 24 Apr 2024 11:42:48 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2836=20fix:=20.range.text=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/mixin/globalVariables.js   | 16 ++++++++--------
 .../components/common/v-selectpagenew/methods.js |  6 +-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/globalVariables.js b/nezha-fronted/src/components/common/mixin/globalVariables.js
index 96547779f..7271ca690 100644
--- a/nezha-fronted/src/components/common/mixin/globalVariables.js
+++ b/nezha-fronted/src/components/common/mixin/globalVariables.js
@@ -120,17 +120,17 @@ export default {
       if (parseInt(range) > 60) {
         const second = parseInt(range) % 60
         let min = parseInt(range / 60)
-        time = min + 'min' + second + 's'
+        time = min + 'm' + (second ? (second + 's') : '')
 
-        if (min > 60) {
+        if (min >= 60) {
           min = parseInt(range / 60) % 60
-          let hour = parseInt(parseInt(range / 60) / 60)
-          time = hour + 'h' + min + 'min'
+          let hour = parseInt(range / 60 / 60)
+          time = hour + 'h' + (min ? (min + 'm') : '')
 
-          if (hour > 24) {
-            hour = parseInt(parseInt(range / 60) / 60) % 24
-            const day = parseInt(parseInt(parseInt(range / 60) / 60) / 24)
-            time = day + 'd' + hour + 'h'
+          if (hour >= 24) {
+            hour = parseInt(range / 60 / 60) % 24
+            const day = parseInt(range / 60 / 60 / 24)
+            time = day + 'd' + (hour ? (hour + 'h') : '')
           }
         }
       }
diff --git a/nezha-fronted/src/components/common/v-selectpagenew/methods.js b/nezha-fronted/src/components/common/v-selectpagenew/methods.js
index 4d81578f8..88276a7db 100644
--- a/nezha-fronted/src/components/common/v-selectpagenew/methods.js
+++ b/nezha-fronted/src/components/common/v-selectpagenew/methods.js
@@ -170,11 +170,7 @@ export default {
            * search content filter
            */
           if (this.search) {
-            list = list.filter(val => {
-              console.log(val[this.searchColumn])
-              console.log(this.searchColumn)
-              return new RegExp(this.search.toLowerCase()).test(val[this.searchColumn].toLowerCase())
-            })
+            list = list.filter(val => new RegExp(this.search.toLowerCase()).test(val[this.searchColumn].toLowerCase()))
           }
           this.totalRows = list.length