From 374247203c916f1098df3dcacc91f13d9378fcc0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 20:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E6=A0=8F=E8=8F=9C=E5=8D=95=E4=B8=8A?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 05466c2afd7cbdf8c90536a589d9da481d04084c [formerly 05466c2afd7cbdf8c90536a589d9da481d04084c [formerly 05466c2afd7cbdf8c90536a589d9da481d04084c [formerly 05466c2afd7cbdf8c90536a589d9da481d04084c [formerly b5eeb276a6288b0a4823459abd31d861e1f2fdfc [formerly 0127cb9480a76f66905cc9f2b17577985c2515c5]]]]]
Former-commit-id: 7ee5d762dad20128318a03854d30f2300a04c596
Former-commit-id: 07f32627ad9c5e4aafd204329284cfba25c3c3c1
Former-commit-id: a5ba8716f43554ceabf1be3e6d0bdffcc27623ed [formerly 0e5b1c3685d92cdf1f56048e4e4463e253677530]
Former-commit-id: 47b8417048b992b065c7bf2b411e0f8a88953158
Former-commit-id: a450a7cbd2f5c979e827c1cfdd741cea6a9f4146
Former-commit-id: df6023b040f9310fa76996ee2f787fd70706f26e
Former-commit-id: b1d4622a7601ea3cb2eae8ac58b61473366c8958
Former-commit-id: c3d6396c4e33b85a29b1583c06377cd5893adb23
---
 .../components/header-error-log/index.vue     | 24 +++++++++++++++++--
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/layout/header-aside/components/header-error-log/index.vue b/src/layout/header-aside/components/header-error-log/index.vue
index 7bef5398..d7da5836 100644
--- a/src/layout/header-aside/components/header-error-log/index.vue
+++ b/src/layout/header-aside/components/header-error-log/index.vue
@@ -1,8 +1,14 @@
 <template>
   <div>
-    <el-tooltip effect="dark" content="异常" placement="bottom">
+    <el-tooltip effect="dark" :content="tooltipContent" placement="bottom">
       <el-button class="d2-ml-0 d2-mr btn-text can-hover" type="text" @click="dialogVisible = true">
-        <d2-icon name="bug" style="font-size: 20px"/>
+        <el-badge
+          v-if="d2adminLogLength > 0"
+          :value="d2adminLogErrorLength"
+          :is-dot="d2adminLogErrorLength === 0">
+          <d2-icon name="bug" style="font-size: 20px"/>
+        </el-badge>
+        <d2-icon v-else name="bug" style="font-size: 20px"/>
       </el-button>
     </el-tooltip>
     <el-dialog
@@ -16,11 +22,25 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   data () {
     return {
       dialogVisible: false
     }
+  },
+  computed: {
+    ...mapGetters([
+      'd2adminLogLength',
+      'd2adminLogErrorLength'
+    ]),
+    tooltipContent () {
+      return this.d2adminLogLength === 0 ?
+        '没有日志或异常' :
+        `${this.d2adminLogLength} 条日志${this.d2adminLogErrorLength > 0 ?
+          ` | 包含 ${this.d2adminLogErrorLength} 个异常` :
+          ''}`
+    }
   }
 }
 </script>
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 8ca006ec..af75f22c 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-d581b883c6d0533c0ae662760c8c665af3a5eec7
\ No newline at end of file
+2bac47df865ef744c88006edd9f1302cf50ac230
\ No newline at end of file