fix: some bug

pure-admin · Oct 5, 2021 · 13749c7 · 13749c7
1 parent 37a9679
commit 13749c7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue
@@ -141,7 +141,7 @@ function setTheme(layout: string, theme: string, dom: HTMLElement) {
       <el-tooltip
         class="item"
         effect="dark"
-        content="暗色主题"
+        content="左侧菜单暗色模式"
         placement="bottom"
       >
         <li
@@ -157,7 +157,7 @@ function setTheme(layout: string, theme: string, dom: HTMLElement) {
       <el-tooltip
         class="item"
         effect="dark"
-        content="亮色主题"
+        content="左侧菜单亮色模式"
         placement="bottom"
       >
         <li
@@ -173,7 +173,7 @@ function setTheme(layout: string, theme: string, dom: HTMLElement) {
       <el-tooltip
         class="item"
         effect="dark"
-        content="暗色主题"
+        content="顶部菜单暗色模式"
         placement="bottom"
       >
         <li
@@ -189,7 +189,7 @@ function setTheme(layout: string, theme: string, dom: HTMLElement) {
       <el-tooltip
         class="item"
         effect="dark"
-        content="暗色主题"
+        content="顶部菜单亮色模式"
         placement="bottom"
       >
         <li

diff --git a/src/layout/index.vue b/src/layout/index.vue
@@ -170,7 +170,9 @@ onBeforeMount(() => {
           v-show="!containerHiddenSideBar && layout.includes('vertical')"
         />
         <!-- tabs标签页 -->
-        <Horizontal v-show="layout.includes('horizontal')" />
+        <Horizontal
+          v-show="!containerHiddenSideBar && layout.includes('horizontal')"
+        />
         <tag>
           <span @click="onFullScreen">
             <fullScreen v-if="!containerHiddenSideBar" />

diff --git a/src/style/element-ui.scss b/src/style/element-ui.scss
@@ -48,7 +48,7 @@
   z-index: -1;
 }
 
-// el-tooltip,的权重
-// .is-dark {
-//   z-index: 99999 !important;
-// }
+// el-tooltip的权重
+.is-dark {
+  z-index: 99999 !important;
+}