From dcbcc775b64a490a4aabad4ca42a764a075f48b1 Mon Sep 17 00:00:00 2001
From: zouzhibing <esoul@654321>
Date: Sat, 26 Nov 2022 14:31:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=94=A5=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E7=BA=B5=E5=90=91=E6=A8=AA=E5=90=91=E5=B8=83=E5=B1=80=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=88=86=E7=A6=BB=EF=BC=8C=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E5=8F=AF=E6=89=A9=E5=B1=95=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Theme/index.vue                |  22 ++-
 src/layout/Header/index.vue                   |  63 --------
 .../HeaderHorizontal/index.scss               |  37 +++++
 .../HeaderHorizontal/index.vue                |  70 +++++++++
 src/layout/LayoutHorizontal/index.vue         |  24 +++
 .../HeaderVertical}/index.scss                |  55 ++++---
 .../LayoutVertical/HeaderVertical/index.vue   |  39 +++++
 src/layout/LayoutVertical/index.vue           |  46 ++++++
 src/layout/Sidebar/index.vue                  |  34 -----
 src/layout/{ => components}/Footer/index.vue  |   0
 src/layout/components/Header/ToolLeft.vue     |  19 +++
 src/layout/components/Header/ToolRight.vue    |  29 ++++
 .../Header/components/Avatar.vue              |   2 +-
 .../Header/components/CollapseIcon.vue        |   0
 .../Header/components/Hamburger.vue           |   0
 .../Header/components/HeaderSearch.vue        |   2 +-
 .../components/Header/components/Height.vue   |  14 ++
 .../Header/components/PersonalDialog.vue      |   0
 .../Header/components/Remind.vue              |   2 +-
 .../Header/components/ScreenFull.vue}         |  11 +-
 .../Header/components/globalComSize.vue       |   2 +-
 src/layout/components/Mobile/index.vue        |  24 +++
 .../Sidebar/components/Logo.vue               |   0
 .../Sidebar/components/Menu.vue               |   0
 .../components/Sidebar/components/SubItem.vue |  79 ++++++++++
 src/layout/components/Sidebar/index.vue       |  65 ++++++++
 .../SubMenu}/Link.vue                         |   0
 .../SubMenu}/SubItem.vue                      |   0
 .../TagsView/components/MoreButton.vue        |   0
 src/layout/index.vue                          |  51 ++++---
 src/permission.ts                             |   1 -
 src/styles/common.scss                        |  13 +-
 src/styles/element-dark.scss                  | 139 +++++++++++-------
 src/styles/sidebar.scss                       |  78 +++++-----
 src/utils/element.ts                          |   8 +-
 src/views/home/index.scss                     |   1 +
 src/views/login/components/LoginForm.vue      |   2 +-
 37 files changed, 664 insertions(+), 268 deletions(-)
 delete mode 100644 src/layout/Header/index.vue
 create mode 100644 src/layout/LayoutHorizontal/HeaderHorizontal/index.scss
 create mode 100644 src/layout/LayoutHorizontal/HeaderHorizontal/index.vue
 create mode 100644 src/layout/LayoutHorizontal/index.vue
 rename src/layout/{Header => LayoutVertical/HeaderVertical}/index.scss (65%)
 create mode 100644 src/layout/LayoutVertical/HeaderVertical/index.vue
 create mode 100644 src/layout/LayoutVertical/index.vue
 delete mode 100644 src/layout/Sidebar/index.vue
 rename src/layout/{ => components}/Footer/index.vue (100%)
 create mode 100644 src/layout/components/Header/ToolLeft.vue
 create mode 100644 src/layout/components/Header/ToolRight.vue
 rename src/layout/{ => components}/Header/components/Avatar.vue (98%)
 rename src/layout/{ => components}/Header/components/CollapseIcon.vue (100%)
 rename src/layout/{ => components}/Header/components/Hamburger.vue (100%)
 rename src/layout/{ => components}/Header/components/HeaderSearch.vue (97%)
 create mode 100644 src/layout/components/Header/components/Height.vue
 rename src/layout/{ => components}/Header/components/PersonalDialog.vue (100%)
 rename src/layout/{ => components}/Header/components/Remind.vue (95%)
 rename src/layout/{Header/components/Screenfull.vue => components/Header/components/ScreenFull.vue} (63%)
 rename src/layout/{ => components}/Header/components/globalComSize.vue (90%)
 create mode 100644 src/layout/components/Mobile/index.vue
 rename src/layout/{ => components}/Sidebar/components/Logo.vue (100%)
 rename src/layout/{ => components}/Sidebar/components/Menu.vue (100%)
 create mode 100644 src/layout/components/Sidebar/components/SubItem.vue
 create mode 100644 src/layout/components/Sidebar/index.vue
 rename src/layout/{Sidebar/components => components/SubMenu}/Link.vue (100%)
 rename src/layout/{Sidebar/components => components/SubMenu}/SubItem.vue (100%)
 rename src/layout/{ => components}/TagsView/components/MoreButton.vue (100%)

diff --git a/src/components/Theme/index.vue b/src/components/Theme/index.vue
index b6df865..91b8ffc 100644
--- a/src/components/Theme/index.vue
+++ b/src/components/Theme/index.vue
@@ -63,9 +63,9 @@
 </template>
 
 <script lang="ts" setup>
-  import {computed, ref} from 'vue'
+  import {computed, ref,watch} from 'vue'
   import {ElMessage} from "element-plus";
-
+  import {openLoading,closeLoading} from "@/utils/element"
   import SwitchDark from '@/components/SwitchDark/index.vue'
   import {PRIMARY_COLOR} from "@/config/index";
   import {useSettingStore} from "@/store/modules/setting"
