From 34ec919649adfefeecd0418284dd7b02e9ed49b8 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 23 四月 2025 15:42:17 +0800
Subject: [PATCH] 添加批发仓库监测预警

---
 src/views/layout/components/Navbar.vue |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 0395241..4f78cee 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -4,10 +4,8 @@
 
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
-        <screenfull class="right-menu-item hover-effect" />
-      </template>
-      <span v-if="appShow" style="color: white" @click="downApp">APP下载</span>
+
+      <!-- <a v-if="appShow" style="color: white" @click="downApp">APP下载</a> -->
 <!--      <el-popover-->
 <!--        placement="right"-->
 <!--        trigger="hover">-->
@@ -27,11 +25,19 @@
               首页
             </el-dropdown-item>
           </router-link>
+          <el-dropdown-item v-if="appShow">
+           <span @click="downApp">APP下载</span>
+          </el-dropdown-item>
           <el-dropdown-item divided>
             <span style="display:block;" @click="logout">退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
+
+    <!-- 全屏按钮 -->
+     <!-- <template v-if="device!=='mobile'">
+        <screenfull class="right-menu-item hover-effect" />
+      </template> -->
     </div>
 
     <el-dialog :visible.sync="appDialogVisible"
@@ -175,7 +181,8 @@
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 .navbar {
-  height: 60px;
+  height: 80px;
+  padding:10px 0;
   position: fixed;
   z-index: 1000;
   width: 100%;
@@ -245,9 +252,8 @@
         }
         .user-text{
           margin-left:5px;
-          font-size: 12px;
+          font-size: 14px;
           vertical-align: middle;
-          font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
         }
         .el-icon-caret-bottom {
           cursor: pointer;

--
Gitblit v1.9.2