From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 28 八月 2024 09:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/components/common/CommonHeader.vue | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 7855c29..5afc768 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -3,6 +3,13 @@
<div class="header">
<div class="logo">
<div>{{ title }}</div>
+ <div class="list">
+ <div class="item">鏈嶅姟涓績</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 +175,7 @@
this.visible.changePwd = false
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.changePwd = false
@@ -185,7 +192,7 @@
window.location.reload()
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
}
}
@@ -205,16 +212,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 +234,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