Merge branch 'master' of http://172.16.23.188/tian-group/skyeye-admin-fe

src/layout/components/Logo/index.vue

@@ -5,14 +5,20 @@
       'collapsed-login': isCollapsed,
     }"
   >
-    <img src="~@/assets/images/skyeye-logo-img.png" alt="" :class="{ 'mr-2': !isCollapsed }" />
     <img
+      v-if="isCollapsed"
+      src="~@/assets/images/skyeye-logo-img.png"
+      alt=""
+      :class="{ 'mr-2': !isCollapsed }"
+    />
+    <!-- <img
       v-show="!isCollapsed || navMode === 'horizontal' || (navMode === 'horizontal-mix' && mixMenu)"
       class="mt-0 title"
       src="~@/assets/images/skyeye-logo-text.png"
       alt=""
       :class="{ 'mr-2': !isCollapsed }"
-    />
+    /> -->
+    <img v-else src="@/assets/images/skyeye-Yubei-logo.png" alt="" />
   </div>
 </template>
 
@@ -21,6 +27,7 @@
   import { useDesignSetting } from '@/hooks/setting/useDesignSetting';
   import { useProjectSetting } from '@/hooks/setting/useProjectSetting';
 
+  // NavMode的设置按钮已禁用 这里用不上 之后有需要再放开
   const { getNavTheme, getMenuWidth, getMenuMinWidth, getNavMode, getMenuSetting } =
     useProjectSetting();
   const { getDarkTheme } = useDesignSetting();
@@ -69,7 +76,7 @@
 
     img {
       width: auto;
-      height: 32px;
+      height: auto;
     }
 
     .title {