路由修改

src/layouts/admin/components/navBar/classic.vue

@@ -1,14 +1,15 @@
 <template>
-    <div class="nav-bar">
-        <div v-if="config.layout.shrink && config.layout.menuCollapse" class="unfold">
-            <Icon @click="onMenuCollapse" name="fa fa-indent" :color="config.getColorVal('menuActiveColor')" size="18" />
+    <div class='nav-bar'>
+        <div v-if='config.layout.shrink && config.layout.menuCollapse' class='unfold'>
+            <Icon @click='onMenuCollapse' name='fa fa-indent' :color="config.getColorVal('menuActiveColor')"
+                  size='18' />
         </div>
-        <span style='color: #FFF;font-size: 24px;margin-left: 10px;font-weight: 700'>电能质量数据监测云平台</span>
+        <span class='nav-bar-title'>电能质量数据监测云平台</span>
         <NavMenus />
     </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang='ts'>
 import { useConfig } from '@/stores/config'
 import NavTabs from '@/layouts/admin/components/navBar/tabs.vue'
 import NavMenus from '../navMenus.vue'
@@ -24,17 +25,26 @@ const onMenuCollapse = () => {
 }
 </script>
 
-<style scoped lang="scss">
+<style scoped lang='scss'>
 .nav-bar {
     display: flex;
     align-items: center;
     height: 60px;
     width: 100%;
     background-color: v-bind('config.getColorVal("headerBarBackground")');
+
+    .nav-bar-title {
+        color: v-bind('config.getColorVal("headerBarTabColor")');
+        font-size: 24px;
+        margin-left: 10px;
+        font-weight: 700
+    }
+
     :deep(.nav-tabs) {
         display: flex;
         height: 100%;
         position: relative;
+
         .ba-nav-tab {
             display: flex;
             align-items: center;
@@ -47,25 +57,31 @@ const onMenuCollapse = () => {
             color: v-bind('config.getColorVal("headerBarTabColor")');
             transition: all 0.2s;
             -webkit-transition: all 0.2s;
+
             .close-icon {
                 padding: 2px;
                 margin: 2px 0 0 4px;
                 color: v-bind('config.getColorVal("headerBarTabColor")') !important;
             }
+
             &.active {
                 color: v-bind('config.getColorVal("headerBarTabActiveColor")');
+
                 .close-icon {
                     color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;;
                 }
             }
+
             &:hover {
                 color: v-bind('config.getColorVal("headerBarTabActiveColor")');
                 background-color: v-bind('config.getColorVal("headerBarHoverBackground")');
+
                 .close-icon {
                     color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;;
                 }
             }
         }
+
         .nav-tabs-active-box {
             position: absolute;
             height: 50px;
@@ -75,6 +91,7 @@ const onMenuCollapse = () => {
         }
     }
 }
+
 .unfold {
     align-self: center;
     padding-left: var(--ba-main-space);

src/layouts/admin/components/navMenus.vue

@@ -5,14 +5,14 @@
                 :color="configStore.getColorVal('headerBarTabColor')"
                 class="nav-menu-icon"
                 v-if="state.isFullScreen"
-                name="local-full-screen-cancel"
+                name="fa-solid fa-minimize"
                 size="18"
             />
             <Icon
                 :color="configStore.getColorVal('headerBarTabColor')"
                 class="nav-menu-icon"
                 v-else
-                name="el-icon-FullScreen"
+                name="fa-solid fa-expand"
                 size="18"
             />
         </div>

src/layouts/admin/index.vue

@@ -274,6 +274,7 @@ const init = async () => {
 
         const handlerMenu = (data: any) => {
             data.forEach((item: any) => {
+
                 item.path = item.routeName || item.title
                 item.name = item.title
                 item.component = '/src/views/dashboard/index.vue'
@@ -285,8 +286,9 @@ const init = async () => {
             })
         }
         handlerMenu(res.data)
-        handleAdminRoute(arr)
-        // handleAdminRoute([...arr, ...res.data])
+        // handleAdminRoute(arr)
+        // handleAdminRoute(res.data)
+        handleAdminRoute([...arr, ...res.data])
 
         // 预跳转到上次路径
         if (route.params.to) {