@@ -86,7 +86,9 @@
       return SettingStore.themeConfig.showSetting;
     },
     set() {
+
       changeSwitch('showSetting',!SettingStore.themeConfig.showSetting)
+
     }
   })
 
@@ -109,8 +111,24 @@
   // 进行配置
   const changeSwitch = (key,val) => {
     SettingStore.setThemeConfig({key, val})
+    if(key==='mode'){
+      openLoading()
+      setTimeout(()=>{
+        closeLoading()
+      },600)
+    }
   }
 
+  // 监听布局变化
+  watch(
+      () => layout.value,
+      () => {
+        const body = document.body as HTMLElement;
+        body.setAttribute("class", `layout-${layout.value}`);
+      },
+      { immediate: true }
+  );
+
   // 修改主题颜色
   const changePrimary = (val)=>{
     if (!val) {
diff --git a/src/layout/Header/index.vue b/src/layout/Header/index.vue
deleted file mode 100644
index 2fe5821..0000000
--- a/src/layout/Header/index.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<template>
-  <div
-    class="m-layout-header"
-    :class="[
-          SettingStore.themeConfig.fixedHeader?'zb-fixed-header':'zb-no-fixed-header',
-          mode === 'horizontal'?'':isCollapse?'fixed-header-collapse':'fixed-header-no-collapse'
-        ]"
-  >
-    <div class="header" :class="{  transverseMenu: mode === 'horizontal', }">
-      <UMenu v-if="mode === 'horizontal'" />
-
-      <div class="left" v-if="mode === 'vertical'">
-        <CollapseIcon/>
-        <Hamburger />
-      </div>
-
-      <div class="tool-bar-right">
-        <GlobalComSize class="right-item-menu"/>
-        <HeaderSearch class="right-item-menu"/>
-        <Remind class="right-item-menu"/>
-        <ScreenFull class="right-item-menu"/>
-        <Setting class="right-item-menu"/>
-        <Avatar/>
-      </div>
-    </div>
-    <tag-views v-if="showTag" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { UserFilled } from '@element-plus/icons-vue'
-  import TagViews from '../TagsView/index.vue'
-  import GlobalComSize from './components/globalComSize.vue'
-  import Hamburger from './components/Hamburger.vue'
-  import Setting from './components/Setting.vue'
-  import ScreenFull from './components/ScreenFull.vue'
-  import Remind from './components/Remind'
-  import HeaderSearch from './components/HeaderSearch'
-  import CollapseIcon from './components/CollapseIcon'
-  import Avatar from './components/Avatar'
-  import UMenu from '../Sidebar/components/Menu.vue'
-  import { computed, ref } from 'vue'
-  import { useRouter } from 'vue-router'
-  import {useSettingStore} from "@/store/modules/setting"
-
-  const person = ref()
-  const router = useRouter()
-  const SettingStore = useSettingStore()
-
-  const isCollapse = computed(() =>!SettingStore.isCollapse)
-  // menu 布局
-  const mode = computed(() => SettingStore.themeConfig.mode)
-  // 显示 tag
-  const showTag = computed(() =>SettingStore.themeConfig.showTag)
-
-  const handleCollapse = () => {
-    SettingStore.setCollapse(isCollapse.value)
-  }
-</script>
-
-<style lang="scss" scoped>
-@import "./index";
-</style>
diff --git a/src/layout/LayoutHorizontal/HeaderHorizontal/index.scss b/src/layout/LayoutHorizontal/HeaderHorizontal/index.scss
new file mode 100644
index 0000000..88a2f78
--- /dev/null
+++ b/src/layout/LayoutHorizontal/HeaderHorizontal/index.scss
@@ -0,0 +1,37 @@
+.m-layout-header {
+  width: 100%;
+  transition: width 0.28s;
+  flex-shrink: 0;
+  box-sizing: border-box;
+  box-shadow: 0 1px 4px rgb(0 21 41 / 8%);
+  .header-inner {
+    height: 50px;
+    width: 100%;
+    border-bottom: 1px solid #eee;
+    display: flex;
+    background-color:$menuBg;
+    align-items: center;
+    padding: 0 10px 0 0;
+    box-sizing: border-box;
+    justify-content: space-between;
+  }
+}
+.fixed-header{
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+}
+
+.menu-horizontal{
+  flex: 1;
+  overflow: hidden;
+  height: 100%;
+  margin-right:20px;
+  :deep(.el-menu-item){
+    height: 100%;
+  }
+}
+
+
+
diff --git a/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue b/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue
new file mode 100644
index 0000000..2d58780
--- /dev/null
+++ b/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue
@@ -0,0 +1,70 @@
+<template>
+  <!--纵向布局-->
+  <Height/>
+  <div
+      class="m-layout-header"
+      :class="{
+          'fixed-header':themeConfig.fixedHeader,
+      }">
+    <div class="header-inner">
+      <el-menu
+          mode="horizontal"
+          :default-active="activeMenu"
+          background-color="#304156"
+          text-color="#bfcbd9"
+          :unique-opened="SettingStore.themeConfig.uniqueOpened"
+          :collapse-transition="false"
+          class="menu-horizontal"
+          :collapse="isCollapse"
+      >
+        <SubItem
+            v-for="route in permission_routes"
+            :key="route.path"
+            :item="route"
+            :base-path="route.path"
+        />
+      </el-menu>
+      <HeaderToolRight/>
+    </div>
+    <TagsView v-if="themeConfig.showTag"/>
+  </div>
+
+</template>
+
+<script lang="ts" setup>
+// 引入组件
+import Height from '../../components/Header/components/Height.vue'
+import HeaderToolRight from '../../components/Header/ToolRight.vue'
+import TagsView from '../../components/TagsView/index.vue'
+import SubItem from '../../components/SubMenu/SubItem.vue'
+import { useRoute } from 'vue-router'
+import {usePermissionStore} from "@/store/modules/permission"
+const PermissionStore = usePermissionStore()
+
+const route = useRoute()
+
+// 获取路由
+const permission_routes = computed(() => PermissionStore.permission_routes)
+import {computed} from "vue";
+import {useSettingStore} from "@/store/modules/setting"
+const SettingStore = useSettingStore()
+
+const activeMenu = computed(() => {
+  const { meta, path } = route
+  if (meta.activeMenu) {
+    return meta.activeMenu
+  }
+  return path
+})
+
+
+// 主题配置
+const themeConfig = computed(() =>SettingStore.themeConfig)
+const isCollapse = computed(() =>!SettingStore.isCollapse)
+</script>
+
+<style lang="scss" scoped>
+@import "./index.scss";
+
+</style>
+
diff --git a/src/layout/LayoutHorizontal/index.vue b/src/layout/LayoutHorizontal/index.vue
new file mode 100644
index 0000000..cd3f6ed
--- /dev/null
+++ b/src/layout/LayoutHorizontal/index.vue
@@ -0,0 +1,24 @@
+<template>
+  <div class="main-container">
+    <UHeader/>
+    <Main/>
+    <Footer/>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Sidebar from '../components/Sidebar/index.vue'
+import UHeader from './HeaderHorizontal/index.vue'
+import Main from '../components/Main/index.vue'
+import Footer from '../components/Footer/index.vue'
+</script>
+
+<style lang="scss" scoped>
+.main-container{
+  display: flex;
+  flex: 1;
+  box-sizing: border-box;
+  flex-direction: column;
+  min-height: 100%;
+}
+</style>
diff --git a/src/layout/Header/index.scss b/src/layout/LayoutVertical/HeaderVertical/index.scss
similarity index 65%
rename from src/layout/Header/index.scss
rename to src/layout/LayoutVertical/HeaderVertical/index.scss
index 348f1a6..cb74e49 100644
--- a/src/layout/Header/index.scss
+++ b/src/layout/LayoutVertical/HeaderVertical/index.scss
@@ -4,34 +4,11 @@
     width: 100%!important;
   }
 }
