From 603772532a9144a144df71540ae715b1953996b0 Mon Sep 17 00:00:00 2001 From: "YUN-PC5\\user" Date: Tue, 24 Oct 2023 16:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E9=BD=90=E9=82=AE=E7=AE=B1=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A0=B9=E6=8D=AEtab=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=EF=BC=8C=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/login.scss | 2 +- src/components/LoginFormTitle/index.vue | 4 +- src/components/Notice/Index.vue | 2 +- src/i18n/lang/en.json | 3 +- src/i18n/lang/zh-cn.json | 3 +- src/i18n/pages/login/en.json | 9 + src/i18n/pages/login/zh-cn.json | 14 + src/views/index.vue | 637 ++++++++++++++++++------ src/views/noticecenter/index.vue | 7 +- src/views/system/role/index.vue | 2 +- 10 files changed, 523 insertions(+), 160 deletions(-) diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss index a550036..ecfec3e 100644 --- a/src/assets/styles/login.scss +++ b/src/assets/styles/login.scss @@ -19,7 +19,7 @@ .login-form { border-radius: 6px; background: #ffffff; - width: calc(100% - 30px - 70px); + width: calc(100% - 70px - 30px); margin: 0 auto; padding: 15px; position: relative; diff --git a/src/components/LoginFormTitle/index.vue b/src/components/LoginFormTitle/index.vue index c465986..e853be0 100644 --- a/src/components/LoginFormTitle/index.vue +++ b/src/components/LoginFormTitle/index.vue @@ -2,7 +2,7 @@
- +  {{ title }} 
BETA @@ -25,7 +25,7 @@ const title = ref(import.meta.env.VITE_APP_TITLE) .title { font-size: 26px; font-weight: 700; - width: 300px; + width: 400px; line-height: 50px; float: left; } diff --git a/src/components/Notice/Index.vue b/src/components/Notice/Index.vue index 84b3b29..57a7e65 100644 --- a/src/components/Notice/Index.vue +++ b/src/components/Notice/Index.vue @@ -140,7 +140,7 @@ const viewNoticeDetail = (notice: noticeInfo) => { } // 前往通知中心点击 const viewMoreNotice = () => { - router.push({ path: '/notice/center' }) + router.push({ path: '/notice/center', query: { activeTab: activeTab.value } }) } const formatDate = (dateTime) => { const dateObj = new Date(dateTime) diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index 7561cc5..3fd095e 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -114,7 +114,8 @@ "female": "Female", "male": "male", "sex": "gender", - "systemTips": "system hint" + "systemTips": "system hint", + "currentTime": "Current Time" }, "btn": { "add": "Add", diff --git a/src/i18n/lang/zh-cn.json b/src/i18n/lang/zh-cn.json index a064ae9..18ed111 100644 --- a/src/i18n/lang/zh-cn.json +++ b/src/i18n/lang/zh-cn.json @@ -115,7 +115,8 @@ "sex": "性别", "male": "男", "female": "女", - "systemTips": "系统提示" + "systemTips": "系统提示", + "currentTime": "当前时间" }, "btn": { "add": "新增", diff --git a/src/i18n/pages/login/en.json b/src/i18n/pages/login/en.json index 6a850dc..1e3cc7e 100644 --- a/src/i18n/pages/login/en.json +++ b/src/i18n/pages/login/en.json @@ -13,5 +13,14 @@ "register": "Sign up now", "toLoginByEmail": "Log in By Email", "btnLoginLoading": "Loginning..." + }, + "loginByEmail": { + "toLogin": "Log in By Password", + "email": "Email", + "getDragVerify": "Get Verify Code", + "checkDragVerifyDuration": "Try again in seconds" + }, + "roleSelectDialog": { + "close": "Dialog closes,please re-enter the CAPTCHA" } } diff --git a/src/i18n/pages/login/zh-cn.json b/src/i18n/pages/login/zh-cn.json index fae1f55..9043fa5 100644 --- a/src/i18n/pages/login/zh-cn.json +++ b/src/i18n/pages/login/zh-cn.json @@ -13,5 +13,19 @@ "register": "注册", "toLoginByEmail": "邮箱登录", "btnLoginLoading": "登录中..." + }, + "loginByEmail": { + "toLogin": "密码登录", + "email": "邮箱", + "getDragVerify": "获取验证码", + "checkDragVerifyDuration": "秒后重试", + "loginRules": { + "dragVerifyRequired": "请输入验证码", + "emailRequired": "请输入您的邮箱", + "emailFormat": "请输入正确格式的邮箱" + } + }, + "roleSelectDialog": { + "close": "弹窗关闭，请重新输入验证码" } } diff --git a/src/views/index.vue b/src/views/index.vue index d63942a..13c26d5 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,168 +1,501 @@ - diff --git a/src/views/noticecenter/index.vue b/src/views/noticecenter/index.vue index 0a361a4..2bf87ec 100644 --- a/src/views/noticecenter/index.vue +++ b/src/views/noticecenter/index.vue @@ -76,7 +76,12 @@ import useSocketStore from '@/store/modules/socket' import signalR from '@/signalr' import noticeDialog from '@/components/Notice/noticeDialog/index.vue' import { ElTable } from 'element-plus' - +const route = useRoute() +onMounted(() => { + if (route.query.activeTab) { + activeTab.value = route.query.activeTab as string + } +}) enum NoticeType { notice = 1, aimMsg = 2, diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 13494a6..2060ea8 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -68,9 +68,9 @@