From b1695084f2b0d8c4ac3683cf153990f46b5fb5f5 Mon Sep 17 00:00:00 2001 From: zhang zhuo Date: Thu, 5 Jun 2025 11:09:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 4 + src/App.vue | 22 ++++- src/config/index.ts | 3 + src/layout/components/setting.vue | 147 +++++++++++++++++------------- src/layout/components/tags.vue | 18 ++-- src/layout/components/userbar.vue | 50 +++++----- src/layout/index.vue | 6 ++ src/locales/index.ts | 8 +- src/locales/lang/en.ts | 22 +++-- src/locales/lang/zh-cn.ts | 18 +++- src/store/model/global.ts | 3 +- src/style/dark.scss | 3 + src/utils/errorHandler.ts | 3 +- src/views/system/login/index.vue | 13 ++- 14 files changed, 197 insertions(+), 123 deletions(-) diff --git a/index.html b/index.html index 380d53c..8f1e665 100644 --- a/index.html +++ b/index.html @@ -20,6 +20,10 @@ if (dark) { document.documentElement.classList.add("dark") } + var weak = window.localStorage.getItem('APP_WEAK'); + if (weak) { + document.documentElement.classList.add("weak") + }
diff --git a/src/App.vue b/src/App.vue index f199487..7b3ad75 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,22 +6,38 @@ diff --git a/src/layout/components/tags.vue b/src/layout/components/tags.vue index 72312f1..6a11b78 100644 --- a/src/layout/components/tags.vue +++ b/src/layout/components/tags.vue @@ -174,15 +174,15 @@ function closeSelectedTag(tag, autoPushLatestView = true) { function openContextMenu(e, tag) { contextMenuItem = tag; contextMenuVisible = true; - left = e.clientX + 1; - top = e.clientY + 1; + left.value = e.clientX + 1; + top.value = e.clientY + 1; //FIX 右键菜单边缘化位置处理 nextTick(() => { let sp = document.getElementById("contextmenu"); if (document.body.offsetWidth - e.clientX < sp.offsetWidth) { - left = document.body.offsetWidth - sp.offsetWidth + 1; - top = e.clientY + 1; + left.value = document.body.offsetWidth - sp.offsetWidth + 1; + top.value = e.clientY + 1; } }) } @@ -190,13 +190,13 @@ function openContextMenu(e, tag) { //关闭右键菜单 function closeMenu() { contextMenuItem = null; - contextMenuVisible = false + contextMenuVisible.value = false } //TAB 刷新 function refreshTab() { const nowTag = contextMenuItem; - contextMenuVisible = false + contextMenuVisible.value = false //判断是否当前路由，否的话跳转 if (route.fullPath != nowTag.fullPath) { router.push({ @@ -220,7 +220,7 @@ function closeTabs() { var nowTag = contextMenuItem; if (!nowTag.meta.affix) { closeSelectedTag(nowTag) - contextMenuVisible = false + contextMenuVisible.value = false } } @@ -242,13 +242,13 @@ function closeOtherTabs() { closeSelectedTag(tag, false) } }) - contextMenuVisible = false + contextMenuVisible.value = false } //TAB 最大化 function maximize() { var nowTag = contextMenuItem; - contextMenuVisible = false + contextMenuVisible.value = false //判断是否当前路由，否的话跳转 if (route.fullPath != nowTag.fullPath) { router.push({ diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index e365fd8..5738cdb 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -51,7 +51,7 @@ - +
@@ -64,8 +64,8 @@ - + + diff --git a/src/locales/index.ts b/src/locales/index.ts index ac597a9..5f215fa 100644 --- a/src/locales/index.ts +++ b/src/locales/index.ts @@ -4,16 +4,16 @@ import el_en from 'element-plus/dist/locale/en' import config from "@/config" import tools from '@/utils/tools' -import zh_cn from './lang/zh-cn.js' -import en from './lang/en.js' +import zh_cn from './lang/zh-cn' +import en from './lang/en' const messages = { 'zh-cn': { - el: el_zh_cn, + ...el_zh_cn, ...zh_cn }, 'en': { - el: el_en, + ...el_en, ...en } } diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 6917bf1..77ab166 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -2,10 +2,21 @@ export default { system: { webTitleDev: 'Property Management System (Testing)', webTitle: 'Property Management System', + logout: 'Log out', + cancel: 'Cancel', + primaryColor: 'Primary Color', + weakMode: 'Weak Mode', + layout: 'Layout', + pageLayout: 'Page Layout', + pleaseSelect: 'Please Select', + default: 'Default', + fullWidth: 'Full-width', + classic: 'Classic', + dock: 'Dock', + collapseMenu: 'Collapse Menu', + showLabels: 'Show Labels', }, login: { - slogan: 'SpringCloud Alibaba Microservices Architecture', - describe: 'The community group', signInTitle: 'Sign in', accountLogin: 'Account sign in', rememberMe: 'Remember me', @@ -18,18 +29,15 @@ export default { codePlaceholder: 'Please input a code', PWError: 'Please input a password', codeError: 'Please input a code', - wechatLoginTitle: 'QR code sign in', - wechatLoginMsg: 'Please use wechat to scan and log in | Auto scan after 3 seconds of simulation', - wechatLoginResult: 'Scanned | Please click authorize login in the device', backLogin: 'Return to Login' }, user: { dynamic: 'Dynamic', info: 'User Info', settings: 'Settings', - nightmode: 'night mode', + nightmode: 'Night Mode', nightmode_msg: 'Suitable for low light environment,The current night mode is beta', - language: 'language', + language: 'Language', language_msg: 'Translation in progress,Temporarily translated the text of this view', } } diff --git a/src/locales/lang/zh-cn.ts b/src/locales/lang/zh-cn.ts index 9c61dfe..dc10d46 100644 --- a/src/locales/lang/zh-cn.ts +++ b/src/locales/lang/zh-cn.ts @@ -2,10 +2,21 @@ export default { system: { webTitleDev: '物业管理系统（测试）', webTitle: '物业管理系统', + logout: '退出', + cancel: '取消', + primaryColor: '主题颜色', + weakMode: '色弱模式', + layout: '框架布局', + pageLayout: '页面布局', + pleaseSelect: '请选择', + default: '默认', + fullWidth: '通栏', + classic: '经典', + dock: '功能坞', + collapseMenu: '折叠菜单', + showLabels: '显示标签', }, login: { - slogan: 'SpringCloud Alibaba 微服务架构', - describe: '便民服务', signInTitle: '用户登录', accountLogin: '账号登录', rememberMe: '记住密码', @@ -18,9 +29,6 @@ export default { codePlaceholder: '请输入验证码', PWError: '请输入密码', codeError: '请输入验证码', - wechatLoginTitle: '二维码登录', - wechatLoginMsg: '请使用微信扫一扫登录 | 模拟3秒后自动扫描', - wechatLoginResult: '已扫描 | 请点击授权登录', backLogin: '返回登录' }, user: { diff --git a/src/store/model/global.ts b/src/store/model/global.ts index b07ea6a..843a579 100644 --- a/src/store/model/global.ts +++ b/src/store/model/global.ts @@ -1,11 +1,12 @@ import tools from "@/utils/tools"; +import config from "@/config"; export default { state: { //移动端布局 ismobile: false, //布局 - layout: tools.data.get('APP_LAYOUT') || 'default', + layout: tools.data.get('APP_LAYOUT') || config.APP_LAYOUT || 'header', //菜单是否折叠 toggle menuIsCollapse: false, //多标签栏 diff --git a/src/style/dark.scss b/src/style/dark.scss index b6d65ae..ea97631 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -35,3 +35,6 @@ html.dark { .el-table .el-table__body-wrapper {background: var(--el-bg-color);} .el-table th.is-sortable:hover {background: #111;} } + +// 色弱模式 +html.weak {-webkit-filter: invert(80%);filter: invert(80%);} diff --git a/src/utils/errorHandler.ts b/src/utils/errorHandler.ts index c7fa90c..8feda5c 100644 --- a/src/utils/errorHandler.ts +++ b/src/utils/errorHandler.ts @@ -21,8 +21,7 @@ export default (error, vm)=>{ // } // var errorName = errorMap[error.name] || "未知错误" - console.warn(`[PI error]: ${error}`); - console.error(error); + console.error(`[PI error]: ${error}`); //throw error; vm.$nextTick(() => { diff --git a/src/views/system/login/index.vue b/src/views/system/login/index.vue index 0308ffa..1eb37b2 100644 --- a/src/views/system/login/index.vue +++ b/src/views/system/login/index.vue @@ -36,17 +36,17 @@
- + + :placeholder="t('login.userPlaceholder')" @keyup.enter="login"> + :placeholder="t('login.PWPlaceholder')" @keyup.enter="login"> - + + :placeholder="t('login.codePlaceholder')" @keyup.enter="login"> @@ -159,8 +159,7 @@ async function getCode() { async function login() { // 校验登录 - const validate = await proxy.$refs.loginForm.validate().catch(() => { - }); + const validate = await proxy.$refs.loginForm.validate().catch(() => {}); if (!validate) { return false }