diff --git a/.env.development b/.env.development index 8db04bcf0..2f7bcbecf 100644 --- a/.env.development +++ b/.env.development @@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://localhost:12080' # 租户配置 -VITE_TENANT='["长春1379","成都1397","长春2379"]' +VITE_TENANT='["英泰"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.test b/.env.test index cb687a764..32e696b82 100644 --- a/.env.test +++ b/.env.test @@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:29000/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:29000' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["英泰"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue index 2c14ae415..297ab6f45 100644 --- a/src/layout/components/UserInfo/src/UserInfo.vue +++ b/src/layout/components/UserInfo/src/UserInfo.vue @@ -29,11 +29,13 @@ const user = wsCache.get(CACHE_KEY.USER) const avatar = user.user.avatar ? user.user.avatar : avatarImg const userName = user.user.nickname ? user.user.nickname : 'Admin' -const names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}] -const tenant = names.find(item=>item.value == getTenantId()) +const names =[{"text":"英泰","value":1}] +const tenant = names.find(item => item.value == getTenantId()) +console.log(344,getTenantId()) +console.log(344,tenant) const language = wsCache.get('lang') if('en-US'==language){ - tenant.text=tenant.text.replace('长春','ChangChun').replace('成都','ChengDu') + tenant.text=tenant.text.replace('英泰','YingTai') } const loginOut = () => { ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), { diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 8406ad3ed..337d6dba0 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1120,7 +1120,8 @@ export default { 批量删除:'Batch delete', 查看质检报告:'Check the quality inspection report', 长春:'ChangChun', - 成都:'ChengDu', + 成都: 'ChengDu', + 英泰: 'Yingtai', 天津英泰智慧工厂管理平台:'TIANJIN YINGTAI Smart Factory Management Platform', 采购未收货记录:'Purchase unreceived record', 请选择要货计划单号:'Please select the desired shipment tracking number', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index c7402cf39..9d2137ead 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1127,6 +1127,7 @@ export default { 查看质检报告:'查看质检报告', 长春:'长春', 成都:'成都', + 英泰: '英泰', 天津英泰智慧工厂管理平台:'天津英泰智慧工厂管理平台', 采购未收货记录:'采购未收货记录', 请选择要货计划单号:'请选择要货计划单号', diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index b60d6693c..b6ee7bea1 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -130,7 +130,7 @@ import { getSwitchByCode } from '@/api/wms/switch' if('en-US'==language){ tenantArray.value = tenantArray.value.map(item => ({ name: item, - aliasName:item.replace('长春','ChangChun').replace('成都','ChengDu') + aliasName:item.replace('英泰','YingTai') })); }else{ tenantArray.value = tenantArray.value.map(item => ({