12.31开源admin代码更新

admin/src/styles/element-ui.scss

@@ -82,3 +82,6 @@
 .el-range-separator {
   box-sizing: content-box;
 }
+.el-card.is-always-shadow {
+  box-shadow: none;
+}

admin/src/styles/sidebar.scss

@@ -3,14 +3,14 @@
   .main-container {
     min-height: 100%;
     transition: margin-left .28s;
-    margin-left: $sideBarWidth;
+    margin-left: $base-sidebar-width;
     position: relative;
   }
 
   .sidebar-container {
     transition: width 0.28s;
-    width: $sideBarWidth !important;
-    background-color: $menuBg;
+    width: $base-sidebar-width !important;
+    background-color: $base-menu-background;
     height: 100%;
     position: fixed;
     font-size: 0px;
@@ -67,21 +67,24 @@
     .submenu-title-noDropdown,
     .el-submenu__title {
       &:hover {
-        background-color: $menuHover !important;
+        // background-color: rgba(0, 0, 0, 0.06) !important;
       }
     }
-
+    .is-active{
+      // background-color: #fff !important;
+      // font-weight: 500;
+    }
     .is-active>.el-submenu__title {
-      color: $subMenuActiveText !important;
+      // color: $base-menu-color-active ;
     }
 
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
-      min-width: $sideBarWidth !important;
-      background-color: $subMenuBg !important;
+      min-width: $base-sidebar-width !important;
+      background-color: subMenuBackground !important;
 
       &:hover {
-        background-color: $subMenuHover !important;
+        // background-color: rgba(0, 0, 0, 0.06) !important;
       }
     }
   }
@@ -140,7 +143,7 @@
   }
 
   .el-menu--collapse .el-menu .el-submenu {
-    min-width: $sideBarWidth !important;
+    min-width: $base-sidebar-width !important;
   }
 
   // mobile responsive
@@ -151,14 +154,14 @@
 
     .sidebar-container {
       transition: transform .28s;
-      width: $sideBarWidth !important;
+      width: $base-sidebar-width !important;
     }
 
     &.hideSidebar {
       .sidebar-container {
         pointer-events: none;
         transition-duration: 0.3s;
-        transform: translate3d(-$sideBarWidth, 0, 0);
+        transform: translate3d(-$base-sidebar-width, 0, 0);
       }
     }
   }
@@ -184,10 +187,9 @@
   .el-menu-item {
     &:hover {
       // you can use $subMenuHover
-      background-color: $menuHover !important;
+      background-color: rgba(0, 0, 0, 0.06) !important;
     }
   }
-
   // the scroll bar appears when the subMenu is too long
   >.el-menu--popup {
     max-height: 100vh;

admin/src/styles/styles.scss

@@ -100,6 +100,7 @@
 
 .divBox{
   padding: 20px;
+  // padding: 0 20px 20px;
   box-sizing: border-box;
   .el-pagination{
     display: flex;
@@ -139,6 +140,9 @@
     display: none !important;
   }
 }
+.el-dialog__footer{
+  border-top:1px solid #dcdfe6;
+}
 .el-message-box__wrapper{
   overflow: auto;
 }
@@ -253,6 +257,9 @@ table .el-image{
 .mr20{
   margin-right: 20px;
 }
+.mr15{
+  margin-right: 15px;
+}
 .ml40 {
   margin-left: 40px !important;
 }
@@ -297,6 +304,7 @@ table .el-image{
   border-bottom:1px solid #dcdfe6;
   padding-bottom: 20px !important;
 }
+
 //点击上传图样式（弹窗）
 .publicPicBox{
   display: inline-block;
@@ -406,7 +414,9 @@ table .el-image{
   -webkit-box-orient: vertical;
   overflow: hidden;
 }
-
+.el-image-viewer__close{
+  color: #fff;
+}
 .statistical-page .mpvue-calendar{min-width:100%;}
 .statistical-page .mpvue-calendar table{margin:0;}
 .statistical-page .mpvue-calendar td{border-right:1px solid #fff;padding:0;width:14%!important;}
@@ -426,3 +436,5 @@ table .el-image{
   background-color:#a0dcf9;
 }
 .statistical-page .mc-today-element .calendar-date{border-radius:0;background-color:unset;}
+
+

admin/src/styles/variables.scss

@@ -8,29 +8,52 @@ $tiffany: #4AB7BD;
 $yellow:#FEC171;
 $panGreen: #30B08F;
 
+$base-menu-color:#ffffff; //默认字体颜色
+$base-menu-color-active:#f4f4f5; 
+$base-menu-background:#001529; //默认背景色
+$base-logo-title-color: #ffffff; //默认logo_title字体颜色
+
+$base-menu-light-color:#ffffff; //浅色主题字体颜色
+$base-menu-light-background:#2B68C9; //浅色主题背景色
+$base-logo-light-title-color: #001529; //浅色主题logo_title颜色
+
+$base-sub-menu-background:#1f2d3d;
+$base-sub-menu-hover:#001528;
 // sidebar
-$menuText:#bfcbd9;
-$menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+// $menuText:#bfcbd9;
+$menuActiveText:#0C8AFF;
+// $subMenuActiveText:#f4f4f5;
 
-$menuBg:#001529;
-$menuHover:#263445;
+// $menuBg:#001529;
+// $menuHover:#263445;
 
-$subMenuBg:#000c17;
-$subMenuHover:#001528;
+// $subMenuBg:#000c17;
+// $subMenuHover:#001528;
 
-$sideBarWidth: 210px;
+
+$base-sidebar-width: 200px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
-  menuText: $menuText;
+  // menuText: $menuText;
   menuActiveText: $menuActiveText;
-  menuActiveBg:$menuActiveText;
-  subMenuActiveText: $subMenuActiveText;
-  menuBg: $menuBg;
-  menuHover: $menuHover;
-  subMenuBg: $subMenuBg;
-  subMenuHover: $subMenuHover;
-  sideBarWidth: $sideBarWidth;
+  // menuActiveBg:$menuActiveText;
+  // subMenuActiveText: $subMenuActiveText;
+  // menuBg: $menuBg;
+  // menuHover: $menuHover;
+  // subMenuBg: $subMenuBg;
+  // subMenuHover: $subMenuHover;
+  // sideBarWidth: $sideBarWidth;
+  menuColor: $base-menu-color;
+  menuLightColor: $base-menu-light-color;
+  menuColorActive: $base-menu-color-active;
+  menuBackground: $base-menu-background;
+  menuLightBackground: $base-menu-light-background;
+  subMenuBackground: $base-sub-menu-background;
+  subMenuHover: $base-sub-menu-hover;
+  sideBarWidth: $base-sidebar-width;
+  logoTitleColor: $base-logo-title-color;
+  logoLightTitleColor: $base-logo-light-title-color
+
 }