From e754ffc06a52f2e73b570ff455516f40581b1e55 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 22 九月 2025 09:19:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into ywx
---
src/layout/components/Sidebar/Logo.vue | 80 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 25 deletions(-)
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 90146ae..f8f1da3 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 name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
- <img v-if="logo" :src="logo" class="sidebar-logo" />
- <h1 v-else class="sidebar-title">{{ title }}</h1>
+ <img v-if="logoUrl" :src="logoUrl" class="sidebar-logo" @error="handleImageError" alt="鍏徃Logo" />
+ <h1 class="sidebar-title">{{ title }}</h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
- <img v-if="logo" :src="logo" class="sidebar-logo" />
+ <img v-if="logoUrl" :src="logoUrl" class="sidebar-logo" @error="handleImageError" alt="鍏徃Logo" />
<h1 class="sidebar-title">{{ title }}</h1>
</router-link>
</transition>
@@ -14,9 +14,9 @@
</template>
<script setup>
-import logo from '@/assets/logo/logo.png'
-import useSettingsStore from '@/store/modules/settings'
-import variables from '@/assets/styles/variables.module.scss'
+import { ref, computed, onMounted, watch } from 'vue'
+import useUserStore from '@/store/modules/user'
+import defaultLogo from '@/assets/logo/logo.png' // 瀵煎叆榛樿logo
defineProps({
collapse: {
@@ -26,24 +26,53 @@
})
const title = import.meta.env.VITE_APP_TITLE
-const settingsStore = useSettingsStore()
-const sideTheme = computed(() => settingsStore.sideTheme)
+const userStore = useUserStore()
-// 鑾峰彇Logo鑳屾櫙鑹�
-const getLogoBackground = computed(() => {
- if (settingsStore.isDark) {
- return 'var(--sidebar-bg)'
- }
- return sideTheme.value === 'theme-dark' ? variables.menuBg : variables.menuLightBg
+// 澶勭悊宸ュ巶鍚嶇О锛岀敓鎴愬悎娉曠殑鏂囦欢鍚�
+const cleanFactoryName = computed(() => {
+ if (!userStore.currentFactoryName) return ''
+ return userStore.currentFactoryName.trim()
})
-// 鑾峰彇Logo鏂囧瓧棰滆壊
-const getLogoTextColor = computed(() => {
- if (settingsStore.isDark) {
- return 'var(--sidebar-text)'
+// 鍔ㄦ�乴ogo璺緞
+const logoUrl = ref('')
+
+// 妫�鏌ogo鏄惁瀛樺湪骞惰缃畊rl
+const updateLogoUrl = () => {
+ if (!cleanFactoryName.value) {
+ logoUrl.value = defaultLogo
+ return
}
- return sideTheme.value === 'theme-dark' ? '#fff' : variables.menuLightText
+
+ // 浣跨敤Vite鐨勫姩鎬佸鍏�
+ try {
+ const dynamicLogo = import.meta.glob('/src/assets/logo/*.png', { eager: true })
+ const logoPath = `/src/assets/logo/${cleanFactoryName.value}.png`
+
+ if (dynamicLogo[logoPath]) {
+ logoUrl.value = dynamicLogo[logoPath].default
+ } else {
+ logoUrl.value = defaultLogo
+ }
+ } catch (error) {
+ console.error('鍔犺浇宸ュ巶Logo澶辫触:', error)
+ logoUrl.value = defaultLogo
+ }
+}
+
+// 鍒濆鍖栧拰鐩戝惉鍙樺寲
+onMounted(() => {
+ updateLogoUrl()
+
+ // 鐩戝惉宸ュ巶鍚嶇О鍙樺寲
+ watch(() => userStore.currentFactoryName, updateLogoUrl)
})
+
+// 鍥剧墖鍔犺浇閿欒澶勭悊
+const handleImageError = (event) => {
+ console.warn('Logo鍔犺浇澶辫触锛屼娇鐢ㄩ粯璁ogo')
+ logoUrl.value = defaultLogo
+}
</script>
<style lang="scss" scoped>
@@ -60,10 +89,10 @@
.sidebar-logo-container {
position: relative;
- width: 100%;
- height: 50px;
+ width: 100% !important;
+ height: 50px !important;
line-height: 50px;
- background: v-bind(getLogoBackground);
+ background: #fff;
text-align: center;
overflow: hidden;
@@ -72,8 +101,9 @@
width: 100%;
& .sidebar-logo {
- width: 32px;
- height: 32px;
+ width: 100%;
+ height: 100%;
+ // height: 32px;
vertical-align: middle;
margin-right: 12px;
}
@@ -96,4 +126,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3