From 3f7811279346eb17f614839b9aedcf6e1450807f Mon Sep 17 00:00:00 2001
From: 4670101279 <tongwei19940904>
Date: Tue, 6 Dec 2022 17:17:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/logo.png                        | Bin 0 -> 2004 bytes
 src/assets/styles/sidebar.scss         |   3 ++-
 src/assets/styles/variables.scss       |   2 +-
 src/layout/components/Sidebar/Logo.vue |   4 ++--
 src/views/index.vue                    |   2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 public/logo.png

diff --git a/public/logo.png b/public/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ee61003be5e99ea0844abb7ed09a12bc48625bd
GIT binary patch
literal 2004
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

literal 0
HcmV?d00001

diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 5d2cf1d..4464b48 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,7 +1,8 @@
 #app {
 
   .el-menu-item.is-active {
-    color: rgb(2, 18, 38) !important;
+    // color: rgb(2, 18, 38) !important;
+    color: #fff !important;
     //background-color: $base-sub-menu-hover !important; // 点击菜单的颜色
     &:hover {
       background-color: $base-sub-menu-hover !important;
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 49b2362..b28a40c 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -53,7 +53,7 @@ $panGreen: #30B08F;
 
 
 
-$base-menu-color: #dedede; // 菜单全部字体颜色
+$base-menu-color: #c4c5c6; // 菜单全部字体颜色
 $base-menu-color-active: #ffffff; // 父级菜单激活的字体颜色
 //$base-menu-background: rgb(20, 123, 227); // 菜单栏背景颜色（非激活状态）
 $base-menu-background: #08518e; // 菜单栏背景颜色（非激活状态）
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 96eb648..8a86399 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -70,8 +70,8 @@ export default {
       width: 28px;
       height: 28px;
       vertical-align: middle;
-      //margin-right: 8px;
-      margin: 0 6px 6px -20px
+      margin-right: 8px;
+      // margin: 0 6px 6px -20px
     }
 
     & .sidebar-title {
diff --git a/src/views/index.vue b/src/views/index.vue
index 41f8b4b..6d9f448 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -5,7 +5,7 @@
       <div class="main">
         <!-- 标题栏 -->
         <header>
-<!--          <h1>视频水位计数据监控大屏</h1>-->
+         <h1>视频水位分析单元监控大屏</h1>
         </header>
         <div class="left" @click="closeBox">
           <!-- 实时水位 -->