diff --git a/src/assets/login/left.png b/src/assets/login/left.png
new file mode 100644
index 00000000..6b04e4ec
Binary files /dev/null and b/src/assets/login/left.png differ
diff --git a/src/assets/login/left.svg b/src/assets/login/left.svg
deleted file mode 100644
index e63746c2..00000000
--- a/src/assets/login/left.svg
+++ /dev/null
@@ -1,350 +0,0 @@
-
-
-
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 3f910e62..e534b3e1 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -73,8 +73,7 @@ export default {
logout().then(data => {
if (data.success) {
this.$store.dispatch('user/logout')
- this.$router.push(`/login?redirect=${this.$route.fullPath}`)
- this.$message.success('已退出登录！')
+ this.$router.push(`/login`)
} else {
this.$message.error(data.message)
}
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index ac0c8d8f..54006b5b 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -24,7 +24,7 @@ export default {
},
data() {
return {
- title: 'Vue Element Admin',
+ title: '安全生产管理',
logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
}
}
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index d2a56e70..7edd550d 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -17,10 +17,10 @@
@@ -225,9 +225,9 @@ export default {
margin-right: 15px;
}
&.active {
- background-color: #42b983;
+ background-color: #1890ff;
color: #fff;
- border-color: #42b983;
+ border-color: #1890ff;
&::before {
content: '';
background: #fff;
diff --git a/src/permission.js b/src/permission.js
index 2110e931..f99de6ba 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -44,7 +44,8 @@ router.beforeEach(async(to, from, next) => {
try {
// get user info
// note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
- const { roles } = await store.dispatch('user/getInfo')
+ // const { roles } = await store.dispatch('user/getInfo')
+ const { roles } = sessionStorage.getItem('ROLES')
// generate accessible routes map based on roles
const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
@@ -59,7 +60,7 @@ router.beforeEach(async(to, from, next) => {
// remove token and go to login page to re-login
await store.dispatch('user/resetToken')
Message.error(error || 'Has Error')
- next(`/login?redirect=${to.path}`)
+ next(`/login`)
NProgress.done()
}
}
@@ -72,7 +73,7 @@ router.beforeEach(async(to, from, next) => {
next()
} else {
// other pages that do not have permission to access are redirected to the login page.
- next(`/login?redirect=${to.path}`)
+ next(`/login`)
NProgress.done()
}
}
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index a19c27c1..c6f73402 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -9,15 +9,15 @@ $yellow:#FEC171;
$panGreen: #30B08F;
// sidebar
-$menuText:#bfcbd9;
-$menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+$menuText:#383A4A;
+$menuActiveText:#1177E8;
+$subMenuActiveText:#383A4A; // https://github.com/ElemeFE/element/issues/12951
-$menuBg:#304156;
-$menuHover:#263445;
+$menuBg:#fff;
+$menuHover:#E8F1FE;
-$subMenuBg:#1f2d3d;
-$subMenuHover:#001528;
+$subMenuBg:#F6F7F9;
+$subMenuHover:#E8F1FE;
$sideBarWidth: 210px;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 71539b26..e901f4ac 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -278,7 +278,7 @@ $light_gray:#eee;
height: 450px;
border-radius: 10px 0 0 10px;
background-color: #1890ff;
- background-image: url('../../assets/login/left.svg');
+ background-image: url('../../assets/login/left.png');
background-size: 100%;
background-repeat: no-repeat;
background-position: 100% 80%;