From 843d0abd014ec20424844546fc57a9f976f366ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 02 九月 2024 10:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/common/CommonHeader.vue |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 7855c29..aa3672e 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -3,6 +3,16 @@
     <div class="header">
       <div class="logo">
         <div>{{ title }}</div>
+        <div class="list">
+          <div class="item active">
+            <div>鏈嶅姟涓績</div>
+            <div class="linellae"></div>
+          </div>
+          <div class="item">瀹夐槻涓績</div>
+          <div class="item">娑堥槻涓績</div>
+          <div class="item">鑳界涓績</div>
+          <div class="item">椹鹃┒鑸�</div>
+        </div>
         <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
       </div>
       <div class="user">
@@ -168,7 +178,7 @@
             this.visible.changePwd = false
           })
           .catch(e => {
-            this.$tip.apiFailed(e)
+           //  this.$tip.apiFailed(e)
           })
           .finally(() => {
             this.isWorking.changePwd = false
@@ -185,7 +195,7 @@
           window.location.reload()
         })
         .catch(e => {
-          this.$tip.apiFailed(e)
+          // this.$tip.apiFailed(e)
         })
     }
   }
@@ -197,6 +207,30 @@
 .common-header {
   background-color: #2080f7;
 }
+.list{
+  display: flex;
+  align-items: center;
+  margin-left: 60px;
+  .item{
+    margin-right: 40px;
+    font-size: 16px;
+    font-weight: 400;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-start;
+    height: 40px;
+    cursor: pointer;
+    .linellae{
+      width: 64px;
+      height: 2px;
+      background: #FFFFFF;
+    }
+  }
+  .active{
+    font-weight: 500;
+  }
+}
 .header {
   overflow: hidden;
   // background: #fff;
@@ -205,16 +239,18 @@
   justify-content: space-between;
 
   .logo {
-    background: url("../../assets/images/top_ic_chilun@2x.png") no-repeat;
+    /* background: url("../../assets/images/top_ic_chilun@2x.png") no-repeat; */
     box-sizing: border-box;
     min-width: 280px;
-    height: 70px;
-    padding: 17px 30px;
+    height: 56px;
+    padding: 10px 30px;
     // flex-shrink: 0;
     line-height: 36px;
     font-size: 22px;
     font-weight: 600;
     color: #fff;
+    display: flex;
+    align-items: center;
     // display: inline;
     .title-en {
       font-size: 11px;
@@ -225,13 +261,13 @@
   .user {
     width: 712px;
     box-sizing: border-box;
-    height: 70px;
+    height: 56px;
     padding-right: 25px;
     background: url("../../assets/images/top_ic_bolang@2x.png") no-repeat;
     flex-shrink: 0;
     text-align: right;
     .el-dropdown {
-      top: 10px;
+      top: 2px;
       color: #fff;
     }
     img {

--
Gitblit v1.9.3