diff --git a/.env.development b/.env.development index 8db04bcf0..174eb38ba 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:12080' +VITE_BASE_URL='http://dev.ccwin-in.com:25400/api' # 上传路径 VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload' @@ -44,3 +44,15 @@ VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' # 是否需要验证码 VITE_NEED_CODE = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +VITE_PROJECT_NAME = '富维海拉智慧工厂管理平台' + +# 租户配置 +VITE_TENANT_LIST='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' diff --git a/.env.dl-check b/.env.dl-check index 8c11fb262..82ea805aa 100644 --- a/.env.dl-check +++ b/.env.dl-check @@ -48,3 +48,15 @@ VITE_NEED_CODE = false # 是否需要下载PDA链接 VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +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 8c11fb262..82ea805aa 100644 --- a/.env.dl-prod +++ b/.env.dl-prod @@ -48,3 +48,15 @@ VITE_NEED_CODE = false # 是否需要下载PDA链接 VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +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 8c11fb262..82ea805aa 100644 --- a/.env.dl-test +++ b/.env.dl-test @@ -48,3 +48,15 @@ VITE_NEED_CODE = false # 是否需要下载PDA链接 VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +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 06f2aa7cc..c400ac03a 100644 --- a/.env.prod +++ b/.env.prod @@ -52,3 +52,15 @@ VITE_NEED_CODE = true # 是否需要下载PDA链接 VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +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 cb687a764..676319e88 100644 --- a/.env.test +++ b/.env.test @@ -47,4 +47,16 @@ VITE_NEED_CODE = true # 是否需要下载PDA链接 -VITE_PDA_URL = true \ No newline at end of file +VITE_PDA_URL = true + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +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 218728c32..9180ad97f 100644 --- a/.env.test-scp +++ b/.env.test-scp @@ -48,3 +48,15 @@ VITE_NEED_CODE = false # 是否需要下载PDA链接 VITE_PDA_URL = false + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +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 7ee319b35..b6c7aec27 100644 --- a/.env.wyf +++ b/.env.wyf @@ -128,4 +128,16 @@ VITE_SYSTERM_UPDATE_ALERT = false VITE_NEED_CODE = false # 是否需要下载PDA链接 -VITE_PDA_URL = true \ No newline at end of file +VITE_PDA_URL = true + +# LOGO图标 +VITE_LOGO_URL = '/src/assets/imgs/logo_white_blue.png' + +# LOGO图标 +VITE_LOGO_WHITE_URL = '/src/assets/imgs/logo_white.png' + +# 项目名称 +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/index.html b/index.html index e1dc00eea..c0a68ec73 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + @@ -132,7 +132,7 @@
- +
%VITE_APP_TITLE%
@@ -143,5 +143,19 @@
+ diff --git a/public/logo1.png b/public/logo1.png new file mode 100644 index 000000000..0dcd2fa03 Binary files /dev/null and b/public/logo1.png differ diff --git a/public/logo_white.png b/public/logo_white.png new file mode 100644 index 000000000..fe3f26474 Binary files /dev/null and b/public/logo_white.png differ diff --git a/public/logo_white_blue.png b/public/logo_white_blue.png new file mode 100644 index 000000000..5f8214f15 Binary files /dev/null and b/public/logo_white_blue.png differ diff --git a/public/systemConfig.js b/public/systemConfig.js index 394209322..8b75d7218 100644 --- a/public/systemConfig.js +++ b/public/systemConfig.js @@ -16,5 +16,16 @@ let systemConfig = { //是否需要验证码 needCode:false, //是否需要PDA下载链接 - pdaUrl:false, + pdaUrl: false, + + // logo图标 + logoUrl: '/logo_white_blue.png', + // logo图标 + logoUrlWhite: '/logo_white.png', + // 项目名称 + projectName: '富维海拉智慧工厂管理平台', + // 浏览器上方图标 + iconUrl: '/logo1.png', + // 租戶列表 + tenantList:'[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' } diff --git a/src/layout/components/Logo/src/Logo.vue b/src/layout/components/Logo/src/Logo.vue index 57e672915..23c0be7be 100644 --- a/src/layout/components/Logo/src/Logo.vue +++ b/src/layout/components/Logo/src/Logo.vue @@ -2,6 +2,7 @@ import { computed, onMounted, ref, unref, watch } from 'vue' import { useAppStore } from '@/store/modules/app' import { useDesign } from '@/hooks/web/useDesign' +import { getWhiteLogo,getProjectName } from '@/utils/systemParam' defineOptions({ name: 'Logo' }) @@ -13,7 +14,7 @@ const appStore = useAppStore() const show = ref(true) -const title = computed(() => appStore.getTitle) +const title = computed(() =>getProjectName()) const layout = computed(() => appStore.getLayout) @@ -77,9 +78,9 @@ watch( ]" to="/" > -
- - {{ t(`ts.${underlineToHump(appStore.getTitle)}`) }} + + {{ t(`ts.${underlineToHump(getProjectName())}`) }}
@@ -33,8 +33,8 @@ class="flex items-center justify-between at-2xl:justify-end at-xl:justify-end" >
- - {{ t(`ts.${underlineToHump(appStore.getTitle)}`) }} + + {{ t(`ts.${underlineToHump(getProjectName())}`) }}
@@ -72,6 +72,7 @@ import { useDesign } from '@/hooks/web/useDesign' import { useAppStore } from '@/store/modules/app' import { ThemeSwitch } from '@/layout/components/ThemeSwitch' import { LocaleDropdown } from '@/layout/components/LocaleDropdown' +import {getLogo,getProjectName } from '@/utils/systemParam' import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue,QRCodePDA } from './components'