-.header {
-  height: 50px;
-  width: 100%;
-  border-bottom: 1px solid #eee;
-  display: flex;
-  align-items: center;
-  padding: 0 10px 0 0;
-  box-sizing: border-box;
-  justify-content: space-between;
-  .left {
-    display: flex;
-    align-items: center;
-    height: 100%;
-  }
-  .tool-bar-right {
-    display: flex;
-    align-items: center;
-    .right-item-menu{
-      margin-right: 22px;
-    }
-  }
-}
-.zb-fixed-header{
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 9;
+.show-tag{
+  height: 90px;
 }
+
+
 .zb-no-fixed-header{
   width: 100%!important;;
 }
@@ -43,13 +20,33 @@
   flex-shrink: 0;
   box-sizing: border-box;
   box-shadow: 0 1px 4px rgb(0 21 41 / 8%);
+
+  .header-inner {
+    height: 50px;
+    width: 100%;
+    border-bottom: 1px solid #eee;
+    display: flex;
+    align-items: center;
+    padding: 0 10px 0 0;
+    box-sizing: border-box;
+    justify-content: space-between;
+  }
 }
-.fixed-header-collapse{
+.fixed-header{
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+}
+.collapse{
   width: calc(100% - 60px);
 }
-.fixed-header-no-collapse{
+.no-collapse{
   width: calc(100% - 210px);
 }
+
+
+
 .el-dropdown {
   display: flex;
   height: 100%;
diff --git a/src/layout/LayoutVertical/HeaderVertical/index.vue b/src/layout/LayoutVertical/HeaderVertical/index.vue
new file mode 100644
index 0000000..51d7f29
--- /dev/null
+++ b/src/layout/LayoutVertical/HeaderVertical/index.vue
@@ -0,0 +1,39 @@
+<template>
+  <!--纵向布局-->
+  <Height/>
+  <div
+      class="m-layout-header"
+      :class="{
+          'fixed-header':themeConfig.fixedHeader,
+          'collapse':themeConfig.fixedHeader&&isCollapse,
+          'no-collapse':themeConfig.fixedHeader&&!isCollapse
+      }">
+    <div class="header-inner">
+      <HeaderToolLeft/>
+      <HeaderToolRight/>
+    </div>
+    <TagsView v-if="themeConfig.showTag"/>
+  </div>
+
+</template>
+
+<script lang="ts" setup>
+// 引入组件
+import Height from '../../components/Header/components/Height.vue'
+import HeaderToolRight from '../../components/Header/ToolRight.vue'
+import HeaderToolLeft from '../../components/Header/ToolLeft.vue'
+import TagsView from '../../components/TagsView/index.vue'
+
+import {computed} from "vue";
+import {useSettingStore} from "@/store/modules/setting"
+const SettingStore = useSettingStore()
+
+// 主题配置
+const themeConfig = computed(() =>SettingStore.themeConfig)
+const isCollapse = computed(() =>!SettingStore.isCollapse)
+</script>
+
+<style lang="scss" scoped>
+@import "./index.scss";
+</style>
+
diff --git a/src/layout/LayoutVertical/index.vue b/src/layout/LayoutVertical/index.vue
new file mode 100644
index 0000000..e3c6a67
--- /dev/null
+++ b/src/layout/LayoutVertical/index.vue
@@ -0,0 +1,46 @@
+<template>
+  <!--纵向布局-->
+  <Sidebar/>
+  <div class="main-container">
+      <HeaderVertical/>
+      <Main/>
+      <Footer/>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Sidebar from '../components/Sidebar/index.vue'
+import HeaderVertical from './HeaderVertical/index.vue'
+import Main from '../components/Main/index.vue'
+import Footer from '../components/Footer/index.vue'
+</script>
+
+<style lang="scss" scoped>
+.g-container-layout {
+  height: 100%;
+  width: 100%;
+  .main-container {
+    display: flex;
+    flex: 1;
+    box-sizing: border-box;
+    flex-direction: column;
+  }
+  &.mobile.openSidebar {
+    position: fixed;
+    top: 0;
+  }
+}
+.sidebar-container {
+  display: flex;
+  flex-direction: column;
+}
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 90;
+}
+</style>
diff --git a/src/layout/Sidebar/index.vue b/src/layout/Sidebar/index.vue
deleted file mode 100644
index f5e0cf5..0000000
--- a/src/layout/Sidebar/index.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div :class="{ 'has-logo': themeConfig.showLogo }">
-    <logo :isCollapse="isCollapse" v-if="themeConfig.showLogo"/>
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <u-menu/>
-    </el-scrollbar>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import UMenu from './components/Menu.vue'
-import logo from './components/Logo.vue'
-import {useSettingStore} from "@/store/modules/setting"
-import { computed } from 'vue'
-
-const SettingStore = useSettingStore()
-// 是否折叠
-const isCollapse = computed(() => !SettingStore.isCollapse)
-// 设置
-const themeConfig = computed(() =>SettingStore.themeConfig )
-</script>
-
-<style lang="scss">
-.el-menu-vertical-demo:not(.el-menu--collapse) {
-  //width: 200px;
-  height: 100%;
-}
-.crollbar-wrapper {
-  height: 100%;
-  .el-scrollbar__view {
-    height: 100%;
-  }
-}
-</style>
diff --git a/src/layout/Footer/index.vue b/src/layout/components/Footer/index.vue
similarity index 100%
rename from src/layout/Footer/index.vue
rename to src/layout/components/Footer/index.vue
diff --git a/src/layout/components/Header/ToolLeft.vue b/src/layout/components/Header/ToolLeft.vue
new file mode 100644
index 0000000..239d5f3
--- /dev/null
+++ b/src/layout/components/Header/ToolLeft.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="m-tool-left">
+    <CollapseIcon/>
+    <Hamburger />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import CollapseIcon from './components/CollapseIcon.vue'
+import Hamburger from './components/Hamburger.vue'
+</script>
+
+<style lang="scss" scoped>
+.m-tool-left{
+  display: flex;
+  align-items: center;
+  height: 100%;
+}
+</style>
diff --git a/src/layout/components/Header/ToolRight.vue b/src/layout/components/Header/ToolRight.vue
new file mode 100644
index 0000000..a0c5497
--- /dev/null
+++ b/src/layout/components/Header/ToolRight.vue
@@ -0,0 +1,29 @@
+<template>
+  <div class="m-tool-right">
+    <GlobalComSize class="item-children"/>
+    <HeaderSearch class="item-children"/>
+    <Remind class="item-children"/>
+    <ScreenFull class="item-children"/>
+    <Setting class="item-children"/>
+    <Avatar/>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import GlobalComSize from './components/globalComSize.vue'
+import HeaderSearch from './components/HeaderSearch'
+import Remind from './components/Remind'
+import ScreenFull from './components/ScreenFull.vue'
+import Setting from './components/Setting.vue'
+import Avatar from './components/Avatar'
+</script>
+
+<style lang="scss" scoped>
+.m-tool-right{
+  display: flex;
+  align-items: center;
+  .item-children{
+    margin-right: 22px;
+  }
+}
+</style>
diff --git a/src/layout/Header/components/Avatar.vue b/src/layout/components/Header/components/Avatar.vue
similarity index 98%
rename from src/layout/Header/components/Avatar.vue
rename to src/layout/components/Header/components/Avatar.vue
index ba9613a..690aea6 100644
--- a/src/layout/Header/components/Avatar.vue
+++ b/src/layout/components/Header/components/Avatar.vue
@@ -3,7 +3,7 @@
         <span class="el-dropdown-link">
           <el-avatar :size="30" class="avatar" :src="AvatarLogo"/>
           {{userInfo.username}}
-          <el-icon class="el-icon--right">
+          <el-icon class="header-icon el-icon--right">
             <arrow-down />
           </el-icon>
         </span>
diff --git a/src/layout/Header/components/CollapseIcon.vue b/src/layout/components/Header/components/CollapseIcon.vue
similarity index 100%
rename from src/layout/Header/components/CollapseIcon.vue
rename to src/layout/components/Header/components/CollapseIcon.vue
diff --git a/src/layout/Header/components/Hamburger.vue b/src/layout/components/Header/components/Hamburger.vue
similarity index 100%
rename from src/layout/Header/components/Hamburger.vue
rename to src/layout/components/Header/components/Hamburger.vue
diff --git a/src/layout/Header/components/HeaderSearch.vue b/src/layout/components/Header/components/HeaderSearch.vue
similarity index 97%
rename from src/layout/Header/components/HeaderSearch.vue
rename to src/layout/components/Header/components/HeaderSearch.vue
index e7479ec..4624526 100644
--- a/src/layout/Header/components/HeaderSearch.vue
+++ b/src/layout/components/Header/components/HeaderSearch.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="m-headerSearch">
     <el-tooltip effect="dark" content="菜单搜索" placement="bottom">
-      <el-icon class="bell" style="font-size: 22px;" @click="handleSearch"><Search /></el-icon>
+      <el-icon class="bell header-icon" style="font-size: 22px;" @click="handleSearch"><Search /></el-icon>
     </el-tooltip>
     <el-dialog v-model="isShowSearch" width="600px" destroy-on-close   :show-close="false">
       <el-select
diff --git a/src/layout/components/Header/components/Height.vue b/src/layout/components/Header/components/Height.vue
new file mode 100644
index 0000000..d2d0c01
--- /dev/null
+++ b/src/layout/components/Header/components/Height.vue
@@ -0,0 +1,14 @@
+<template>
+  <div
+      :style="{ height:`${themeConfig.showTag?90:50}px`}"
+      v-if="themeConfig.fixedHeader">
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {computed} from "vue";
+import {useSettingStore} from "@/store/modules/setting"
+const SettingStore = useSettingStore()
+const themeConfig = computed(()=>SettingStore.themeConfig)
+</script>
+
diff --git a/src/layout/Header/components/PersonalDialog.vue b/src/layout/components/Header/components/PersonalDialog.vue
similarity index 100%
rename from src/layout/Header/components/PersonalDialog.vue
rename to src/layout/components/Header/components/PersonalDialog.vue
diff --git a/src/layout/Header/components/Remind.vue b/src/layout/components/Header/components/Remind.vue
similarity index 95%
rename from src/layout/Header/components/Remind.vue
rename to src/layout/components/Header/components/Remind.vue
index 087a550..1d88838 100644
--- a/src/layout/Header/components/Remind.vue
+++ b/src/layout/components/Header/components/Remind.vue
@@ -3,7 +3,7 @@
     <el-popover width="200px" placement="bottom">
       <template #reference>
         <el-badge :value="3" class="item-info-pop">
-          <el-icon class="bell" style="font-size: 20px;"><Bell /></el-icon>
+          <el-icon class="bell header-icon" style="font-size: 20px;"><Bell /></el-icon>
         </el-badge>
       </template>
       <div>
diff --git a/src/layout/Header/components/Screenfull.vue b/src/layout/components/Header/components/ScreenFull.vue
similarity index 63%
rename from src/layout/Header/components/Screenfull.vue
rename to src/layout/components/Header/components/ScreenFull.vue
index 6b8cd84..f1b8356 100644
--- a/src/layout/Header/components/Screenfull.vue
+++ b/src/layout/components/Header/components/ScreenFull.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="m-screenful">
-    <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" @click="toggle" class="full-screen"/>
+    <el-tooltip effect="dark" content="全屏" placement="bottom">
+      <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" @click="toggle"
+         className="header-icon"
+      />
+    </el-tooltip>
   </div>
 </template>
 
@@ -18,9 +22,4 @@ const { toggle, isFullscreen } = useFullscreen();
   cursor: pointer;
   transition: all 0.3s;
 }
