From 7068816308663b1bb6094e81d47b565d0b8f1bf6 Mon Sep 17 00:00:00 2001
From: zhangxiaolong <zhangxiaolong@geedgenetworks.com>
Date: Thu, 14 Apr 2022 12:45:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E8=A7=A3=E5=86=B3alertMessage?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4=E9=80=89=E4=B8=AD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=86=B2=E7=AA=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/components/common/timePicker.scss          | 4 ++--
 nezha-fronted/src/components/common/timePicker.vue            | 2 +-
 nezha-fronted/src/components/page/alert/alertMessage.vue      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index 68819745a..19b319138 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -246,11 +246,11 @@
         background: #F5F5F5;
         color: #333333;
       }
-      li.active :hover {
+      li.activeLi :hover {
         background: #F5F5F5;
         color: $--color-primary !important;
       }
-      li.active {
+      li.activeLi {
         background: #F5F5F5;
         color: $--color-primary !important;
         font-weight: 400;
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index 8fd40be0d..eed500617 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -98,7 +98,7 @@
               <li
                 v-for="(item, key) in timeData"
                 @click="timeChange(item)"
-                :class="showTime.id === item.id ? 'active' : ''"
+                :class="showTime.id === item.id ? 'activeLi' : ''"
                 :key="key"
                 :v-if="item.id !== 12 || showEmpty"
 
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 9ff791b81..85558c647 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -18,7 +18,7 @@
         <button id="asset-filter" :class="[dataListLayout.indexOf('clickSearch') > -1?'is-focus':'' ]" class="top-tool-btn margin-r-10" @click.stop="showClickSearch">
           <i class="nz-icon nz-icon-funnel"></i>
         </button>
-        <pick-time v-model="searchTime" :sign="sign?sign:'message'" :default-pick="10" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
+        <pick-time v-model="searchTime" :sign="sign?sign:'message'" :default-pick="10" :refresh-data-func="getTableData" :show-empty="false" :use-chart-unit="false" :use-refresh="false"></pick-time>
         <button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcelLower')" class="top-tool-btn margin-r-10"
                 type="button" @click="showExportDialog">
           <i class="nz-icon-download1 nz-icon"></i>