From fb9892f586d5ed60ec7e777f412690b4c364a2ee Mon Sep 17 00:00:00 2001
From: lingxiao <wei.li@le-it.com.cn>
Date: Sun, 26 Dec 2021 19:51:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yarn.lock | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/yarn.lock b/yarn.lock
index 3c32166..aa0457a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2752,6 +2752,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@*:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
+
 commander@2.17.x:
   version "2.17.1"
   resolved "https://registry.nlark.com/commander/download/commander-2.17.1.tgz"
@@ -5922,6 +5927,13 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.5"
 
+mockjs@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mockjs/-/mockjs-1.1.0.tgz#e6a0c378e91906dbaff20911cc0273b3c7d75b06"
+  integrity sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==
+  dependencies:
+    commander "*"
+
 moment@^2.29.1:
   version "2.29.1"
   resolved "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"

From 26cc719eca67332df461ed645d377dc9a17f7ba2 Mon Sep 17 00:00:00 2001
From: liwei <wei.li@le-it.com.cn>
Date: Mon, 27 Dec 2021 17:24:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?header=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue | 24 ++++++++++++------------
 src/components/Layout.vue | 10 +++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index 7461c28..7d720a0 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -11,7 +11,7 @@
       <el-dropdown>
         <el-avatar
           shape="square"
-          :size="40"
+          :size="20"
           fit="contain"
           :src="userInfo.avatar"
         />
@@ -120,9 +120,9 @@ export default {
   }
   .el-dropdown {
     float: right;
-    width: 40px;
-    height: 40px;
-    margin-top: 8px;
+    width: 20px;
+    height: 20px;
+    margin-top: 5px;
     margin-right: 8px;
   }
 }
@@ -133,7 +133,7 @@ export default {
     float: left;
     width: 40px;
     height: 40px;
-    margin-top: 10px;
+    margin-top: 3px;
     margin-left: 24px;
     cursor: pointer;
   }
