diff --git a/public/favicon.ico b/public/favicon.ico index e263760..7ee6100 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html index 28ba8e1..71b152f 100644 --- a/public/index.html +++ b/public/index.html @@ -119,7 +119,7 @@ top: 0; width: 51%; height: 100%; - background: #7171C6; + background: rgb(2 81 159); z-index: 1000; -webkit-transform: translateX(0); -ms-transform: translateX(0); @@ -194,16 +194,71 @@ color: #FFF; opacity: 0.5; } + + + + + + .load_title { + font-family: 'Open Sans'; + color: #FFF; + font-size: 19px; + width: 100%; + text-align: center; + z-index: 9999999999999; + position: absolute; + top: 60%; + opacity: 1; + line-height: 30px; + } + .loader-7 { + width: 100%; + height: 99%; + background: rgb(20, 123, 227); + display: inline-block; + position: relative; + } + .loader-7::after, .loader-7::before { + content: ""; + width: 100px; + height: 100px; + border-radius: 50%; + border: 2px solid #FFF; + position: absolute; + left: 45.5%; + top: 39%; + -webkit-animation: animloader7 2s linear infinite; + animation: animloader7 2s linear infinite; + } + .loader-7::after { + -webkit-animation-delay: 1s; + animation-delay: 1s; + } + @keyframes animloader7 { + 0% { + transform: scale(0); + opacity: 1; + } + 100% { + transform: scale(2); + opacity: 0; + } + } +
-
-
-
-
-
正在加载系统资源，请耐心等待
-
+ + + + + + +
+
正在加载中...
+
+
diff --git a/src/assets/logo/ai.png b/src/assets/logo/ai.png new file mode 100644 index 0000000..706afe7 Binary files /dev/null and b/src/assets/logo/ai.png differ diff --git a/src/assets/logo/l.png b/src/assets/logo/l.png new file mode 100644 index 0000000..5935da4 Binary files /dev/null and b/src/assets/logo/l.png differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index e263760..085482e 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/assets/logo/logo1.png b/src/assets/logo/logo1.png new file mode 100644 index 0000000..8e26b4f Binary files /dev/null and b/src/assets/logo/logo1.png differ diff --git a/src/assets/logo/logo2.png b/src/assets/logo/logo2.png new file mode 100644 index 0000000..4f65d16 Binary files /dev/null and b/src/assets/logo/logo2.png differ diff --git a/src/assets/logo/svg.png b/src/assets/logo/svg.png new file mode 100644 index 0000000..e9d47ef Binary files /dev/null and b/src/assets/logo/svg.png differ diff --git a/src/assets/logo/svg1.png b/src/assets/logo/svg1.png new file mode 100644 index 0000000..f2bfb93 Binary files /dev/null and b/src/assets/logo/svg1.png differ diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index ed308b8..5d2cf1d 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -1,5 +1,15 @@ #app { + .el-menu-item.is-active { + color: rgb(2, 18, 38) !important; + //background-color: $base-sub-menu-hover !important; // 点击菜单的颜色 + &:hover { + background-color: $base-sub-menu-hover !important; + } + } + + + .main-container { min-height: 100%; transition: margin-left .28s; diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index 34484d4..49b2362 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -9,32 +9,63 @@ $yellow:#FEC171; $panGreen: #30B08F; // 默认菜单主题风格 -$base-menu-color:#bfcbd9; -$base-menu-color-active:#f4f4f5; -$base-menu-background:#304156; -$base-logo-title-color: #ffffff; +//$base-menu-color:#bfcbd9; +//$base-menu-color-active:#f4f4f5; +//$base-menu-background:#304156; +//$base-logo-title-color: #ffffff; +// +//$base-menu-light-color:rgba(0,0,0,.70); +//$base-menu-light-background:#ffffff; +//$base-logo-light-title-color: #001529; +// +//$base-sub-menu-background:#1f2d3d; +//$base-sub-menu-hover:#001528; -$base-menu-light-color:rgba(0,0,0,.70); -$base-menu-light-background:#ffffff; -$base-logo-light-title-color: #001529; +// 自定义暗色菜单风格 +//$base-menu-color:hsla(0,0%,100%,.65); +//$base-menu-color-active:#fff; +//$base-menu-background:#001529; +//$base-logo-title-color: #ffffff; +// +//$base-menu-light-color:rgba(0,0,0,.70); +//$base-menu-light-background:#ffffff; +//$base-logo-light-title-color: #001529; +// +//$base-sub-menu-background:#000c17; +//$base-sub-menu-hover:#001528; -$base-sub-menu-background:#1f2d3d; -$base-sub-menu-hover:#001528; -// 自定义暗色菜单风格 -/** -$base-menu-color:hsla(0,0%,100%,.65); -$base-menu-color-active:#fff; -$base-menu-background:#001529; -$base-logo-title-color: #ffffff; - -$base-menu-light-color:rgba(0,0,0,.70); -$base-menu-light-background:#ffffff; -$base-logo-light-title-color: #001529; - -$base-sub-menu-background:#000c17; -$base-sub-menu-hover:#001528; -*/ +// variable.scss +// 默认菜单主题风格 +//$base-menu-color: #333333; // 菜单全部字体颜色 +//$base-menu-color-active: #304156; // 父级菜单激活的字体颜色 +//$base-menu-background: #fff; // 菜单栏背景颜色（非激活状态） +//$base-logo-title-color: #304156; // 系统标题颜色 +// +//$base-menu-light-color: rgba(0, 0, 0, 0.7); +//$base-menu-light-background: #304156; // 选中菜单的字体颜色 +//$base-logo-light-title-color: #fff; // 对应base-logo-title-color +// +//$base-sub-menu-background: #f5f7fa; // 选中的菜单的子菜单背景颜色 +//$base-sub-menu-hover: #f7f0f1; // 子菜单hover背景颜色 +// +//$base-sidebar-width: 200px; + + + +$base-menu-color: #dedede; // 菜单全部字体颜色 +$base-menu-color-active: #ffffff; // 父级菜单激活的字体颜色 +//$base-menu-background: rgb(20, 123, 227); // 菜单栏背景颜色（非激活状态） +$base-menu-background: #08518e; // 菜单栏背景颜色（非激活状态） +$base-logo-title-color: #304156; // 系统标题颜色 + +$base-menu-light-color: rgba(0, 0, 0, 0.7); +$base-menu-light-background: #b4b1b1; // 选中菜单的字体颜色 +$base-logo-light-title-color: #fff; // 对应 base-logo-title-color + +//$base-sub-menu-background: rgb(2 81 159); // 选中的菜单的子菜单背景颜色 +$base-sub-menu-background: #1667ab; // 选中的菜单的子菜单背景颜色 +$base-sub-menu-hover: rgb(7, 56, 105); // 子菜单hover背景颜色 rgb(7, 56, 105) $base-sidebar-width: 200px; diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 368b002..1329f6f 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -1,15 +1,12 @@ @@ -34,11 +31,23 @@ export default { .hamburger { display: inline-block; vertical-align: middle; - width: 20px; - height: 20px; + margin-top: 18px; + width: 16px; + color: #304156; + height: 16px; + margin-left: 6px; } .hamburger.is-active { transform: rotate(180deg); } +.nabar-title { + font-size: 18px; + margin-left: 18px; + height: 100%; + line-height: 54px; + color: rgb(255, 255, 255); + font-weight: 600; + vertical-align: middle; +} diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 0c6f4b7..627870a 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -25,7 +25,7 @@ export default {