From 93a5feabdced58b2edd2aa99fe9b5f99b50427ac Mon Sep 17 00:00:00 2001
From: Ironsp <1522278303@qq.com>
Date: Tue, 7 Jul 2026 09:23:30 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E9=A1=B5=E9=9D=A2=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=92=8C=E9=A1=B5=E9=9D=A2=E7=9A=84favicon.ico=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                        |  2 +-
 src/layout/components/Sidebar/Logo.vue | 26 +++++++-------------------
 src/main.ts                            | 22 ++++++++++++++++++++++
 src/store/modules/settings.ts          | 14 +++++++++++++-
 src/utils/dynamicTitle.ts              |  7 +++++--
 5 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/.env.production b/.env.production
index 7e89221..5cd37c6 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 可视化电子围栏管理系统
+VITE_APP_TITLE = 可视化电子围栏管理系统11111
 VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
 
 # 生产环境配置
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 5069b27..2f61eb2 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{ collapse: collapse }">
     <transition :enter-active-class="proxy?.animate.logoAnimate.enter" mode="out-in">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logoUrl" class="sidebar-logo" />
+        <img v-if="showLogoImage" :src="logoUrl" class="sidebar-logo" />
         <h1 v-else class="sidebar-title">{{ logoName }}</h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logoUrl" class="sidebar-logo" />
+        <img v-if="showLogoImage" :src="logoUrl" class="sidebar-logo" />
         <h1 class="sidebar-title">{{ logoName }}</h1>
       </router-link>
     </transition>
@@ -15,11 +15,9 @@
 
 <script setup lang="ts">
 import variables from '@/assets/styles/variables.module.scss';
-import logo from '@/assets/logo/logo.png';
 import { useSettingsStore } from '@/store/modules/settings';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { NavTypeEnum } from '@/enums/NavTypeEnum';
-import { getDemo } from '@/api/systemList/index';
 
 defineProps({
   collapse: {
@@ -28,13 +26,15 @@ defineProps({
   }
 });
 
-const title = import.meta.env.VITE_APP_LOGO_TITLE;
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
+const logoUrl = computed(() => settingsStore.appLogoUrl || '');
+const logoName = computed(() => settingsStore.appTitle || import.meta.env.VITE_APP_LOGO_TITLE || 'RuoYi-Vue-Plus');
+const showLogoImage = computed(() => Boolean(logoUrl.value));
 
 // 获取Logo背景色
 const getLogoBackground = computed(() => {
-  if (settingsStore.isDark) {
+  if (settingsStore.dark) {
     return 'var(--sidebar-bg)';
   }
   if (settingsStore.navType == NavTypeEnum.TOP) {
@@ -45,7 +45,7 @@ const getLogoBackground = computed(() => {
 
 // 获取Logo文字颜色
 const getLogoTextColor = computed(() => {
-  if (settingsStore.isDark) {
+  if (settingsStore.dark) {
     return 'var(--sidebar-text)';
   }
   if (settingsStore.navType == NavTypeEnum.TOP) {
@@ -53,18 +53,6 @@ const getLogoTextColor = computed(() => {
   }
   return sideTheme.value === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor;
 });
-
-// 获取Logo图片
-const logoUrl = ref();
-const logoName = ref();
-onMounted(() => {
-  getDemo().then((res) => {
-    console.log('系统11111111111', res);
-
-    logoName.value = res.data.name;
-    logoUrl.value = res.data.url;
-  });
-});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/main.ts b/src/main.ts
index 16ac610..aa93896 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -30,6 +30,8 @@ import './permission';
 
 // 国际化
 import i18n from '@/lang/index';
+import { useSettingsStore } from '@/store/modules/settings';
+import { getDemo } from '@/api/systemList/index';
 
 // vxeTable
 import VXETable from 'vxe-table';
@@ -54,4 +56,24 @@ app.use(plugins);
 // 自定义指令
 directive(app);
 
+const settingsStore = useSettingsStore();
+getDemo()
+  .then((res) => {
+    const name = res?.data?.name;
+    const url = res?.data?.url;
+    if (name || url) {
+      settingsStore.setSystemInfo(name || '', url || '');
+
+      if (url) {
+        const link = document.querySelector("link[rel='icon']") as HTMLLinkElement | null;
+        if (link) {
+          link.href = url;
+        }
+      }
+    }
+  })
+  .catch(() => {
+    // ignore
+  });
+
 app.mount('#app');
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 06170cc..327d73d 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -19,6 +19,8 @@ export const useSettingsStore = defineStore('setting', () => {
     radiusBase: defaultSettings.radiusBase
   });
   const title = ref<string>(defaultSettings.title);
+  const appTitle = ref<string>(defaultSettings.title);
+  const appLogoUrl = ref<string>('');
   const theme = ref<string>(storageSetting.value.theme);
   const sideTheme = ref<string>(storageSetting.value.sideTheme);
   const showSettings = ref<boolean>(defaultSettings.showSettings);
@@ -36,8 +38,17 @@ export const useSettingsStore = defineStore('setting', () => {
     title.value = value;
     useDynamicTitle();
   };
+
+  const setSystemInfo = (name: string, url: string) => {
+    appTitle.value = name || defaultSettings.title;
+    appLogoUrl.value = url || '';
+    useDynamicTitle();
+  };
+
   return {
     title,
+    appTitle,
+    appLogoUrl,
     theme,
     sideTheme,
     showSettings,
@@ -50,6 +61,7 @@ export const useSettingsStore = defineStore('setting', () => {
     dark,
     navType,
     radiusBase,
-    setTitle
+    setTitle,
+    setSystemInfo
   };
 });
diff --git a/src/utils/dynamicTitle.ts b/src/utils/dynamicTitle.ts
index 8e23ef8..65f1d79 100644
--- a/src/utils/dynamicTitle.ts
+++ b/src/utils/dynamicTitle.ts
@@ -6,9 +6,12 @@ import { useSettingsStore } from '@/store/modules/settings';
  */
 export const useDynamicTitle = () => {
   const settingsStore = useSettingsStore();
+  const pageTitle = settingsStore.title || (defaultSettings.title as string);
+  const appTitle = settingsStore.appTitle || (defaultSettings.title as string);
+
   if (settingsStore.dynamicTitle) {
-    document.title = settingsStore.title + ' - ' + import.meta.env.VITE_APP_TITLE;
+    document.title = `${pageTitle} - ${appTitle}`;
   } else {
-    document.title = defaultSettings.title as string;
+    document.title = appTitle;
   }
 };