diff --git a/src/components/Header.vue b/src/components/Header.vue
index 6d353b7..03b444f 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -1,162 +1,171 @@
 <template>
-    <div class="header">
-        <!-- 折叠按钮 -->
-        <div class="collapse-btn" @click="collapseChage">
-            <i v-if="!collapse" class="el-icon-s-fold"></i>
-            <i v-else class="el-icon-s-unfold"></i>
-        </div>
-        <div class="logo">后台管理系统</div>
-        <div class="header-right">
-            <div class="header-user-con">
-                <!-- 消息中心 -->
-                <div class="btn-bell">
-                    <el-tooltip effect="dark" :content="message?`有${message}条未读消息`:`消息中心`" placement="bottom">
-                        <router-link to="/tabs">
-                            <i class="el-icon-bell"></i>
-                        </router-link>
-                    </el-tooltip>
-                    <span class="btn-bell-badge" v-if="message"></span>
-                </div>
-                <!-- 用户头像 -->
-                <div class="user-avator">
-                    <img src="../assets/img/img.jpg" />
-                </div>
-                <!-- 用户名下拉菜单 -->
-                <el-dropdown class="user-name" trigger="click" @command="handleCommand">
-                    <span class="el-dropdown-link">
-                        {{username}}
-                        <i class="el-icon-caret-bottom"></i>
-                    </span>
-                    <template #dropdown>
-                        <el-dropdown-menu>
-                            <a href="https://github.com/lin-xin/vue-manage-system" target="_blank">
-                                <el-dropdown-item>项目仓库</el-dropdown-item>
-                            </a>
-                            <el-dropdown-item command="user">个人中心</el-dropdown-item>
-                            <el-dropdown-item divided command="loginout">退出登录</el-dropdown-item>
-                        </el-dropdown-menu>
-                    </template>
-                </el-dropdown>
-            </div>
-        </div>
+  <div class="header">
+    <!-- 折叠按钮 -->
+    <div class="collapse-btn" @click="collapseChage">
+      <i v-if="!collapse" class="el-icon-s-fold"></i>
+      <i v-else class="el-icon-s-unfold"></i>
     </div>
+    <div class="logo">后台管理系统</div>
+    <div class="header-right">
+      <div class="header-user-con">
+        <!-- 消息中心 -->
+        <div class="btn-bell">
+          <el-tooltip
+            effect="dark"
+            :content="message ? `有${message}条未读消息` : `消息中心`"
+            placement="bottom"
+          >
+            <router-link to="/tabs">
+              <i class="el-icon-bell"></i>
+            </router-link>
+          </el-tooltip>
+          <span class="btn-bell-badge" v-if="message"></span>
+        </div>
+        <!-- 用户头像 -->
+        <div class="user-avator">
+          <img src="../assets/img/img.jpg" />
+        </div>
+        <!-- 用户名下拉菜单 -->
+        <el-dropdown class="user-name" trigger="click" @command="handleCommand">
+          <span class="el-dropdown-link">
+            {{ username }}
+            <i class="el-icon-caret-bottom"></i>
+          </span>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <a
+                href="https://github.com/lin-xin/vue-manage-system"
+                target="_blank"
+              >
+                <el-dropdown-item>项目仓库</el-dropdown-item>
+              </a>
+              <el-dropdown-item command="user">个人中心</el-dropdown-item>
+              <el-dropdown-item divided command="loginout"
+                >退出登录</el-dropdown-item
+              >
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+      </div>
+    </div>
+  </div>
 </template>
 <script lang="ts">
