From b55da58fb3b8141a49ed19296c69682a23e7fe68 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 5 Jan 2026 17:31:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=9B=BD=E9=99=85=E5=8C=96=E7=99=BB?= =?UTF-8?q?=E9=99=86=EF=BC=8C=E5=B7=A5=E5=8E=82=E4=BF=A1=E6=81=AF=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en_US.json | 53 +++++++- src/lang/zh_CN.json | 53 +++++++- src/layout/components/Sidebar/Logo.vue | 8 +- src/views/index.vue | 2 +- src/views/login.vue | 50 ++++++- src/views/mes/baseFactoryInfo/index.vue | 166 ++++++++++++------------ 6 files changed, 241 insertions(+), 91 deletions(-) diff --git a/src/lang/en_US.json b/src/lang/en_US.json index 17b472e..76b4f4b 100644 --- a/src/lang/en_US.json +++ b/src/lang/en_US.json @@ -8,7 +8,10 @@ "password": "Password", "login": "Login", "code": "Verification Code", - "copyright": "" + "copyright": "", + "momSystem": "Smart Manufacturing MOM Platform System", + "momPlatform": "MOM PlatformSystem", + "rememberPassword": "Remember password" }, "navbar": { "full": "Full Screen", @@ -21,5 +24,53 @@ "layoutSetting": "Layout Setting", "personalCenter": "Personal Center", "logout": "Logout" + }, + "baseFactoryInfo": { + "factoryCode": "Factory Code", + "factoryName": "Factory Name", + "factoryStatus": "Factory Status", + "companyName": "Company Name", + "timeZone": "Time Zone", + "remark": "Remark", + "tenantId": "Tenant ID", + "factoryId": "Factory ID", + "createBy": "Created By", + "createTime": "Create Time", + "updateBy": "Updated By", + "updateTime": "Update Time", + "operation": "Operation", + "search": "Search", + "reset": "Reset", + "add": "Add", + "edit": "Edit", + "delete": "Delete", + "export": "Export", + "confirm": "Confirm", + "cancel": "Cancel", + "placeholder": { + "factoryCode": "Please enter factory code", + "factoryName": "Please enter factory name", + "factoryStatus": "Please select factory status", + "companyName": "Please enter company name", + "timeZone": "Please select time zone", + "remark": "Please enter remark" + }, + "dialog": { + "add": "Add Factory Info", + "edit": "Edit Factory Info" + }, + "validation": { + "factoryIdRequired": "Factory ID cannot be empty", + "companyNameRequired": "Company name cannot be empty", + "factoryCodeRequired": "Factory code cannot be empty", + "factoryNameRequired": "Factory name cannot be empty", + "timeZoneRequired": "Time zone cannot be empty", + "factoryStatusRequired": "Factory status cannot be empty" + }, + "message": { + "success": "Operation successful", + "deleteSuccess": "Delete successful", + "deleteConfirm": "Are you sure to delete factory info with code \"{ids}\"?" + } } } diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json index 071598d..20c1791 100644 --- a/src/lang/zh_CN.json +++ b/src/lang/zh_CN.json @@ -8,7 +8,10 @@ "password": "密码", "login": "登 录", "code": "请输入验证码", - "copyright": "" + "copyright": "", + "momSystem": "智造MOM平台系统", + "momPlatform": "智造MOM平台系统", + "rememberPassword": "记住密码" }, "navbar": { "full": "全屏", @@ -21,5 +24,53 @@ "layoutSetting": "布局设置", "personalCenter": "个人中心", "logout": "退出登录" + }, + "baseFactoryInfo": { + "factoryCode": "工厂编号", + "factoryName": "工厂名称", + "factoryStatus": "工厂状态", + "companyName": "公司名称", + "timeZone": "时区", + "remark": "备注", + "tenantId": "租户编号", + "factoryId": "主键标识", + "createBy": "创建人", + "createTime": "创建时间", + "updateBy": "更新人", + "updateTime": "更新时间", + "operation": "操作", + "search": "搜索", + "reset": "重置", + "add": "新增", + "edit": "修改", + "delete": "删除", + "export": "导出", + "confirm": "确定", + "cancel": "取消", + "placeholder": { + "factoryCode": "请输入工厂编号", + "factoryName": "请输入工厂名称", + "factoryStatus": "请选择工厂状态", + "companyName": "请输入公司名称", + "timeZone": "请选择时区", + "remark": "请输入备注" + }, + "dialog": { + "add": "添加工厂信息", + "edit": "修改工厂信息" + }, + "validation": { + "factoryIdRequired": "主键标识不能为空", + "companyNameRequired": "公司名称不能为空", + "factoryCodeRequired": "工厂编号不能为空", + "factoryNameRequired": "工厂名称不能为空", + "timeZoneRequired": "时区不能为空", + "factoryStatusRequired": "工厂状态不能为空" + }, + "message": { + "success": "操作成功", + "deleteSuccess": "删除成功", + "deleteConfirm": "是否确认删除工厂信息编号为\"{ids}\"的数据项？" + } } } diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index c81a68d..38ab03b 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -27,14 +27,18 @@ import logo from '@/assets/logo/logo.png'; import useSettingsStore from '@/store/modules/settings'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; +import { useI18n } from 'vue-i18n'; + +// 使用 useI18n +const { t, locale } = useI18n(); + defineProps({ collapse: { type: Boolean, required: true } }); - -const title = ref('智造MOM平台系统'); +const title = ref(String(t('login.momPlatform'))); const settingsStore = useSettingsStore(); const sideTheme = computed(() => settingsStore.sideTheme); diff --git a/src/views/index.vue b/src/views/index.vue index c91b459..4c9a309 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -2,7 +2,7 @@
-

智造MOM平台系统

+

{{ $t('login.momSystem') }}

diff --git a/src/views/login.vue b/src/views/login.vue index d0b6aef..2e0d402 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,7 +1,12 @@ @@ -68,6 +73,7 @@ import { useUserStore } from '@/store/modules/user'; import { LoginData, TenantVO } from '@/api/types'; import { to } from 'await-to-js'; import { HttpStatus } from '@/enums/RespEnum'; +import LangSelect from '@/components/LangSelect/index.vue'; const userStore = useUserStore(); const router = useRouter(); @@ -218,10 +224,42 @@ onMounted(() => { background-size: cover; } -.title { +.title-wrapper { + display: flex; + justify-content: space-between; + align-items: center; margin: 0px auto 30px auto; +} + +.title { + margin: 0; text-align: center; color: #707070; + flex: 1; +} + +.lang-select-wrapper { + cursor: pointer; + transition: all 0.3s ease; + + :deep(.lang-select--style) { + transition: all 0.3s ease; + padding: 4px 8px; + border-radius: 4px; + + &:hover { + background-color: #f5f7fa; + transform: scale(1.1); + } + + &:active { + transform: scale(0.95); + } + } + + &:hover { + opacity: 0.8; + } } .login-form { diff --git a/src/views/mes/baseFactoryInfo/index.vue b/src/views/mes/baseFactoryInfo/index.vue index 6c702d1..4ba3e59 100644 --- a/src/views/mes/baseFactoryInfo/index.vue +++ b/src/views/mes/baseFactoryInfo/index.vue @@ -4,21 +4,21 @@ :leave-active-class='proxy?.animate.searchAnimate.leave'>
- - - + + + - - + + - - + + - 搜索 - 重置 + {{ $t('baseFactoryInfo.search') }} + {{ $t('baseFactoryInfo.reset') }} @@ -29,22 +29,22 @@