0f94cd46 by 任超

style:路由

1 parent b76a9d2b
...@@ -45,6 +45,7 @@ export default { ...@@ -45,6 +45,7 @@ export default {
45 .then((res) => { 45 .then((res) => {
46 sessionStorage.removeItem("token"); 46 sessionStorage.removeItem("token");
47 this.$store.dispatch("user/resetState"); 47 this.$store.dispatch("user/resetState");
48 this.$store.dispatch("permission/resetRoutes");
48 this.$router.replace({ 49 this.$router.replace({
49 path: "/jg", 50 path: "/jg",
50 query: { 51 query: {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 10
11 &-header { 11 &-header {
12 width: 100%; 12 width: 100%;
13 padding: 5px 30px 20px 24px; 13 padding: 15px;
14 box-sizing: border-box; 14 box-sizing: border-box;
15 background-size: 100% 100%; 15 background-size: 100% 100%;
16 background: #FFFFFF; 16 background: #FFFFFF;
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 background: #FFFFFF; 24 background: #FFFFFF;
25 border-radius: 4px; 25 border-radius: 4px;
26 background-size: 100% 100%; 26 background-size: 100% 100%;
27 padding: 22px 42px 20px; 27 padding: 15px;
28 } 28 }
29 29
30 30
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
14 .sidebar-container { 14 .sidebar-container {
15 transition: width 0.28s; 15 transition: width 0.28s;
16 width: $sideBarWidth !important; 16 width: $sideBarWidth !important;
17 overflow-y: scroll;
18 font-size: 0px; 17 font-size: 0px;
19 @include background_color("menuBg"); 18 @include background_color("menuBg");
20 19
...@@ -22,7 +21,9 @@ ...@@ -22,7 +21,9 @@
22 transition: 0s width ease-in-out, 0s padding-left ease-in-out, 21 transition: 0s width ease-in-out, 0s padding-left ease-in-out,
23 0s padding-right ease-in-out; 22 0s padding-right ease-in-out;
24 } 23 }
25 24 .el-scrollbar {
25 height: 100%;
26 }
26 .scrollbar-wrapper { 27 .scrollbar-wrapper {
27 overflow-x: hidden !important; 28 overflow-x: hidden !important;
28 margin-right: 0 !important; 29 margin-right: 0 !important;
...@@ -69,13 +70,13 @@ ...@@ -69,13 +70,13 @@
69 70
70 &:hover { 71 &:hover {
71 color: $subMenuActiveText !important; 72 color: $subMenuActiveText !important;
72 @include font_color("menuActiveText"); 73 @include font_color("submenuColor");
73 @include background_color("menuActive"); 74 @include background_color("submenuBg");
74 75
75 .svg-icon, 76 .svg-icon,
76 i, 77 i,
77 span { 78 span {
78 color: #4162D8 !important; 79 @include font_color("submenuColor");
79 } 80 }
80 } 81 }
81 } 82 }
...@@ -88,8 +89,8 @@ ...@@ -88,8 +89,8 @@
88 background-color: transparent !important; 89 background-color: transparent !important;
89 90
90 &:hover { 91 &:hover {
91 @include font_color("menuActiveText"); 92 @include font_color("submenuColor");
92 @include background_color("menuActive"); 93 @include background_color("submenuBg");
93 94
94 .svg-icon { 95 .svg-icon {
95 color: #1ea6f8 !important; 96 color: #1ea6f8 !important;
...@@ -103,8 +104,8 @@ ...@@ -103,8 +104,8 @@
103 104
104 .submenu-title-noDropdown.is-active, 105 .submenu-title-noDropdown.is-active,
105 .el-submenu__title.is-active { 106 .el-submenu__title.is-active {
106 @include background_color("menuActive"); 107 @include background_color("submenuBg");
107 @include font_color("menuActiveText"); 108 @include font_color("submenuColor");
108 109
109 .svg-icon { 110 .svg-icon {
110 color: #1ea6f8 !important; 111 color: #1ea6f8 !important;
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
132 133
133 .svg-icon { 134 .svg-icon {
134 font-size: 18px; 135 font-size: 18px;
135 color: #6D7278!important; 136 color: #6D7278 !important;
136 } 137 }
137 } 138 }
138 139
...@@ -315,6 +316,19 @@ ...@@ -315,6 +316,19 @@
315 } 316 }
316 } 317 }
317 318
319 .el-submenu.is-active .el-submenu__title {
320 @include background_color("submenuBg");
321 @include font_color("submenuColor");
322 }
323
324 .el-submenu.is-active .el-submenu__title:hover {
325 @include font_color("submenuColor");
326 }
327
328 .el-submenu.is-active .el-submenu__title .svg-icon {
329 @include font_color("submenuColor");
330 }
331
318 .el-submenu__title { 332 .el-submenu__title {
319 display: flex; 333 display: flex;
320 align-items: center; 334 align-items: center;
......