From bdde195e2b14ea674ed92b9a1b35464b9d6107f9 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 11 五月 2021 14:19:53 +0800
Subject: [PATCH] !225 【bug修复】文件上传时出现java.nio.file.FileAlreadyExistsException Merge pull request !225 from CANYON/master
---
ruoyi-ui/src/layout/components/Sidebar/Logo.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
index 021de8e..afe5fcd 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
@@ -1,13 +1,13 @@
<template>
- <div class="sidebar-logo-container" :class="{'collapse':collapse}">
+ <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">
<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>
+ <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo">
- <h1 class="sidebar-title">{{ title }} </h1>
+ <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
</router-link>
</transition>
</div>
@@ -15,6 +15,7 @@
<script>
import logoImg from '@/assets/logo/logo.png'
+import variables from '@/assets/styles/variables.scss'
export default {
name: 'SidebarLogo',
@@ -24,6 +25,14 @@
required: true
}
},
+ computed: {
+ variables() {
+ return variables;
+ },
+ sideTheme() {
+ return this.$store.state.settings.sideTheme
+ }
+ },
data() {
return {
title: '若依管理系统',
--
Gitblit v1.9.2