From 711fa1ded12fc28f08062b5683295e95bb7927e6 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 5 Dec 2023 09:30:04 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/menu/SideMenu.vue |  2 +-
 src/components/tools/Logo.vue    | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/components/menu/SideMenu.vue b/src/components/menu/SideMenu.vue
index 3cec6b44..1d563d83 100644
--- a/src/components/menu/SideMenu.vue
+++ b/src/components/menu/SideMenu.vue
@@ -5,7 +5,7 @@
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">
-    <logo />
+    <logo :show-title="!collapsed"/>
     <s-menu
       :collapsed="collapsed"
       :menu="menus"
diff --git a/src/components/tools/Logo.vue b/src/components/tools/Logo.vue
index 444d5db5..1d8088f0 100644
--- a/src/components/tools/Logo.vue
+++ b/src/components/tools/Logo.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="logo">
+  <div class="logo" :class="!showTitle ? 'h1-logo' : ''">
     <router-link :to="routerLinkTo">
 
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
@@ -7,16 +7,15 @@
       <!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
 
-      <img v-if="showTitle" src='../../assets/image/analysisLogo.png'/>
+      <img v-if="showTitle" src='../../assets/image/analysisLogo.png' alt="logo"/>
       <!--<img src="~@/assets/image/analysisLogo.png" alt="logo">-->
-      <!--<h1 v-if="showTitle">{{ title }}</h1>-->
+      <h1 v-else>{{ title }}</h1>
     </router-link>
   </div>
 </template>
 
 <script>
 import { mixin } from '@/utils/mixin.js'
-import { mapState } from 'vuex'
 
 export default {
   name: 'Logo',
@@ -37,11 +36,6 @@ export default {
       type: Object,
       default: () => ({ name: 'dashboard' })
     }
-  },
-  computed: {
-    collapsed () {
-
-    }
   }
 }
 </script>
@@ -51,7 +45,9 @@ export default {
 
 .sider {
   box-shadow: none !important;
-
+  .h1-logo {
+    padding-left: 10px;
+  }
   .logo {
     height: @height !important;
     line-height: @height !important;
@@ -61,6 +57,7 @@ export default {
 
     h1 {
       color: @primary-color !important;
+      font-weight: 700;
     }
 
     a {