diff --git a/.env b/.env index 74e66bb15..f1ed0eb1b 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=富维海拉智慧工厂管理平台 +VITE_APP_TITLE=德立智能制造系统 # 项目本地运行端口号 VITE_PORT=80 diff --git a/.env.dl-check b/.env.dl-check index 82ea805aa..dc3c6de4b 100644 --- a/.env.dl-check +++ b/.env.dl-check @@ -50,13 +50,13 @@ VITE_NEED_CODE = false VITE_PDA_URL = false # LOGO图标 -VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' +VITE_LOGO_URL = '/src/assets/imgs/deli_logo_white_blue.png' # LOGO图标 -VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' +VITE_LOGO_WHITE_URL = '/src/assets/imgs/deli_logo_white.png' # 项目名称 -VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' +VITE_PROJECT_NAME = '德立智能制造系统' # 租户配置 VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.dl-prod b/.env.dl-prod index 82ea805aa..dc3c6de4b 100644 --- a/.env.dl-prod +++ b/.env.dl-prod @@ -50,13 +50,13 @@ VITE_NEED_CODE = false VITE_PDA_URL = false # LOGO图标 -VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' +VITE_LOGO_URL = '/src/assets/imgs/deli_logo_white_blue.png' # LOGO图标 -VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' +VITE_LOGO_WHITE_URL = '/src/assets/imgs/deli_logo_white.png' # 项目名称 -VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' +VITE_PROJECT_NAME = '德立智能制造系统' # 租户配置 VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.dl-test b/.env.dl-test index 82ea805aa..dc3c6de4b 100644 --- a/.env.dl-test +++ b/.env.dl-test @@ -50,13 +50,13 @@ VITE_NEED_CODE = false VITE_PDA_URL = false # LOGO图标 -VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' +VITE_LOGO_URL = '/src/assets/imgs/deli_logo_white_blue.png' # LOGO图标 -VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' +VITE_LOGO_WHITE_URL = '/src/assets/imgs/deli_logo_white.png' # 项目名称 -VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' +VITE_PROJECT_NAME = '德立智能制造系统' # 租户配置 VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.prod b/.env.prod index c400ac03a..b13bcb717 100644 --- a/.env.prod +++ b/.env.prod @@ -54,13 +54,13 @@ VITE_NEED_CODE = true VITE_PDA_URL = false # LOGO图标 -VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' +VITE_LOGO_URL = '/src/assets/imgs/deli_logo_white_blue.png' # LOGO图标 -VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' +VITE_LOGO_WHITE_URL = '/src/assets/imgs/deli_logo_white.png' # 项目名称 -VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' +VITE_PROJECT_NAME = '德立智能制造系统' # 租户配置 VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.test b/.env.test index 676319e88..4c6fd88f1 100644 --- a/.env.test +++ b/.env.test @@ -50,13 +50,13 @@ VITE_NEED_CODE = true VITE_PDA_URL = true # LOGO图标 -VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' +VITE_LOGO_URL = '/src/assets/imgs/deli_logo_white_blue.png' # LOGO图标 -VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' +VITE_LOGO_WHITE_URL = '/src/assets/imgs/deli_logo_white.png' # 项目名称 -VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' +VITE_PROJECT_NAME = '德立智能制造系统' # 租户配置 VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' \ No newline at end of file diff --git a/.env.test-scp b/.env.test-scp index 9180ad97f..53f55dc7e 100644 --- a/.env.test-scp +++ b/.env.test-scp @@ -50,13 +50,13 @@ VITE_NEED_CODE = false VITE_PDA_URL = false # LOGO图标 -VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' +VITE_LOGO_URL = '/src/assets/imgs/deli_logo_white_blue.png' # LOGO图标 -VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' +VITE_LOGO_WHITE_URL = '/src/assets/imgs/deli_logo_white.png' # 项目名称 -VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' +VITE_PROJECT_NAME = '德立智能制造系统' # 租户配置 VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.wyf b/.env.wyf index 865f01438..684fde902 100644 --- a/.env.wyf +++ b/.env.wyf @@ -42,15 +42,15 @@ VITE_DEV=false # VITE_UPLOAD_URL='http://192.168.1.254:12080/admin-api/infra/file/upload' # # zb -# VITE_BASE_URL='http://192.168.0.37:12080' -# # 上传路径 -# VITE_UPLOAD_URL='http://192.168.0.37:12080/admin-api/infra/file/upload' +VITE_BASE_URL='http://192.168.0.52:12080' +# 上传路径 +VITE_UPLOAD_URL='http://192.168.0.52:12080/admin-api/infra/file/upload' -# 请求路径 -VITE_BASE_URL='http://dev.ccwin-in.com:25400/api' +# # 请求路径 +# VITE_BASE_URL='http://dev.ccwin-in.com:25400/api' -# 上传路径 -VITE_UPLOAD_URL='http://dev.ccwin-in.com:25400/api/admin-api/infra/file/upload' +# # 上传路径 +# VITE_UPLOAD_URL='http://dev.ccwin-in.com:25400/api/admin-api/infra/file/upload' # # 81 WMS请求路径 82 SCP @@ -131,13 +131,13 @@ VITE_NEED_CODE = false VITE_PDA_URL = true # LOGO图标 -VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' +VITE_LOGO_URL = '/src/assets/imgs/deli_logo_white_blue.png' # LOGO图标 -VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' +VITE_LOGO_WHITE_URL = '/src/assets/imgs/deli_logo_white.png' # 项目名称 -VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' +VITE_PROJECT_NAME = '德立智能制造系统' # 租户配置 VITE_TENANT_LIST='[{"text":"德立天津工厂","value":1}]' diff --git a/index.html b/index.html index 531256c97..0e7002dfe 100644 --- a/index.html +++ b/index.html @@ -6,8 +6,8 @@ - - + + %VITE_APP_TITLE% diff --git a/public/systemConfig.js b/public/systemConfig.js index 5e8ea815e..e72e3302c 100644 --- a/public/systemConfig.js +++ b/public/systemConfig.js @@ -20,13 +20,13 @@ let systemConfig = { pdaUrl: false, // logo图标 - logoUrl: '/logo_white_blue.png', + logoUrl: '/deli_logo_white_blue.png', // logo图标 - logoUrlWhite: '/logo_white.png', + logoUrlWhite: '/deli_logo_white.png', // 项目名称 - projectName: '富维海拉智慧工厂管理平台', + projectName: '德立智能制造系统', // 浏览器上方图标 - iconUrl: '/logo1.png', + iconUrl: '/deli_logo_white_blue.png', // 租戶列表 tenantList:'[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' } diff --git a/src/assets/imgs/deli_logo_white.png b/src/assets/imgs/deli_logo_white.png new file mode 100644 index 000000000..0f1118ace Binary files /dev/null and b/src/assets/imgs/deli_logo_white.png differ diff --git a/src/assets/imgs/deli_logo_white_blue.png b/src/assets/imgs/deli_logo_white_blue.png new file mode 100644 index 000000000..bc4cbd02d Binary files /dev/null and b/src/assets/imgs/deli_logo_white_blue.png differ diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index b4cab5212..e215cc4cc 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1120,7 +1120,6 @@ export default { 查看质检报告:'Check the quality inspection report', 长春:'ChangChun', 成都:'ChengDu', - 富维海拉智慧工厂管理平台: 'FAWAY HELLA Smart Factory Management Platform', 德立智能制造系统: 'Deli Intelligent Manufacturing System', 采购未收货记录:'Purchase unreceived record', 请选择要货计划单号:'Please select the desired shipment tracking number', @@ -1141,7 +1140,6 @@ export default { // 基础设施:'infrastructure', // 报表管理:'report manager', // 报表:'statement', - // 富维海拉供应商管理系统:'vendor management system', 请输入用户名:'Please enter your username', 请输入邮箱:'Please enter email', 忘记密码:'Forget Password', @@ -1170,7 +1168,6 @@ export default { 计划员:'Planner', 最小值:'Min', 最大值:'Max', - 富维海拉供应商系统:'FAWAY HELLA Supplier System', 系统管理:'System Management', 基础设施:'Infrastructure Construction', 报表管理:'Report Management', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index d9c711219..fa34afff8 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1123,7 +1123,6 @@ export default { 查看质检报告:'查看质检报告', 长春:'长春', 成都:'成都', - 富维海拉智慧工厂管理平台: '富维海拉智慧工厂管理平台', 德立智能制造系统: '德立智能制造系统', 采购未收货记录:'采购未收货记录', 请选择要货计划单号:'请选择要货计划单号', @@ -1144,7 +1143,6 @@ export default { 基础设施:'基础设施', 报表管理:'报表管理', 报表:'报表', - 富维海拉供应商管理系统:'富维海拉供应商管理系统', 请输入用户名:'请输入用户名', 请输入邮箱:'请输入邮箱', 忘记密码:'忘记密码', @@ -1173,7 +1171,6 @@ export default { 计划员:'计划员', 最小值:'最小值', 最大值:'最大值', - 富维海拉供应商系统:'富维海拉供应商系统', 物料包装信息:'物料包装信息', 仓库管理:'仓库管理', 库区管理:'库区管理', diff --git a/src/main.ts b/src/main.ts index 419c06d0d..d922342e6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -78,7 +78,7 @@ const setupAll = async () => { // 多语言相关 const localeStore = useLocaleStore() if(localeStore&&localeStore.currentLocale&&localeStore.currentLocale.lang.indexOf('en')>-1&&document.querySelector('#app-loading-title')){ - document.querySelector('#app-loading-title').innerHTML = 'FAWAY HELLA Smart Factory Management Platform' // 富维海拉智慧工厂管理平台 + document.querySelector('#app-loading-title').innerHTML = 'Deli Intelligent Manufacturing System' // 德立智能制造系统 } setupAll() diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 84402e817..8deaf56fa 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -41,7 +41,7 @@ export const usePermissionStore = defineStore('permission', { if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) { res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[] // res.forEach(item=>{ - // if(item.name == '富维海拉供应商系统'&&tenant){ + // if(item.name == '德立智能制造系统'&&tenant){ // item.name = item.name + tenant['text'] // } // })