-.transverseMenu {
-  .full-screen {
-    color: white;
-  }
-}
 </style>
diff --git a/src/layout/Header/components/globalComSize.vue b/src/layout/components/Header/components/globalComSize.vue
similarity index 90%
rename from src/layout/Header/components/globalComSize.vue
rename to src/layout/components/Header/components/globalComSize.vue
index 20701d3..38c2ee8 100644
--- a/src/layout/Header/components/globalComSize.vue
+++ b/src/layout/components/Header/components/globalComSize.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dropdown trigger="hover" @command="setAssemblySize">
-    <svg-icon class-name="size-icon" icon-class="size" style="font-size: 20px;cursor: pointer"/>
+    <svg-icon class-name="size-icon header-icon" icon-class="size" style="font-size: 20px;cursor: pointer"/>
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item v-for="item in assemblySizeList" :key="item" :disabled="globalComSize === item" :command="item">
diff --git a/src/layout/components/Mobile/index.vue b/src/layout/components/Mobile/index.vue
new file mode 100644
index 0000000..85bc13f
--- /dev/null
+++ b/src/layout/components/Mobile/index.vue
@@ -0,0 +1,24 @@
+<template>
+  <div v-if="device === 'mobile' && !isCollapse" class="drawer-bg" @click="handleClickOutside" />
+</template>
+
+<script lang="ts" setup>
+import {computed} from "vue";
+import { useResizeHandler } from '../../hooks/useResizeHandler'
+import {useSettingStore} from "@/store/modules/setting"
+
+let { device } = useResizeHandler()
+const SettingStore = useSettingStore()
+
+// 是否折叠
+const isCollapse = computed(() => !SettingStore.isCollapse)
+
+// 移动端点击
+const handleClickOutside = () => {
+  SettingStore.closeSideBar({ withoutAnimation: false })
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/layout/Sidebar/components/Logo.vue b/src/layout/components/Sidebar/components/Logo.vue
similarity index 100%
rename from src/layout/Sidebar/components/Logo.vue
rename to src/layout/components/Sidebar/components/Logo.vue
diff --git a/src/layout/Sidebar/components/Menu.vue b/src/layout/components/Sidebar/components/Menu.vue
similarity index 100%
rename from src/layout/Sidebar/components/Menu.vue
rename to src/layout/components/Sidebar/components/Menu.vue
diff --git a/src/layout/components/Sidebar/components/SubItem.vue b/src/layout/components/Sidebar/components/SubItem.vue
new file mode 100644
index 0000000..e61182d
--- /dev/null
+++ b/src/layout/components/Sidebar/components/SubItem.vue
@@ -0,0 +1,79 @@
+<template>
+  <template v-if="!item.hidden">
+    <template v-if="!item.alwaysShow && hasOneShowingChild(item.children, item)">
+      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
+        <el-menu-item :index="resolvePath(onlyOneChild.path)">
+          <el-icon :size="20">
+            <component :is="onlyOneChild?.meta.icon"></component>
+          </el-icon>
+          <template #title>{{ onlyOneChild.meta && onlyOneChild.meta.title }}</template>
+        </el-menu-item>
+      </app-link>
+    </template>
+    <el-sub-menu :index="resolvePath(item.path)" v-else popper-append-to-body>
+      <template #title>
+        <el-icon :size="20"> <component :is="item.meta?.icon"></component></el-icon>
+        <span>{{ item.meta && item.meta.title }}</span>
+      </template>
+      <sub-item
+          v-for="child in item.children"
+          :key="child.path"
+          :item="child"
+          :base-path="resolvePath(child.path)"
+      />
+    </el-sub-menu>
+  </template>
+</template>
+
+<script lang="ts" setup>
+import { isExternal } from '@/utils/validate.js'
+import AppLink from '../../SubMenu/Link.vue'
+import path from 'path-browserify'
+import { ref, computed } from 'vue'
+const props = defineProps({
+  item: {
+    type: Object,
+    required: true,
+  },
+  basePath: {
+    type: String,
+    default: '',
+  },
+})
+
+const onlyOneChild = ref(null)
+const hasOneShowingChild = (children = [], parent) => {
+  const showingChildren = children.filter((item) => {
+    // 过滤掉需要隐藏的菜单
+    if (item.hidden) {
+      return false
+    } else {
+      // 临时设置（如果只有一个显示子项，则将使用）
+      onlyOneChild.value = item
+      return true
+    }
+  })
+
+  // 当只有一个子路由器时，默认情况下会显示该子路由器
+  if (showingChildren.length === 1) {
+    return true
+  }
+  // 如果没有要显示的子路由器，则显示父路由器
+  if (showingChildren.length === 0) {
+    onlyOneChild.value = { ...parent, path: '', noShowingChildren: true }
+    return true
+  }
+
+  return false
+}
+
+const resolvePath = (routePath) => {
+  if (isExternal(routePath)) {
+    return routePath
+  }
+  if (isExternal(props.basePath)) {
+    return props.basePath
+  }
+  return path.resolve(props.basePath, routePath)
+}
+</script>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
new file mode 100644
index 0000000..33568f1
--- /dev/null
+++ b/src/layout/components/Sidebar/index.vue
@@ -0,0 +1,65 @@
+<template>
+  <div  class="sidebar-container" :class="{ 'has-logo': themeConfig.showLogo }">
+    <Logo :isCollapse="isCollapse" v-if="themeConfig.showLogo"/>
+    <el-scrollbar wrap-class="scrollbar-wrapper">
+      <el-menu
+          :default-active="activeMenu"
+          background-color="#304156"
+          text-color="#bfcbd9"
+          :unique-opened="SettingStore.themeConfig.uniqueOpened"
+          :collapse-transition="false"
+          class="el-menu-vertical-demo"
+          :collapse="isCollapse"
+      >
+        <SubItem
+            v-for="route in permission_routes"
+            :key="route.path"
+            :item="route"
+            :base-path="route.path"
+        />
+      </el-menu>
+    </el-scrollbar>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Logo from './components/Logo.vue'
+import SubItem from '../SubMenu/SubItem.vue'
+import {useSettingStore} from "@/store/modules/setting"
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
+import {usePermissionStore} from "@/store/modules/permission"
+// 在setup中获取store
+const route = useRoute()
+const PermissionStore = usePermissionStore()
+const SettingStore = useSettingStore()
+
+
+
+// 是否折叠
+const isCollapse = computed(() => !SettingStore.isCollapse)
+// 设置
+const themeConfig = computed(() =>SettingStore.themeConfig )
+
+// 获取路由
+const permission_routes = computed(() => PermissionStore.permission_routes)
+
+const activeMenu = computed(() => {
+  const { meta, path } = route
+  // if set path, the sidebar will highlight the path you set
+  if (meta.activeMenu) {
+    return meta.activeMenu
+  }
+  return path
+})
+
+
+// 横向
+const mode = computed(() => SettingStore.themeConfig.mode)
+</script>
+
+<style lang="scss">
+.el-menu-vertical-demo:not(.el-menu--collapse) {
+  height: 100%;
+}
+</style>
diff --git a/src/layout/Sidebar/components/Link.vue b/src/layout/components/SubMenu/Link.vue
similarity index 100%
rename from src/layout/Sidebar/components/Link.vue
rename to src/layout/components/SubMenu/Link.vue
diff --git a/src/layout/Sidebar/components/SubItem.vue b/src/layout/components/SubMenu/SubItem.vue
similarity index 100%
rename from src/layout/Sidebar/components/SubItem.vue
rename to src/layout/components/SubMenu/SubItem.vue
diff --git a/src/layout/TagsView/components/MoreButton.vue b/src/layout/components/TagsView/components/MoreButton.vue
similarity index 100%
rename from src/layout/TagsView/components/MoreButton.vue
rename to src/layout/components/TagsView/components/MoreButton.vue
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 69d63fc..0591aaf 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,37 +1,44 @@
 <template>
   <div class="g-container-layout" :class="classObj">
-    <div v-if="device === 'mobile' && !isCollapse" class="drawer-bg" @click="handleClickOutside" />
-    <Sidebar class="sidebar-container" v-if="mode === 'vertical'" />
-    <div
-      class="main-container"
-      :class="{
-        hideSliderLayout: mode === 'horizontal',
-      }"
-    >
-      <div :style="{ height:`${showTag?90:50}px`  }" v-if="SettingStore.themeConfig.fixedHeader"></div>
-      <UHeader/>
-      <Main/>
-      <Footer/>
-    </div>
+    <Mobile/>
+    <LayoutVertical v-if="device === 'mobile'"/>
+    <component :is="LayoutComponents[themeConfig.mode]" v-else/>
+    <Theme />
   </div>
 </template>
 
 <script lang="ts" setup>
