From 692989131f92ee6c166643d3d178c653924a6024 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 26 May 2022 14:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=96=E9=A1=B5=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/menu/SideMenu.vue     |  2 +-
 jero-web/src/components/page/GlobalHeader.vue |  2 +-
 jero-web/src/components/tools/Logo.vue        | 18 +++++++++++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/components/menu/SideMenu.vue b/jero-web/src/components/menu/SideMenu.vue
index 6cdaddbdc..adc5a8c3f 100644
--- a/jero-web/src/components/menu/SideMenu.vue
+++ b/jero-web/src/components/menu/SideMenu.vue
@@ -6,7 +6,7 @@
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">
-    <logo/>
+    <logo :collapsed="collapsed"/>
     <s-menu
       :collapsed="collapsed"
       :menu="menus"
diff --git a/jero-web/src/components/page/GlobalHeader.vue b/jero-web/src/components/page/GlobalHeader.vue
index 7e60e76ac..c2ddfcdfe 100644
--- a/jero-web/src/components/page/GlobalHeader.vue
+++ b/jero-web/src/components/page/GlobalHeader.vue
@@ -27,7 +27,7 @@
     <div v-else :class="['top-nav-header-index', theme]">
       <div class="header-index-wide">
         <div class="header-index-left" :style="topMenuStyle.headerIndexLeft">
-          <logo class="top-nav-header" :show-title="device !== 'mobile'" :style="topMenuStyle.topNavHeader"/>
+          <logo class="top-nav-header" :show-title="device !== 'mobile'"  :style="topMenuStyle.topNavHeader"/>
           <div v-if="device !== 'mobile'" :style="topMenuStyle.topSmenuStyle">
             <s-menu
               mode="horizontal"
diff --git a/jero-web/src/components/tools/Logo.vue b/jero-web/src/components/tools/Logo.vue
index 80de2eab8..42ec433a4 100644
--- a/jero-web/src/components/tools/Logo.vue
+++ b/jero-web/src/components/tools/Logo.vue
@@ -2,10 +2,11 @@
   <div class="logo">
     <router-link :to="{name:'dashboard'}">
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-      <img src="~@/assets/logo.png" alt="logo" class="logoImg">
+      <img v-if="!collapsed" src="~@/assets/logo.png" alt="logo" class="logoImg">
+      <img v-if="collapsed" src="~@/assets/logoOne.png" alt="logo" class="logoImgOne">
       <!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-      <span v-if="showTitle" class="logoTitle">{{ title }}</span>
+      <span v-if="showTitle && !collapsed" class="logoTitle">{{ title }}</span>
     </router-link>
   </div>
 </template>
@@ -26,8 +27,16 @@
         type: Boolean,
         default: true,
         required: false
+      },
+      collapsed: {
+        type: Boolean,
+        required: false,
+        default: false
       }
-    }
+    },
+     mounted() {
+       console.log(this.collapsed)
+     },
   }
 </script>
 <style lang="less" scoped>
@@ -63,6 +72,9 @@
     height: 29px;
   }
 
+  /*.logoImgOne{*/
+  /*  width: ;*/
+  /*} */
   .logoTitle {
     font-size: 25px;
     font-weight: 300 !important;