-import { computed, onMounted } from "vue";
+import { computed, onMounted, ref } from "vue";
 import { useStore } from "vuex";
 import { useRouter } from "vue-router";
 export default {
-    setup() {
-        const username = localStorage.getItem("ms_username");
-        const message = 2;
+  setup() {
+    const username = localStorage.getItem("ms_username");
+    const message = ref(2);
 
-        const store = useStore();
-        const collapse = computed(() => store.state.collapse);
-        // 侧边栏折叠
-        const collapseChage = () => {
-            store.commit("handleCollapse", !collapse.value);
-        };
+    const store = useStore();
+    const collapse = computed(() => store.state.collapse);
+    // 侧边栏折叠
+    const collapseChage = () => {
+      store.commit("handleCollapse", !collapse.value);
+    };
 
-        onMounted(() => {
-            if (document.body.clientWidth < 1500) {
-                collapseChage();
-            }
-        });
+    onMounted(() => {
+      if (document.body.clientWidth < 1500) {
+        collapseChage();
+      }
+    });
 
-        // 用户名下拉菜单选择事件
-        const router = useRouter();
-        const handleCommand = (command) => {
-            if (command == "loginout") {
-                localStorage.removeItem("ms_username");
-                router.push("/login");
-            } else if (command == "user") {
-                router.push("/user");
-            }
-        };
+    // 用户名下拉菜单选择事件
+    const router = useRouter();
+    const handleCommand = (command) => {
+      if (command == "loginout") {
+        localStorage.removeItem("ms_username");
+        router.push("/login");
+      } else if (command == "user") {
+        router.push("/user");
+      }
+    };
 
-        return {
-            username,
-            message,
-            collapse,
-            collapseChage,
-            handleCommand,
-        };
-    },
+    return {
+      username,
+      message,
+      collapse,
+      collapseChage,
+      handleCommand,
+    };
+  },
 };
 </script>
 <style scoped>
 .header {
-    position: relative;
-    box-sizing: border-box;
-    width: 100%;
-    height: 70px;
-    font-size: 22px;
-    color: #fff;
+  position: relative;
+  box-sizing: border-box;
+  width: 100%;
+  height: 70px;
+  font-size: 22px;
+  color: #fff;
 }
 .collapse-btn {
-    float: left;
-    padding: 0 21px;
-    cursor: pointer;
-    line-height: 70px;
+  float: left;
+  padding: 0 21px;
+  cursor: pointer;
+  line-height: 70px;
 }
 .header .logo {
-    float: left;
-    width: 250px;
-    line-height: 70px;
+  float: left;
+  width: 250px;
+  line-height: 70px;
 }
 .header-right {
-    float: right;
-    padding-right: 50px;
+  float: right;
+  padding-right: 50px;
 }
 .header-user-con {
-    display: flex;
-    height: 70px;
-    align-items: center;
+  display: flex;
+  height: 70px;
+  align-items: center;
 }
 .btn-fullscreen {
-    transform: rotate(45deg);
-    margin-right: 5px;
-    font-size: 24px;
+  transform: rotate(45deg);
+  margin-right: 5px;
+  font-size: 24px;
 }
 .btn-bell,
 .btn-fullscreen {
-    position: relative;
-    width: 30px;
-    height: 30px;
-    text-align: center;
-    border-radius: 15px;
-    cursor: pointer;
+  position: relative;
+  width: 30px;
+  height: 30px;
+  text-align: center;
+  border-radius: 15px;
+  cursor: pointer;
 }
 .btn-bell-badge {
-    position: absolute;
-    right: 0;
-    top: -2px;
-    width: 8px;
-    height: 8px;
-    border-radius: 4px;
-    background: #f56c6c;
-    color: #fff;
+  position: absolute;
+  right: 0;
+  top: -2px;
+  width: 8px;
+  height: 8px;
+  border-radius: 4px;
+  background: #f56c6c;
+  color: #fff;
 }
 .btn-bell .el-icon-bell {
-    color: #fff;
+  color: #fff;
 }
 .user-name {
-    margin-left: 10px;
+  margin-left: 10px;
 }
 .user-avator {
-    margin-left: 20px;
+  margin-left: 20px;
 }
 .user-avator img {
-    display: block;
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
+  display: block;
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
 }
 .el-dropdown-link {
-    color: #fff;
-    cursor: pointer;
+  color: #fff;
+  cursor: pointer;
 }
 .el-dropdown-menu__item {
-    text-align: center;
+  text-align: center;
 }
 </style>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 36e82f7..b671e88 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,154 +1,186 @@
 <template>