-  import { computed, defineComponent, ref } from 'vue'
+  import { computed,watch } from 'vue'
+  import Theme from '@/components/Theme/index.vue'
+  import Mobile from './components/Mobile/index.vue'
   import {useSettingStore} from "@/store/modules/setting"
-  import Sidebar from './Sidebar/index.vue'
-  import UHeader from './Header/index.vue'
-  import Main from './Main/index.vue'
-  import Footer from './Footer/index.vue'
   import { useResizeHandler } from './hooks/useResizeHandler'
+  import LayoutVertical from './LayoutVertical/index.vue'
+  import LayoutHorizontal from './LayoutHorizontal/index.vue'
 
   const SettingStore = useSettingStore()
+  const themeConfig = computed(() => SettingStore.themeConfig)
+  const LayoutComponents = {
+    horizontal: LayoutHorizontal,
+    vertical: LayoutVertical,
+  };
 
   // 是否折叠
   const isCollapse = computed(() => {
     return !SettingStore.isCollapse
   })
   let { device } = useResizeHandler()
+
+  watch(()=>device.value,(val)=>{
+    console.log('themeConfig.value.mode',themeConfig.value.mode)
+    let vertical = val==='mobile'?'vertical':themeConfig.value.mode
+    const body = document.body as HTMLElement;
+    body.setAttribute("class", `layout-${vertical}`);
+  },{
+    immediate:true
+  })
+
+
   // 当屏幕切换的时候进行变换
   const classObj = computed(() => {
     return {
@@ -41,13 +48,9 @@
       mobile: device.value === 'mobile',
     }
   })
