diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 113d712..5a45736 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -23,6 +23,7 @@ auth: '/sys/area', sidebar: false, breadcrumb: true, + activeMenu: '/area', }, }, ], @@ -47,6 +48,7 @@ auth: '/sys/resource', sidebar: false, breadcrumb: true, + activeMenu: '/resource', }, }, ], @@ -71,6 +73,7 @@ auth: '/sys/dept', sidebar: false, breadcrumb: true, + activeMenu: '/dept', }, }, ], @@ -95,6 +98,7 @@ auth: '/sys/role', sidebar: false, breadcrumb: true, + activeMenu: '/role', }, }, ], @@ -119,6 +123,7 @@ auth: '/sys/mgr', sidebar: false, breadcrumb: true, + activeMenu: '/user', }, }, ], @@ -143,6 +148,7 @@ auth: '/sys/dict', sidebar: false, breadcrumb: true, + activeMenu: '/dict', }, }, ], @@ -191,6 +197,7 @@ auth: '/sys/tenantSys/list', sidebar: false, breadcrumb: true, + activeMenu: '/tenant', }, }, ], @@ -215,6 +222,7 @@ auth: '/sys/log/biz/list', sidebar: false, breadcrumb: true, + activeMenu: '/business', }, }, ], @@ -239,6 +247,7 @@ auth: '/sys/log/error/list', sidebar: false, breadcrumb: true, + activeMenu: '/error', }, }, ], @@ -263,6 +272,7 @@ auth: '/sys/loginLog', sidebar: false, breadcrumb: true, + activeMenu: '/loginDiary', }, }, ], @@ -334,7 +344,7 @@ { path: 'list', name: 'noticeList', - component: () => import('@/views/system/notice/note.list.vue'), + component: () => import('@/views/system/notice/noteList.vue'), meta: { title: '通知公告', auth: '/sys/notice/list', diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 113d712..5a45736 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -23,6 +23,7 @@ auth: '/sys/area', sidebar: false, breadcrumb: true, + activeMenu: '/area', }, }, ], @@ -47,6 +48,7 @@ auth: '/sys/resource', sidebar: false, breadcrumb: true, + activeMenu: '/resource', }, }, ], @@ -71,6 +73,7 @@ auth: '/sys/dept', sidebar: false, breadcrumb: true, + activeMenu: '/dept', }, }, ], @@ -95,6 +98,7 @@ auth: '/sys/role', sidebar: false, breadcrumb: true, + activeMenu: '/role', }, }, ], @@ -119,6 +123,7 @@ auth: '/sys/mgr', sidebar: false, breadcrumb: true, + activeMenu: '/user', }, }, ], @@ -143,6 +148,7 @@ auth: '/sys/dict', sidebar: false, breadcrumb: true, + activeMenu: '/dict', }, }, ], @@ -191,6 +197,7 @@ auth: '/sys/tenantSys/list', sidebar: false, breadcrumb: true, + activeMenu: '/tenant', }, }, ], @@ -215,6 +222,7 @@ auth: '/sys/log/biz/list', sidebar: false, breadcrumb: true, + activeMenu: '/business', }, }, ], @@ -239,6 +247,7 @@ auth: '/sys/log/error/list', sidebar: false, breadcrumb: true, + activeMenu: '/error', }, }, ], @@ -263,6 +272,7 @@ auth: '/sys/loginLog', sidebar: false, breadcrumb: true, + activeMenu: '/loginDiary', }, }, ], @@ -334,7 +344,7 @@ { path: 'list', name: 'noticeList', - component: () => import('@/views/system/notice/note.list.vue'), + component: () => import('@/views/system/notice/noteList.vue'), meta: { title: '通知公告', auth: '/sys/notice/list', diff --git a/src/views/login.vue b/src/views/login.vue index 6e2b685..17dbad3 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -28,13 +28,17 @@ const redirect = ref(route.query.redirect?.toString() ?? '/') // 是否需要验证码 const showKaptcha = ref(false) +// 公钥 const publicKey = ref('') +// sid +const sid = ref('') // 获取系统基础配置: 公钥,是否开启验证码 function getBaseConfig() { userStore.getBaseConfig().then((res) => { showKaptcha.value = res.kaptcha publicKey.value = res.publicKey + sid.value = res.sid ElMessage({ message: '连接服务器成功', type: 'success', @@ -68,6 +72,7 @@ loading.value = true // 表单对象 const finalForm = { + sid: sid.value, username: loginForm.value.username, password: '', kaptcha: loginForm.value.kaptcha, @@ -248,7 +253,7 @@ - +