-    <div class="sidebar">
-        <el-menu class="sidebar-el-menu" :default-active="onRoutes" :collapse="collapse" background-color="#324157"
-            text-color="#bfcbd9" active-text-color="#20a0ff" unique-opened router>
-            <template v-for="item in items">
-                <template v-if="item.subs">
-                    <el-submenu :index="item.index" :key="item.index">
-                        <template #title>
-                            <i :class="item.icon"></i>
-                            <span>{{ item.title }}</span>
-                        </template>
-                        <template v-for="subItem in item.subs">
-                            <el-submenu v-if="subItem.subs" :index="subItem.index" :key="subItem.index">
-                                <template #title>{{ subItem.title }}</template>
-                                <el-menu-item v-for="(threeItem, i) in subItem.subs" :key="i" :index="threeItem.index">
-                                    {{ threeItem.title }}</el-menu-item>
-                            </el-submenu>
-                            <el-menu-item v-else :index="subItem.index" :key="subItem.index">{{ subItem.title }}
-                            </el-menu-item>
-                        </template>
-                    </el-submenu>
-                </template>
-                <template v-else>
-                    <el-menu-item :index="item.index" :key="item.index">
-                        <i :class="item.icon"></i>
-                        <template #title>{{ item.title }}</template>
-                    </el-menu-item>
-                </template>
+  <div class="sidebar">
+    <el-menu
+      class="sidebar-el-menu"
+      :default-active="onRoutes"
+      :collapse="collapse"
+      background-color="#324157"
+      text-color="#bfcbd9"
+      active-text-color="#20a0ff"
+      unique-opened
+      router
+    >
+      <template v-for="item in items">
+        <template v-if="item.subs">
+          <el-submenu :index="item.index" :key="item.index">
+            <template #title>
+              <i :class="item.icon"></i>
+              <span>{{ item.title }}</span>
             </template>
-        </el-menu>
-    </div>
+            <template v-for="subItem in item.subs">
+              <el-submenu
+                v-if="subItem.subs"
+                :index="subItem.index"
+                :key="subItem.index"
+              >
+                <template #title>{{ subItem.title }}</template>
+                <el-menu-item
+                  v-for="(threeItem, i) in subItem.subs"
+                  :key="i"
+                  :index="threeItem.index"
+                >
+                  {{ threeItem.title }}</el-menu-item
+                >
+              </el-submenu>
+              <el-menu-item v-else :index="subItem.index" :key="subItem.index"
+                >{{ subItem.title }}
+              </el-menu-item>
+            </template>
+          </el-submenu>
+        </template>
+        <template v-else>
+          <el-menu-item :index="item.index" :key="item.index">
+            <i :class="item.icon"></i>
+            <template #title>{{ item.title }}</template>
+          </el-menu-item>
+        </template>
+      </template>
+    </el-menu>
+  </div>
 </template>
 
 <script lang="ts">
-import { computed, watch } from "vue";
+import { computed, defineComponent } from "vue";
 import { useStore } from "vuex";
 import { useRoute } from "vue-router";
