-

src/layout/index.vue

@@ -5,7 +5,7 @@
       <a-layout-header class="vab-header">
         <a-row>
           <a-col :xs="10" :sm="10" :md="10" :lg="10" :xl="10">
-             <vab-logo />
+            <vab-logo />
           </a-col>
           <a-col :xs="14" :sm="14" :md="14" :lg="14" :xl="14">
             <vab-avatar />
@@ -21,7 +21,6 @@
       @click="handleFoldSideBar"
     ></div>
 
-
     <a-layout-sider
       collapsible
       class="vab-sider"
@@ -30,6 +29,28 @@
       :class="classObj"
       :trigger="null"
     >
+      <!-- 导航及缩进 start -->
+      <div style="line-height: 50px; text-align: right;border-bottom:1px solid rgba(0,0,0,.04)">
+        <span  v-if="!collapse" style="margin-right:50px">导航</span>
+
+        <!-- 缩进按钮 start -->
+        <div
+          style="
+            display: inline-block;
+          "
+          :style="{'margin-right': (collapse ? '30px':'20px')}"
+
+        >
+          <menu-unfold-outlined
+            v-if="collapse"
+            class="trigger"
+            @click="toggleCollapse"
+          />
+          <menu-fold-outlined v-else class="trigger" @click="toggleCollapse" />
+        </div>
+        <!-- 缩进按钮 start -->
+      </div>
+      <!-- 导航及缩进 end -->
       <a-menu
         class="vab-menu"
         theme=""
@@ -41,7 +62,6 @@
       </a-menu>
     </a-layout-sider>
 
-    
     <a-layout
       class="vab-layout"
       :class="'mobile' === device ? 'vab-mobile-layout' : ''"
@@ -74,7 +94,7 @@ import VabMenu from './vab-menu'
 import VabTabs from './vab-tabs'
 import VabContent from './vab-content'
 import { mapActions, mapGetters } from 'vuex'