@@ -159,11 +159,11 @@ export default {
   .user-info-wrap {
     float: right;
     min-width: 199px;
-    height: 56px;
+    height: 30px;
     box-shadow: 0px 1px 3px 0px #1e514d;
     border-radius: 2px;
     border: 1px solid #2c998f;
-    margin-top: 2px;
+    margin-top: 7px;
     margin-right: 16px;
     .user-details-wrap {
       float: right;
@@ -173,6 +173,7 @@ export default {
         margin: 0;
         line-height: 18px;
         text-align: right;
+        float: right;
         span {
           font-size: 16px;
           font-family: PingFangSC-Semibold, PingFang SC;
@@ -182,11 +183,10 @@ export default {
           text-shadow: 0px 0px 0px #215c57;
         }
       }
-      .user-details {
-        line-height: 24px;
-        margin-top: 10px;
+      .user-details, .system-time {
+        line-height: 30px;
         span {
-          margin-left: 24px;
+          margin-left: 20px;
         }
       }
       .system-time {
@@ -213,7 +213,7 @@ export default {
     float: left;
     width: 185px;
     height: 26px;
-    margin-top: 17px;
+    margin-top: 10px;
     margin-left: 40px;
   }
   .customer-name {
diff --git a/src/components/Layout.vue b/src/components/Layout.vue
index 3605d90..a70e05d 100644
--- a/src/components/Layout.vue
+++ b/src/components/Layout.vue
@@ -39,7 +39,7 @@ export default {
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  padding-top: 62px;
+  padding-top: 46px;
   padding-left: 250px;
   background: #f3f3f3;
   #content-title {
@@ -47,16 +47,16 @@ export default {
     top: 0;
     left: 0;
     width: 100%;
-    height: 62px;
-    line-height: 62px;
+    height: 46px;
+    line-height: 46px;
     background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
   }
   #content-nav-menu {
     position: absolute;
-    top: 62px;
+    top: 46px;
     left: 0;
     width: 250px;
-    height: calc(100% - 62px);
+    height: calc(100% - 46px);
     background: #eeeeee;
     box-sizing: border-box;
     padding-top: 12px;

From 91117adc67a92f150ccbdd46eef2a73aaa18a3b4 Mon Sep 17 00:00:00 2001
From: liwei <wei.li@le-it.com.cn>
Date: Mon, 27 Dec 2021 17:31:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?header=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue | 57 ++++++---------------------------------
 src/components/Layout.vue | 10 +++----
 2 files changed, 13 insertions(+), 54 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index 7d720a0..10fd189 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -1,17 +1,13 @@
 <template>
   <div id="title-wrap">
-    <!-- <span><el-button icon="el-icon-d-arrow-left" circle /></span> -->
     <img class="menu-img" :src="menuImg" @click="menuClick" />
-    <!-- <img class="logo-img" :src="logo" /> -->
-    <!-- <p class="title-test">{{ title }}</p> -->
-    <!-- <p class="separation-line" /> -->
+
     <img class="customer-logo" :src="customerLogo" />
-    <!-- <p class="customer-name">{{ customerName }}</p> -->
     <div class="user-info-wrap">
       <el-dropdown>
         <el-avatar
           shape="square"
-          :size="20"
+          :size="25"
           fit="contain"
           :src="userInfo.avatar"
         />
@@ -120,8 +116,8 @@ export default {
   }
   .el-dropdown {
     float: right;
-    width: 20px;
-    height: 20px;
+    width: 25px;
+    height: 25px;
     margin-top: 5px;
     margin-right: 8px;
   }
@@ -133,33 +129,15 @@ export default {
     float: left;
     width: 40px;
     height: 40px;
-    margin-top: 3px;
+    margin-top: 4px;
     margin-left: 24px;
     cursor: pointer;
   }
-  .logo-img {
-    float: left;
-    width: 32px;
-    height: 32px;
-    margin-top: 21px;
-    margin-left: 32px;
-  }
 
-  .title-test {
-    float: left;
-    margin-left: 10px;
-    font-size: 22px;
-    font-family: PingFangSC-Semibold, PingFang SC;
-    font-weight: 600;
-    color: #ffffff;
-    line-height: 80px;
-    text-shadow: 0px -1px 0px #215c85;
-    font-style: oblique;
-  }
   .user-info-wrap {
     float: right;
     min-width: 199px;
-    height: 30px;
+    height: 35px;
     box-shadow: 0px 1px 3px 0px #1e514d;
     border-radius: 2px;
     border: 1px solid #2c998f;
@@ -184,7 +162,7 @@ export default {
         }
       }
       .user-details, .system-time {
-        line-height: 30px;
+        line-height: 35px;
         span {
           margin-left: 20px;
         }
@@ -201,32 +179,13 @@ export default {
       }
     }
   }
-  .separation-line {
-    float: left;
-    width: 1px;
-    height: 42px;
-    float: left;
-    margin: 19px 24px;
-    background: #ffffff;
-  }
   .customer-logo {
     float: left;
     width: 185px;
     height: 26px;
-    margin-top: 10px;
+    margin-top: 12px;
     margin-left: 40px;
   }
-  .customer-name {
-    float: left;
-    margin: 0;
-    min-width: 100px;
-    line-height: 80px;
-    font-size: 22px;
-    font-family: PingFangSC-Semibold, PingFang SC;
-    font-weight: 600;
-    color: #ffffff;
-    text-shadow: 0px -1px 0px #1e5353;
-  }
   .item {
     float: right;
     height: 30px;
diff --git a/src/components/Layout.vue b/src/components/Layout.vue
index a70e05d..f687c6a 100644
--- a/src/components/Layout.vue
+++ b/src/components/Layout.vue
@@ -39,7 +39,7 @@ export default {
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  padding-top: 46px;
+  padding-top: 50px;
   padding-left: 250px;
   background: #f3f3f3;
   #content-title {
@@ -47,16 +47,16 @@ export default {
     top: 0;
     left: 0;
     width: 100%;
-    height: 46px;
-    line-height: 46px;
+    height: 50px;
+    line-height: 50px;
     background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
   }
   #content-nav-menu {
     position: absolute;
-    top: 46px;
+    top: 50px;
     left: 0;
     width: 250px;
-    height: calc(100% - 46px);
+    height: calc(100% - 50px);
     background: #eeeeee;
     box-sizing: border-box;
     padding-top: 12px;