diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index da21f56..bf57222 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -4,14 +4,6 @@
outline: 0 !important;
}
-html,
-body,
-#app,
-.wrapper {
- width: 100%;
- height: 100%;
- overflow: hidden;
-}
body {
font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
diff --git a/src/components/header.vue b/src/components/header.vue
index 54169d5..5bef556 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -1,61 +1,66 @@
-
+
diff --git a/src/components/tabs.vue b/src/components/tabs.vue
index 4dfd6b9..ec819b7 100644
--- a/src/components/tabs.vue
+++ b/src/components/tabs.vue
@@ -1,27 +1,32 @@
-
-
-
-
-
-
-
- 标签选项
-
-
-
-
-
-
- 关闭其他
- 关闭当前
- 关闭所有
-
-
-
-
-
+
+
+
+
+
+
+
+ 标签选项
+
+
+
+
+
+
+ 关闭其他
+ 关闭当前
+ 关闭所有
+
+
+
+
+
diff --git a/src/router/index.ts b/src/router/index.ts
index 3edbf8e..cd6d81c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -19,7 +19,7 @@ const routes: RouteRecordRaw[] = [
name: 'dashboard',
meta: {
title: '系统首页',
- permiss: '0',
+ noAuth: true,
},
component: () => import(/* webpackChunkName: "dashboard" */ '../views/dashboard.vue'),
},
@@ -273,12 +273,12 @@ const router = createRouter({
router.beforeEach((to, from, next) => {
NProgress.start();
- const role = localStorage.getItem('ms_username');
+ const role = localStorage.getItem('vuems_name');
const permiss = usePermissStore();
if (!role && to.meta.noAuth !== true) {
next('/login');
- } else if (to.meta.permiss && !permiss.key.includes(to.meta.permiss)) {
+ } else if (typeof to.meta.permiss == 'string' && !permiss.key.includes(to.meta.permiss)) {
// 如果没有权限,则进入403
next('/403');
} else {
diff --git a/src/store/permiss.ts b/src/store/permiss.ts
index ac505b1..d97553f 100644
--- a/src/store/permiss.ts
+++ b/src/store/permiss.ts
@@ -6,48 +6,50 @@ interface ObjectList {
export const usePermissStore = defineStore('permiss', {
state: () => {
- const keys = localStorage.getItem('ms_keys');
+ const defaultList: ObjectList = {
+ admin: [
+ '0',
+ '1',
+ '11',
+ '12',
+ '13',
+ '2',
+ '21',
+ '22',
+ '23',
+ '24',
+ '25',
+ '26',
+ '27',
+ '28',
+ '29',
+ '291',
+ '292',
+ '3',
+ '31',
+ '32',
+ '33',
+ '34',
+ '4',
+ '41',
+ '42',
+ '5',
+ '7',
+ '6',
+ '61',
+ '62',
+ '63',
+ '64',
+ '65',
+ '66',
+ ],
+ user: ['0', '1', '11', '12', '13'],
+ };
+ const username = localStorage.getItem('vuems_name');
+ console.log(username);
return {
- key: keys ? JSON.parse(keys) : [],
- defaultList: {
- admin: [
- '0',
- '1',
- '11',
- '12',
- '13',
- '2',
- '21',
- '22',
- '23',
- '24',
- '25',
- '26',
- '27',
- '28',
- '29',
- '291',
- '292',
- '3',
- '31',
- '32',
- '33',
- '34',
- '4',
- '41',
- '42',
- '5',
- '7',
- '6',
- '61',
- '62',
- '63',
- '64',
- '65',
- '66',
- ],
- user: ['0', '1', '11', '12', '13'],
- },
+ key: (username == 'admin' ? defaultList.admin : defaultList.user) as string[],
+ defaultList,
};
},
actions: {
diff --git a/src/views/home.vue b/src/views/home.vue
index bb8e7e1..dbda24e 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -1,18 +1,20 @@
-
-
-
+
\ No newline at end of file
+
diff --git a/src/views/pages/403.vue b/src/views/pages/403.vue
index eacb892..31e12a7 100644
--- a/src/views/pages/403.vue
+++ b/src/views/pages/403.vue
@@ -1,16 +1,16 @@
-
-
-
403
-
啊哦~ 你没有权限访问该页面哦
-
-
- 返回首页
-
- 返回上一页
-
-
-
+
+
+
403
+
啊哦~ 你没有权限访问该页面哦
+
+
+ 返回首页
+
+ 返回上一页
+
+
+
diff --git a/src/views/pages/404.vue b/src/views/pages/404.vue
index 31bae0d..eb2a551 100644
--- a/src/views/pages/404.vue
+++ b/src/views/pages/404.vue
@@ -1,16 +1,16 @@
-
-
-
404
-
啊哦~ 你所访问的页面不存在
-
-
- 返回首页
-
- 返回上一页
-
-
-
+
+
+
404
+
啊哦~ 你所访问的页面不存在
+
+
+ 返回首页
+
+ 返回上一页
+
+
+
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 16ef047..47e2d3b 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -83,10 +83,9 @@ const submitForm = (formEl: FormInstance | undefined) => {
formEl.validate((valid: boolean) => {
if (valid) {
ElMessage.success('登录成功');
- localStorage.setItem('ms_username', param.username);
+ localStorage.setItem('vuems_name', param.username);
const keys = permiss.defaultList[param.username == 'admin' ? 'admin' : 'user'];
permiss.handleSet(keys);
- localStorage.setItem('ms_keys', JSON.stringify(keys));
router.push('/');
if (checked.value) {
localStorage.setItem('login-param', JSON.stringify(param));
@@ -110,7 +109,7 @@ tabs.clearTabs();
align-items: center;
justify-content: center;
width: 100%;
- height: 100%;
+ height: 100vh;
background: url(../../assets/img/login-bg.jpg) center/cover no-repeat;
}
diff --git a/src/views/pages/register.vue b/src/views/pages/register.vue
index c3cdec0..41b0c0e 100644
--- a/src/views/pages/register.vue
+++ b/src/views/pages/register.vue
@@ -2,10 +2,8 @@
@@ -27,8 +25,12 @@
-
+
@@ -37,7 +39,9 @@
注册
- 已有账号,立即登录
+
+ 已有账号,立即登录
+
@@ -79,7 +83,6 @@ const submitForm = (formEl: FormInstance | undefined) => {
}
});
};
-
-
-
\ No newline at end of file