From 4be49c471929fad3cd952710041617c2088e31c7 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Sat, 19 Apr 2025 15:14:03 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage

---
 public/img/logo.png     |    0 
 src/page/index/logo.vue |    8 +++++++-
 src/page/lock/index.vue |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/img/logo.png b/public/img/logo.png
index b3e40cc..a335776 100644
--- a/public/img/logo.png
+++ b/public/img/logo.png
Binary files differ
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 033c648..e181c40 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -7,7 +7,13 @@
     </transition>
     <transition-group name="fade">
       <template v-if="getScreen(!isCollapse)">
-        <span style="font-size: 15px;" class="avue-logo_title" key="1">{{ this.parentDeptInfo.sysName }} </span>
+        <div style="display: flex; align-items: left; gap: 5px; margin: 8px 8px 10px 20px;">
+    <img class="img" src="/img/logo.png" alt="" width="50%" height="50%" />
+    <!-- <span style="font-size: 20px;"  key="1">
+        {{ this.parentDeptInfo.sysName }}
+    </span> -->
+</div>
+      
       </template>
     </transition-group>
   </div>
diff --git a/src/page/lock/index.vue b/src/page/lock/index.vue
index bafbaa8..2215769 100644
--- a/src/page/lock/index.vue
+++ b/src/page/lock/index.vue
@@ -5,7 +5,7 @@
     </div>
     <div class="login-weaper">
       <div class="login-left animate__animated animate__fadeInLeft">
-        <img class="img" src="/img/logo.png" alt="" />
+        <img class="img" src="/img/logo.png" alt=""  />
         <p class="title">{{ $t('login.info') }}</p>
       </div>
       <div class="login-border animate__animated animate__fadeInRight">

--
Gitblit v1.9.3