图标名称变量

1 month ago · 6080f48c6a
17 changed files with 175 additions and 14 deletions
--- 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}]'
--- 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}]'
--- 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}]'
--- 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}]'
--- 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}]'
--- a/.env.test
+++ b/.env.test
@ -47,4 +47,16 @@ VITE_NEED_CODE = true


 # 是否需要下载PDA链接
-VITE_PDA_URL = true
+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}]'
--- 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}]'
--- a/.env.wyf
+++ b/.env.wyf
@ -128,4 +128,16 @@ VITE_SYSTERM_UPDATE_ALERT = false
 VITE_NEED_CODE = false

 # 是否需要下载PDA链接
-VITE_PDA_URL = true
+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}]'
--- a/index.html
+++ b/index.html
@ -3,7 +3,7 @@
  <head>
    <meta charset="UTF-8" />
    <!-- <link rel="icon" href="/favicon.ico" /> -->
-    <link rel="icon" href="/src/assets/imgs/logo1.png" />
+    <link rel="icon" href="" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <meta name="keywords" content="富维海拉智慧工厂管理平台" />
@ -132,7 +132,7 @@
      <div class="app-loading">
        <div class="app-loading-wrap">
          <div class="app-loading-title">
-            <img src="/src/assets/imgs/logo_white_blue.png" class="app-loading-logo" alt="Logo" />
+            <img src="" class="app-loading-logo" alt="Logo" id="logo" />
            <div class="app-loading-title" id="app-loading-title">%VITE_APP_TITLE%</div>
          </div>
          <div class="app-loading-item">
@ -143,5 +143,19 @@
      </div>
    </div>
    <script type="module" src="/src/main.ts"></script>
+      <script>
+        document.getElementById('logo').src = systemConfig.logoUrl
+        document.getElementById('app-loading-title').innerHTML = systemConfig.projectName
+        function replaceFavicon(src) {
+          var link = document.querySelector("link[rel~='icon']");
+          if (!link) {
+            link = document.createElement('link');
+            link.rel = 'icon';
+            document.getElementsByTagName('head')[0].appendChild(link);
+          }
+          link.href = src;
+        }
+        replaceFavicon(systemConfig.iconUrl);
+      </script>
  </body>
 </html>
--- a/public/logo1.png
+++ b/public/logo1.png
--- a/public/logo_white.png
+++ b/public/logo_white.png
--- a/public/logo_white_blue.png
+++ b/public/logo_white_blue.png
--- 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}]'
 }
--- 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="/"
    >
-    <img
+     <img
        class="h-24px ml-10px mr-10px h-40px" 
-        src="@/assets/imgs/logo_white.png"
+        :src="getWhiteLogo()"
      />
      <!-- <img
        class="h-24px w-[calc(var(--logo-height)-20px)]"
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@ -7,6 +7,7 @@ import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import {  getTenantId } from '@/utils/auth'
+import { getTenantList } from '@/utils/systemParam'

 defineOptions({ name: 'UserInfo' })

@ -29,7 +30,7 @@ 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 names =JSON.parse(getTenantList())
 const tenant = names.find(item=>item.value == getTenantId())
 const language = wsCache.get('lang')
 if('en-US'==language){
--- a/src/utils/systemParam.ts
+++ b/src/utils/systemParam.ts
@ -8,6 +8,10 @@ const systermUpdateAlert = ref(import.meta.env.VITE_SYSTERM_UPDATE_ALERT)
 const systermUpdateUrl = ref(import.meta.env.VITE_SYSTERM_UPDATE_URL)
 const needCode = ref(import.meta.env.VITE_NEED_CODE)
 const pdaUrl = ref(import.meta.env.VITE_PDA_URL)
+const logoUrl = ref(import.meta.env.VITE_LOGO_URL)
+const logoUrlWhite = ref(import.meta.env.VITE_LOGO_WHITE_URL)
+const projectName = ref(import.meta.env.VITE_PROJECT_NAME)
+const tenantList = ref(import.meta.env.VITE_TENANT_LIST)

 const mode = ref(import.meta.env.MODE)
 // 获取baseUrl
@ -96,3 +100,36 @@ export const getPDAUrl = () => {
 }


+//获取logo图标
+export const getLogo = () => {
+  if (mode.value === 'prod') {
+    return systemConfig.logoUrl
+  } else {
+    return logoUrl.value
+  }
+}
+//获取logo图标
+export const getWhiteLogo = () => {
+  if (mode.value === 'prod') {
+    return systemConfig.logoUrlWhite
+  } else {
+    return logoUrlWhite.value
+  }
+}
+//获取项目名称
+export const getProjectName = () => {
+  if (mode.value === 'prod') {
+    return systemConfig.projectName
+  } else {
+    return projectName.value
+  }
+}
+
+//获取租户列表
+export const getTenantList = () => {
+  if (mode.value === 'prod') {
+    return systemConfig.tenantList
+  } else {
+    return tenantList.value
+  }
+}
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@ -9,8 +9,8 @@
      >
        <!-- 左上角的 logo + 系统标题 -->
        <div class="relative flex items-center ">
-          <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white_blue.png" />
-          <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
+          <img alt="" class="mr-10px  h-36px" :src="getLogo()" />
+          <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(getProjectName())}`) }}</span>
        </div>
        <!-- 左边的背景图 + 欢迎语 -->
        <div class="h-[calc(100%-60px)] flex items-center justify-center">
@ -33,8 +33,8 @@
          class="flex items-center justify-between at-2xl:justify-end at-xl:justify-end"
        >
          <div class="flex items-center at-2xl:hidden at-xl:hidden">
-            <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white_blue.png" />
-            <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
+            <img alt="" class="mr-10px  h-36px" :src="getLogo()" />
+            <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(getProjectName())}`) }}</span>
          </div>
          <div class="flex items-center justify-end space-x-10px">
            <!-- <ThemeSwitch /> -->
@ -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'