Browse Source

去掉长春和成都

intex_online20241111
zhang_li 3 weeks ago
parent
commit
1274c2a146
  1. 2
      .env.development
  2. 2
      .env.test
  3. 8
      src/layout/components/UserInfo/src/UserInfo.vue
  4. 3
      src/locales/en-US.ts
  5. 1
      src/locales/zh-CN.ts
  6. 2
      src/views/login/components/LoginForm.vue

2
.env.development

@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html'
VITE_JMREPORT_BASE_URL='http://localhost:12080' VITE_JMREPORT_BASE_URL='http://localhost:12080'
# 租户配置 # 租户配置
VITE_TENANT='["长春1379","成都1397","长春2379"]' VITE_TENANT='["英泰"]'
# 查看质检报告环境 # 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

2
.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_JMREPORT_BASE_URL='http://dev.ccwin-in.com:29000'
# 租户配置 # 租户配置
VITE_TENANT='["长春","成都"]' VITE_TENANT='["英泰"]'
# 查看质检报告环境 # 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

8
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 avatar = user.user.avatar ? user.user.avatar : avatarImg
const userName = user.user.nickname ? user.user.nickname : 'Admin' const userName = user.user.nickname ? user.user.nickname : 'Admin'
const names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}] const names =[{"text":"英泰","value":1}]
const tenant = names.find(item=>item.value == getTenantId()) const tenant = names.find(item => item.value == getTenantId())
console.log(344,getTenantId())
console.log(344,tenant)
const language = wsCache.get('lang') const language = wsCache.get('lang')
if('en-US'==language){ if('en-US'==language){
tenant.text=tenant.text.replace('长春','ChangChun').replace('成都','ChengDu') tenant.text=tenant.text.replace('英泰','YingTai')
} }
const loginOut = () => { const loginOut = () => {
ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), { ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), {

3
src/locales/en-US.ts

@ -1120,7 +1120,8 @@ export default {
:'Batch delete', :'Batch delete',
:'Check the quality inspection report', :'Check the quality inspection report',
:'ChangChun', :'ChangChun',
:'ChengDu', : 'ChengDu',
: 'Yingtai',
:'TIANJIN YINGTAI Smart Factory Management Platform', :'TIANJIN YINGTAI Smart Factory Management Platform',
:'Purchase unreceived record', :'Purchase unreceived record',
:'Please select the desired shipment tracking number', :'Please select the desired shipment tracking number',

1
src/locales/zh-CN.ts

@ -1127,6 +1127,7 @@ export default {
:'查看质检报告', :'查看质检报告',
:'长春', :'长春',
:'成都', :'成都',
: '英泰',
:'天津英泰智慧工厂管理平台', :'天津英泰智慧工厂管理平台',
:'采购未收货记录', :'采购未收货记录',
:'请选择要货计划单号', :'请选择要货计划单号',

2
src/views/login/components/LoginForm.vue

@ -130,7 +130,7 @@ import { getSwitchByCode } from '@/api/wms/switch'
if('en-US'==language){ if('en-US'==language){
tenantArray.value = tenantArray.value.map(item => ({ tenantArray.value = tenantArray.value.map(item => ({
name: item, name: item,
aliasName:item.replace('长春','ChangChun').replace('成都','ChengDu') aliasName:item.replace('英泰','YingTai')
})); }));
}else{ }else{
tenantArray.value = tenantArray.value.map(item => ({ tenantArray.value = tenantArray.value.map(item => ({

Loading…
Cancel
Save