-export default {
-    setup() {
-        const items = [
-            {
-                icon: "el-icon-lx-home",
-                index: "/dashboard",
-                title: "系统首页",
-            },
-            {
-                icon: "el-icon-lx-cascades",
-                index: "/table",
-                title: "基础表格",
-            },
-            {
-                icon: "el-icon-lx-copy",
-                index: "/tabs",
-                title: "tab选项卡",
-            },
-            {
-                icon: "el-icon-lx-calendar",
-                index: "3",
-                title: "表单相关",
-                subs: [
-                    {
-                        index: "/form",
-                        title: "基本表单",
-                    },
-                    {
-                        index: "/upload",
-                        title: "文件上传",
-                    },
-                    {
-                        index: "4",
-                        title: "三级菜单",
-                        subs: [
-                            {
-                                index: "/editor",
-                                title: "富文本编辑器",
-                            },
-                        ],
-                    },
-                ],
-            },
-            {
-                icon: "el-icon-lx-emoji",
-                index: "/icon",
-                title: "自定义图标",
-            },
-            {
-                icon: "el-icon-pie-chart",
-                index: "/charts",
-                title: "schart图表",
-            },
-            {
-                icon: "el-icon-lx-global",
-                index: "/i18n",
-                title: "国际化功能",
-            },
-            {
-                icon: "el-icon-lx-warn",
-                index: "7",
-                title: "错误处理",
-                subs: [
-                    {
-                        index: "/permission",
-                        title: "权限测试",
-                    },
-                    {
-                        index: "/404",
-                        title: "404页面",
-                    },
-                ],
-            },
-            {
-                icon: "el-icon-lx-redpacket_fill",
-                index: "/donate",
-                title: "支持作者",
-            },
-        ];
 
-        const route = useRoute();
+interface menuItem {
+  icon: string;
+  index: string;
+  title: string;
+  subs?: subItem[];
+}
 
-        const onRoutes = computed(() => {
-            return route.path;
-        });
+interface subItem {
+  index: string;
+  title: string;
+  subs?: subItem[];
+}
 
-        const store = useStore();
-        const collapse = computed(() => store.state.collapse);
+export default defineComponent({
+  setup() {
+    const items: menuItem[] = [
+      {
+        icon: "el-icon-lx-home",
+        index: "/dashboard",
+        title: "系统首页",
+      },
+      {
+        icon: "el-icon-lx-cascades",
+        index: "/table",
+        title: "基础表格",
+      },
+      {
+        icon: "el-icon-lx-copy",
+        index: "/tabs",
+        title: "tab选项卡",
+      },
+      {
+        icon: "el-icon-lx-calendar",
+        index: "3",
+        title: "表单相关",
+        subs: [
+          {
+            index: "/form",
+            title: "基本表单",
+          },
+          {
+            index: "/upload",
+            title: "文件上传",
+          },
+          {
+            index: "4",
+            title: "三级菜单",
+            subs: [
+              {
+                index: "/editor",
+                title: "富文本编辑器",
+              },
+            ],
+          },
+        ],
+      },
+      {
+        icon: "el-icon-lx-emoji",
+        index: "/icon",
+        title: "自定义图标",
+      },
+      {
+        icon: "el-icon-pie-chart",
+        index: "/charts",
+        title: "schart图表",
+      },
+      {
+        icon: "el-icon-lx-global",
+        index: "/i18n",
+        title: "国际化功能",
+      },
+      {
+        icon: "el-icon-lx-warn",
+        index: "7",
+        title: "错误处理",
+        subs: [
+          {
+            index: "/permission",
+            title: "权限测试",
+          },
+          {
+            index: "/404",
+            title: "404页面",
+          },
+        ],
+      },
+      {
+        icon: "el-icon-lx-redpacket_fill",
+        index: "/donate",
+        title: "支持作者",
+      },
+    ];
 
-        return {
-            items,
-            onRoutes,
-            collapse,
-        };
-    },
-};
+    const route = useRoute();
+
+    const onRoutes = computed(() => {
+      return route.path;
+    });
+
+    const store = useStore();
+    const collapse = computed(() => store.state.collapse);
+
+    return {
+      items,
+      onRoutes,
+      collapse,
+    };
+  },
+});
 </script>
 
 <style scoped>
 .sidebar {
-    display: block;
-    position: absolute;
-    left: 0;
-    top: 70px;
-    bottom: 0;
-    overflow-y: scroll;
+  display: block;
+  position: absolute;
+  left: 0;
+  top: 70px;
+  bottom: 0;
+  overflow-y: scroll;
 }
 .sidebar::-webkit-scrollbar {
-    width: 0;
+  width: 0;
 }
 .sidebar-el-menu:not(.el-menu--collapse) {
-    width: 250px;
+  width: 250px;
 }
 .sidebar > ul {
-    height: 100%;
+  height: 100%;
 }
 </style>