-// import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue'
+import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue'
 
 export default {
   components: {
@@ -83,8 +103,8 @@ export default {
     VabMenu,
     VabTabs,
     VabContent,
-    // MenuUnfoldOutlined,
-    // MenuFoldOutlined,
+    MenuUnfoldOutlined,
+    MenuFoldOutlined,
   },
   data() {
     return {
@@ -129,7 +149,7 @@ export default {
     ...mapActions({
       toggleDevice: 'settings/toggleDevice',
       handleFoldSideBar: 'settings/foldSideBar',
-      // toggleCollapse: 'settings/toggleCollapse',
+      toggleCollapse: 'settings/toggleCollapse',
     }),
     handleLayouts() {
       const width = document.body.getBoundingClientRect().width
@@ -158,7 +178,12 @@ export default {
       height: calc(100vh - @vab-header-height);
       li {
         margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 50px;
+    height: 50px;
+   
       }
+      
     }
     .vab-menu::-webkit-scrollbar {
       display: none;
@@ -170,7 +195,7 @@ export default {
     padding-left: 220px;
     transition: all 0.2s;
     background-color: #f0f3f4;
-    padding-top:@vab-header-height;
+    padding-top: @vab-header-height;
   }
   .vab-mobile-layout {
     padding-left: 0;
@@ -229,13 +254,14 @@ export default {
   }
   .vab-header {
     padding: 0;
-    background: #016DDB;
-    color:#fff;
-    position:fixed;top:0;
-    width:100%;
-    z-index:999;
-    height:@vab-header-height;
-    line-height:@vab-header-height;
+    background: #016ddb;
+    color: #fff;
+    position: fixed;
+    top: 0;
+    width: 100%;
+    z-index: 999;
+    height: @vab-header-height;
+    line-height: @vab-header-height;
     .ant-col + .ant-col {
       display: flex;
       justify-content: flex-end;

src/layout/vab-avatar/index.vue

@@ -2,13 +2,13 @@
   <div class="vab-avatar" style="display: flex">
     <span class="weatherBlock">
       <!-- {{ time }} -->
-      天气预留位置
+      <!-- 天气预留位置 -->
     </span>
 
     <span class="goPanelBlock">
       <a  @click="goPanel">
         <img src="/static/svgIcons/home.svg" alt="" width="12">
-        电力大屏</a>
+        大屏</a>
     </span>
 
     <a-dropdown>

src/layout/vab-logo/index.vue

@@ -12,7 +12,7 @@
 
   <div class="vab-logo">
     <router-link to="/" class="logo-url">
-      <img src="../../assets/logo2.png" width="133" style="position: relative; top: -2px;"/>
+      <img src="../../assets/logo2.png" width="133" style="position: relative; top: -5px;"/>
     </router-link>
     <!-- <span class="anticon"></span> -->
 

src/layout/vab-tabs/index.vue

@@ -1,16 +1,13 @@
 <template>
   <div class="vab-tabs">
     <div class="vab-tabs-left-panel">
-      
-
-
       <!-- 缩进按钮 start -->
-      <div
+      <!-- <div
         style="
           display: inline-block;
           float: left;
           margin-top: 14px;
-    margin-right: 11px;
+          margin-right: 11px;
         "
       >
         <menu-unfold-outlined
@@ -19,7 +16,7 @@
           @click="toggleCollapse"
         />
         <menu-fold-outlined v-else class="trigger" @click="toggleCollapse" />
-      </div>
+      </div> -->
       <!-- 缩进按钮 start -->
 
       <!-- 面包屑start -->
@@ -33,7 +30,7 @@
         </el-breadcrumb-item>
       </el-breadcrumb> -->
 
-       <!-- <el-breadcrumb separator="/">
+      <!-- <el-breadcrumb separator="/">
         <el-breadcrumb-item
           v-for="(item, ind) in breadListLast"
           :key="ind"
@@ -44,7 +41,6 @@
       </el-breadcrumb> -->
       <!-- {{visitedRoutes}} -->
 
-
       <a-tabs
         @tab-click="handleTabClick"
         @edit="handleTabRemove"
@@ -59,14 +55,9 @@
           :tab="item.meta.title"
         ></a-tab-pane>
       </a-tabs>
-
-
-      
     </div>
     <!-- 面包屑end -->
 
-
-
     <!-- <div class="vab-tabs-right-panel">
       <a-dropdown>
         <template v-slot:overlay>
@@ -97,13 +88,13 @@
 <script>
 // import { DownOutlined } from '@ant-design/icons-vue'
 import { mapActions, mapGetters } from 'vuex'
-import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue'
+// import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue'
 export default {
   name: 'VabTabs',
   components: {
     // DownOutlined,
-    MenuUnfoldOutlined,
-    MenuFoldOutlined,
+    // MenuUnfoldOutlined,
+    // MenuFoldOutlined,
   },
   data() {
     return {
@@ -123,10 +114,7 @@ export default {
     $route(route) {
       this.loadChange()
       this.addTabs(route)
-
-      
     },
-    
   },
   created() {
     this.initAffixTabs(this.routes)
@@ -134,8 +122,6 @@ export default {
     this.loadChange()
   },
   methods: {
-
-
     loadChange() {
       this.breadListLast = []
 
@@ -155,7 +141,7 @@ export default {
       delRightVisitedRoutes: 'tagsBar/delRightVisitedRoutes',
       delAllVisitedRoutes: 'tagsBar/delAllVisitedRoutes',
 
-      toggleCollapse: 'settings/toggleCollapse',
+      // toggleCollapse: 'settings/toggleCollapse',
     }),
     initAffixTabs(routes) {
       routes.forEach((route) => {
@@ -166,10 +152,8 @@ export default {
     async addTabs(tag) {
       console.log('tag')
       console.log(tag)
-      
-  
-      
-      if ( tag.meta && tag.meta.title&&tag.meta.tagHidden !== true) {
+
+      if (tag.meta && tag.meta.title && tag.meta.tagHidden !== true) {
         let matched = [tag.name]
         if (tag.matched) matched = tag.matched.map((item) => item.name)
         await this.addVisitedRoute({
@@ -267,12 +251,12 @@ export default {
     width: 52px;
   }
   .ant-tabs {
-    height:50px;
-    line-height:50px;
+    height: 50px;
+    line-height: 50px;
     &-bar {
       // margin: 0 !important;
-      margin-top:9px;
-      border-bottom:0px solid red
+      margin-top: 9px;
+      border-bottom: 0px solid red;
     }
     &-tab {
       height: 30px !important;
@@ -280,7 +264,7 @@ export default {
       line-height: 30px !important;
       background: #ffffff !important;
       border: 1px solid #dedede !important;
-      padding: 0 10px!important;
+      padding: 0 10px !important;
     }
     &-tab-prev,
     &-tab-next {
@@ -304,8 +288,8 @@ export default {
   }
 }
 
-.ant-tabs-nav-container{
-  font-size:12px!important;
+.ant-tabs-nav-container {
+  font-size: 12px !important;
 }
 // .anticon[tabindex]{
 //   position: relative;

src/views/login/index.vue

@@ -120,8 +120,8 @@ export default {
     }
 
     this.getLoginStyle()
-    // this.companyName='永天智慧电力平台'
-    // this.backdropUrl=require('@/assets/login_images/login_background.png')
+    this.companyName='永天智慧电力平台'
+    this.backdropUrl=require('@/assets/login_images/login_background.png')
   },
   methods: {
 
@@ -193,6 +193,7 @@ export default {
     margin-bottom: 30px;
     font-size: 20px;
     color: #fff;
+    text-align:center
   }
   &-tips {
     position: fixed;

src/views/middle.vue

@@ -79,9 +79,9 @@ export default defineComponent({
     const store = useStore()
 
     const middleList = store.state.middleList
-    const middleBackUrl=ref('')
-    const middleLogo=ref('')
-    const middleTitle=ref('')
+    const middleBackUrl=ref(require('@/assets/images/middle_background.png'))
+    const middleLogo=ref(require('@/assets/logo2.png'))
+    const middleTitle=ref('永天智慧电力平台')
     
 
     onMounted(() => {