Browse Source

前端页面更新

sr 4 years ago
parent
commit
26ecaf436a

+ 22 - 3
ruoyi-ui/src/assets/styles/sidebar.scss

@@ -64,6 +64,11 @@
       border: none;
       height: 100%;
       width: 100% !important;
+      .submenu-title-noDropdown.is-active{
+        span{
+          color: #3C8DBC!important;
+        }
+      }
     }
 
     .el-menu-item, .el-submenu__title {
@@ -80,29 +85,43 @@
       }
     }
 
+
     & .theme-dark .is-active > .el-submenu__title {
-      color: $subMenuActiveText !important;
+      span{
+        color: $subMenuActiveText !important;
+      }
     }
 
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
       min-width: $sideBarWidth !important;
 
+
       &:hover {
         background-color: rgba(0, 0, 0, 0.06) !important;
       }
     }
 
+
     & .theme-dark .nest-menu .el-submenu>.el-submenu__title,
     & .theme-dark .el-submenu .el-menu-item {
-      background-color: $subMenuBg !important;
-
+      background-color: $subMenuBg;
       &:hover {
         background-color: $subMenuHover !important;
+        span{
+          color: #fff!important;
+        }
       }
     }
+    .nest-menu .is-active{
+      span{
+        color: #fff!important;
+      }
+      background-color: #3C8DBC!important;
+    }
   }
 
+
   .hideSidebar {
     .sidebar-container {
       width: 54px !important;

+ 4 - 4
ruoyi-ui/src/assets/styles/variables.scss

@@ -11,9 +11,9 @@ $panGreen: #30B08F;
 // sidebar
 $menuText:#bfcbd9;
 $menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText:#3C8DBC; // https://github.com/ElemeFE/element/issues/12951
 
-$menuBg:#304156;
+$menuBg: #FAFAFA;
 $menuHover:#263445;
 $sidebarTitle: #ffffff;
 
@@ -21,8 +21,8 @@ $menuLightBg:#ffffff;
 $menuLightHover:#f0f1f5;
 $sidebarLightTitle: #001529;
 
-$subMenuBg:#1f2d3d;
-$subMenuHover:#001528;
+$subMenuBg:#FAFAFA;
+$subMenuHover:#3C8DBC;
 
 $sideBarWidth: 200px;
 

+ 4 - 3
ruoyi-ui/src/components/SignNumArr/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="sign_box">
-    <div class="sign_item" v-for="item in 4">
-      <img src="@/assets/images/pic_tabbg@2x.png" alt="" class="img">
+    <div class="sign_item" v-for="item in 4" @click="indexs = item">
+      <img src="@/assets/images/pic_tabbg@2x.png" v-show="indexs==item" alt="" class="img">
       <img src="@/assets/404_images/404_cloud.png" alt="" class="icon">
       <span>首页</span>
     </div>
@@ -13,7 +13,7 @@
   export default{
     data() {
       return {
-
+        indexs:1
       }
     }
   }
@@ -23,6 +23,7 @@
   .sign_box{
     padding-left: 52px;
     .sign_item{
+      cursor: pointer;
       float: left;
       display: flex;
       height: 60px;

+ 1 - 1
ruoyi-ui/src/layout/components/Sidebar/Item.vue

@@ -21,7 +21,7 @@ export default {
     }
 
     if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
+      vnodes.push(<span slot='title' style="color: #343434">{(title)}</span>)
     }
     return vnodes
   }

+ 5 - 4
ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">
+  <!-- <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }"> -->
+     <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <!-- <img v-if="logo" :src="logo" class="sidebar-logo"> -->
@@ -55,9 +56,9 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 50px;
-  line-height: 50px;
-  background: #2b2f3a;
+  height: 60px;
+  line-height: 60px;
+  background-color: #3C8DBC;
   text-align: center;
   overflow: hidden;
 

+ 4 - 2
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

@@ -3,14 +3,16 @@
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+          <item :title="onlyOneChild.meta.title" />
+          <!-- <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" /> -->
         </el-menu-item>
       </app-link>
     </template>
 
     <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+        <!-- <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" /> -->
+        <item v-if="item.meta" :title="item.meta.title" />
       </template>
       <sidebar-item
         v-for="child in item.children"

+ 2 - 2
ruoyi-ui/src/layout/index.vue

@@ -5,10 +5,10 @@
     <div :class="{hasTagsView:needTagsView}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
         <navbar />
-        <tags-view v-if="needTagsView" />
+        <tags-view v-if="needTagsView&&false"/>
       </div>
       <app-main />
-      <right-panel v-if="showSettings">
+      <right-panel v-if="showSettings&&false">
         <settings />
       </right-panel>
     </div>

+ 1 - 1
ruoyi-ui/src/views/login.vue

@@ -48,7 +48,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
+      <!-- <span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span> -->
     </div>
   </div>
 </template>