From 5f5cd9b6dd7700ac574786e72c7d74a5e4190710 Mon Sep 17 00:00:00 2001
From: ds <ds@qq.com>
Date: Fri, 1 Nov 2024 08:37:40 +0800
Subject: [PATCH] 10.31

---
 .../src/layout/components/Navbar.vue          |  4 +--
 .../src/views/homeComponents/agent.vue        | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue
index fd3dad1e5..933d185a7 100644
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="navbar">
     <div style="display: flex;align-items: center" >
-      <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+      <!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
       <div class="title-logo">
 
-        <div>
+        <div style="margin-left: 30px;">
           百业兴智慧油站欢迎您
         </div>
 
diff --git a/fuintAdmin_zt/src/views/homeComponents/agent.vue b/fuintAdmin_zt/src/views/homeComponents/agent.vue
index 69806480e..a2e1ebf1a 100644
--- a/fuintAdmin_zt/src/views/homeComponents/agent.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/agent.vue
@@ -154,21 +154,23 @@
       </div>
     </div>
     <div class="bottom_">
-      <div class="h-tt" style="margin-bottom: 15px" >数据统计</div>
       <div class="d-s">
+      <div class="h-tt" style="margin-bottom: 15px" >数据统计</div>
         <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
           {{item}}
         </div>
-        <el-date-picker
-          v-model="value2"
-          type="daterange"
-          range-separator="至"
-          value-format="yyyy-MM-dd"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :disabled="disabled"
-          @change="getStoreList()">
-        </el-date-picker>
+        <span style="margin-top: -10px;">
+          <el-date-picker
+            v-model="value2"
+            type="daterange"
+            range-separator="至"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :disabled="disabled"
+            @change="getStoreList()">
+          </el-date-picker>
+        </span>
       </div>
       <div id="ctct" style="width: 100%; height: 315px;background: linear-gradient( 360deg, #F8F0E7 0%, #FFFFFF 100%); "></div>
 <!--      <div id="cccc" style="width: 300px;height: 200px;"></div>-->
@@ -865,6 +867,7 @@ export default {
 .anniu-h{
   width: 80px;
   height: 26px;
+  margin-top: -10px;
   background: #FAFAFA;
   border-radius: 4px 4px 4px 4px;
   border: 1px solid #DDDDDD;