-  // 移动端点击
-  const handleClickOutside = () => {
-    SettingStore.closeSideBar({ withoutAnimation: false })
-  }
-  const showTag = computed(() => SettingStore.themeConfig.showTag)
 
-  const mode = computed(() => SettingStore.themeConfig.mode)
+
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/permission.ts b/src/permission.ts
index b4e5ef5..b1b0db7 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -33,7 +33,6 @@ router.beforeEach(async(to, from, next) => {
                 const accessRoutes = await PermissionStore.generateRoutes(UserStore.roles)
                 hasRoles = false
                 accessRoutes.forEach(item => router.addRoute(item)) // 动态添加访问路由表
-                console.log('accessRoutes',accessRoutes)
                 next({ ...to, replace: true }) // // 这里相当于push到一个页面 不在进入路由拦截
             }else {
                 next() // // 如果不传参数就会重新执行路由拦截，重新进到这里
diff --git a/src/styles/common.scss b/src/styles/common.scss
index b5bfa7b..87639fa 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -11,6 +11,7 @@ body{
   background: #f0f2f5;
 }
 
+
 /* 常用 flex */
 .flex-center {
   display: flex;
@@ -55,8 +56,6 @@ body{
 }
 
 
-
-
 /* nprogress样式 */
 #nprogress .bar {
   background: $primaryColor !important;
@@ -85,3 +84,13 @@ body{
   padding: 20px;
   box-sizing: border-box;
 }
+
+.layout-horizontal{
+  .header-icon{
+    color:#bfcbd9!important;
+  }
+  .el-dropdown-link{
+    color:#bfcbd9!important;
+  }
+}
+
diff --git a/src/styles/element-dark.scss b/src/styles/element-dark.scss
index 02485db..db0692c 100644
--- a/src/styles/element-dark.scss
+++ b/src/styles/element-dark.scss
@@ -58,22 +58,8 @@ html.dark {
   body{
     background: none;
   }
-  .tags-wrap-container{
-    border: var(--zb-border-light);
-    border-top:none ;
-    border-left: none;
-    box-sizing: border-box;
 
-    .tags-view{
-      background: none;
-    }
-  }
-  .m-container-layout{
-    .m-container-layout-inner{
-      background: none;
-      color: var(--el-text-color-primary) !important;
-    }
-  }
+
   // 编辑器
   .w-e-toolbar, .w-e-text-container, .w-e-menu-panel{
     background: none!important;
@@ -85,7 +71,7 @@ html.dark {
 
   #app{
     .sidebar-container{
-      background: none!important;
+      background: var(--el-bg-color)!important;
       & .el-menu .el-sub-menu > .el-sub-menu__title,
       & .el-sub-menu .el-menu-item {
         background-color: var(--el-bg-color) !important;
@@ -104,31 +90,11 @@ html.dark {
       }
     }
   }
-  .zb-pro-table .header{
-    background: none!important;
-    border: var(--zb-border-light);
-  }
-  .zb-pro-table .footer{
-    background: none!important;
-    border: var(--zb-border-light);
-  }
-  // m-layout-header
-  .m-layout-header{
-    color: var(--el-text-color-primary) !important;
-    background: none;
-    .header{
-      border:var(--zb-border-light);
-      border-left:none ;
-    }
 
-  }
-  .el-scrollbar{
-    border:var(--zb-border-light);
-    border-top:none ;
-  }
+
+
   .sidebar-logo-container{
     background: none;
-    height: 60px;
     box-sizing: border-box;
     border:var(--zb-border-light);
   }
@@ -141,12 +107,6 @@ html.dark {
     color: var(--el-text-color-primary) !important;
   }
 
-  // icon
-  .m-info .bell,
-  .m-setting .bell,
-  .m-headerSearch .bell{
-    color: white!important;
-  }
 
   .el-table__header th {
     font-weight: bold;
@@ -156,25 +116,90 @@ html.dark {
     background: none;
     color: white;
   }
-  .app-container-inner{
-    background: none;
-  }
-  .list-group-item{
-    background: none!important;
-    border: 1px solid white;
-  }
-  .app-container{
+
+
+  .zb-pro-table{
     .header{
-      background: none;
+      background: none!important;
+      border: var(--zb-border-light);
     }
     .footer{
+      background: none!important;
+      border: var(--zb-border-light);
+    }
+    .el-table__header th{
+      color: white!important;
+    }
+  }
+
+  // header
+  .m-layout-header{
+    color: var(--el-text-color-primary) !important;
+    .header-inner{
+      background-color: var(--el-bg-color)!important;
+      border-bottom:var(--zb-border-light);
+      .header-icon{
+        color:#bfcbd9!important;
+      }
+    }
+    // tagviews
+    .m-tags-view{
+      background: var(--el-bg-color)!important;
+      border: var(--zb-border-light);
+      border-top:none ;
+      border-left: none;
+      box-sizing: border-box;
+      .el-tabs--card>.el-tabs__header{
+        border-bottom: none!important;
+      }
+    }
+
+
+  }
+
+  // 内容区
+  .app-main{
+    .echarts-map{
+      background: var(--el-bg-color)!important;
+    }
+    .app-echarts{
+      background: none;
+    }
+
+    .app-container{
+      .header{
+        background: none;
+      }
+      .footer{
+        background: none;
+      }
+    }
+    .m-container-layout{
+      .m-container-layout-inner{
+        background: none;
+        color: var(--el-text-color-primary) !important;
+      }
+    }
+
+    .item-group-item{
+      background: none!important;
+      border: var(--zb-border-light);
+      color: #cccccc;
+    }
+
+    .app-container-inner{
       background: none;
     }
   }
-  .zb-pro-table .el-table__header th{
-    color: white!important;
+
+  // 底部
+  .footer-layout{
+    border-top:var(--zb-border-light);
   }
 
+
+
+  // 登录
   .login-container {
     background-color: var(--el-fill-color-extra-light) !important;
     .login-box {
@@ -189,4 +214,8 @@ html.dark {
     }
   }
 
+  .el-scrollbar{
+    border:var(--zb-border-light);
+    border-top:none ;
+  }
 }
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 3b29c8b..47b8a01 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -1,4 +1,4 @@
-#app {
+.layout-vertical{
   .main-container {
     min-height: 100%;
     transition: margin-left 0.28s;
@@ -12,10 +12,6 @@
       border-bottom: none;
     }
   }
-  .transverseMenu {
-    background-color: $menuBg;
-  }
-
   .sidebar-container {
     transition: width 0.28s;
     width: $sideBarWidth !important;
@@ -47,7 +43,7 @@
 
     &.has-logo {
       .el-scrollbar {
-        height: calc(100% - 60px);
+        height: calc(100% - 50px);
       }
     }
 
@@ -61,9 +57,6 @@
       overflow: hidden;
     }
 
-    .svg-icon {
-      margin-right: 16px;
-    }
 
     .sub-el-icon {
       margin-right: 12px;
@@ -191,44 +184,45 @@
       transition: none;
     }
   }
-}
 
-// when menu collapsed
-.el-menu--vertical {
-  & > .el-menu {
-    .svg-icon {
-      margin-right: 16px;
-    }
-    .sub-el-icon {
-      margin-right: 12px;
-      margin-left: -2px;
-    }
-  }
-
-  .nest-menu .el-sub-menu > .el-sub-menu__title,
-  .el-menu-item {
-    &:hover {
-      // you can use $subMenuHover
-      background-color: $menuHover !important;
-    }
-  }
-
-  // the scroll bar appears when the subMenu is too long
-  > .el-menu--popup {
-    max-height: 100vh;
-    overflow-y: auto;
-
-    &::-webkit-scrollbar-track-piece {
-      background: #d3dce6;
+  // when menu collapsed
+  .el-menu--vertical {
+    & > .el-menu {
+      .svg-icon {
+        margin-right: 16px;
+      }
+      .sub-el-icon {
+        margin-right: 12px;
+        margin-left: -2px;
+      }
     }
 
-    &::-webkit-scrollbar {
-      width: 6px;
+    .nest-menu .el-sub-menu > .el-sub-menu__title,
+    .el-menu-item {
+      &:hover {
+        // you can use $subMenuHover
+        background-color: $menuHover !important;
+      }
     }
 
-    &::-webkit-scrollbar-thumb {
-      background: #99a9bf;
-      border-radius: 20px;
+    // the scroll bar appears when the subMenu is too long
+    > .el-menu--popup {
+      max-height: 100vh;
+      overflow-y: auto;
+
+      &::-webkit-scrollbar-track-piece {
+        background: #d3dce6;
+      }
+
+      &::-webkit-scrollbar {
+        width: 6px;
+      }
+
+      &::-webkit-scrollbar-thumb {
+        background: #99a9bf;
+        border-radius: 20px;
+      }
     }
   }
 }
+
diff --git a/src/utils/element.ts b/src/utils/element.ts
index 61de925..ba4613d 100644
--- a/src/utils/element.ts
+++ b/src/utils/element.ts
@@ -4,15 +4,13 @@ import {
 } from '@element-plus/icons-vue'
 let loading = null
 
-export const openLoading = (options)=>{
+export const openLoading = (options={})=>{
     const text = options.text||'加载中'
     loading = ElLoading.service({
         lock: true,
         text: text,
-        spinner:Loading,
-        background: 'rgba(0, 0, 0, 0.7)',
     })
 }
-export const closeLoading = () = {
-    loading&&loading()
+export const closeLoading = () => {
+    loading&&loading.close()
 }
diff --git a/src/views/home/index.scss b/src/views/home/index.scss
index e76f9d0..079c9d9 100644
--- a/src/views/home/index.scss
+++ b/src/views/home/index.scss
@@ -74,4 +74,5 @@
   display: flex;
   padding: 16px;
   box-sizing: border-box;
+  font-size: 14px;
 }
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 225f8e4..b101d2a 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -69,7 +69,7 @@ const rules = reactive({
 
 // 表单数据
 const ruleForm = reactive({
-  username: 'vue-admin',
+  username: 'admin',
   password: '123456',
 })