框架调整

src/assets/styles/sidebar.scss

@@ -109,11 +109,13 @@
 
   .hideSidebar {
     .sidebar-container {
-      width: 54px !important;
+      // width: 54px !important;
+      width: 0px !important;
     }
 
     .main-container {
-      margin-left: 54px;
+      // margin-left: 54px;
+      margin-left: 0px;
     }
 
     .submenu-title-noDropdown {

src/components/Breadcrumb/index.vue

@@ -1,12 +1,18 @@
 <template>
-  <el-breadcrumb class="app-breadcrumb" separator="/">
+  <div>
+    <div class="fx-entry-title" >
+      <span class="entry-title">{{ title }}</span>
+    </div>
+  </div>
+  
+  <!-- <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
         <span v-if="item.redirect==='noRedirect'||index===levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
-  </el-breadcrumb>
+  </el-breadcrumb> -->
 </template>
 
 <script>
@@ -16,6 +22,11 @@ export default {
       levelList: null
     }
   },
+  computed: {
+    title() {
+      return this.$store.state.settings.title
+    }
+  },
   watch: {
     $route(route) {
       // if you go to the redirect page, do not update the breadcrumbs
@@ -23,7 +34,7 @@ export default {
         return
       }
       this.getBreadcrumb()
-    }
+    },
   },
   created() {
     this.getBreadcrumb()
@@ -61,6 +72,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.fx-entry-title {
+    align-items: center;
+    display: flex;
+    line-height: 28px;
+    max-width: 330px;
+    .entry-title {
+      color: #141e31;
+      font-size: 14px;
+      font-weight: 700;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+  }
+}
 .app-breadcrumb.el-breadcrumb {
   display: inline-block;
   font-size: 14px;

src/layout/components/Homebar.vue

@@ -19,7 +19,8 @@
         </el-popover>
         <div class="divider"></div>
         <a class="text" href="/">
-          <div class="menu-icon dashboard" style="background-image: url(&quot;https://g.jdycdn.com/app/pc/311a8e2b1ed9.png&quot;);"></div>
+          <img :src="logo" class="menu-icon dashboard" />
+          <!-- <div class="menu-icon dashboard" style="background-image: url(&quot;https://g.jdycdn.com/app/pc/311a8e2b1ed9.png&quot;);"></div> -->
           工作台
         </a>
     </div>
@@ -76,11 +77,11 @@ import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
 import NotifyMessage from '@/layout/components/Message'
 import {getPath} from "@/utils/ruoyi";
-
+import logoImg from '@/assets/logo/work.png'
 export default {
   data() {
     return {
-      
+      logo: logoImg
     }
   },
   components: {

src/layout/components/Navbar.vue

@@ -1,9 +1,11 @@
 <template>
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+    <div class="fx-entry-title" >
+      <span class="entry-title">{{ title }}</span>
+    </div>
+    <!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/> -->
+    <!-- <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/> -->
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
@@ -106,6 +108,9 @@ export default {
       get() {
         return this.$store.state.settings.topNav
       }
+    },
+    title() {
+      return this.$store.state.settings.title
     }
   },
   methods: {
@@ -127,6 +132,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.fx-entry-title {
+    float: left;
+    line-height: 46px;
+    align-items: center;
+    display: flex;
+    max-width: 330px;
+    .entry-title {
+      color: #141e31;
+      font-size: 14px;
+      font-weight: 700;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+  }
+}
 .navbar {
   height: 50px;
   overflow: hidden;

src/layout/components/Sidebar/Logo.vue

@@ -3,18 +3,18 @@
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">爱思系统</h1>
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">工作台</h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">爱思系统</h1>
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">工作台</h1>
       </router-link>
     </transition>
   </div>
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo/work.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
@@ -61,18 +61,20 @@ export default {
   height: 50px;
   line-height: 50px;
   background: #2b2f3a;
-  text-align: center;
+  // text-align: center;
   overflow: hidden;
+  margin-left: 18px;
 
   & .sidebar-logo-link {
     height: 100%;
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 25px;
+      height: 25px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 10px;
+      margin-bottom: 2px;
     }
 
     & .sidebar-title {
@@ -81,7 +83,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 16px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

src/layout/index.vue

@@ -110,7 +110,8 @@ export default {
 }
 
 .hideSidebar .fixed-header {
-  width: calc(100% - 54px);
+  // width: calc(100% - 54px);
+  width: calc(100% - 0px);
 }
 
 .sidebarHide .fixed-header {