From a1e663eeb588f419b1622ca07b23fb9d44292ee9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/CommonHeader.vue | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index fcf9f75..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)
})
}
}
@@ -215,6 +222,8 @@
font-size: 22px;
font-weight: 600;
color: #fff;
+ display: flex;
+ align-items: center;
// display: inline;
.title-en {
font-size: 11px;
--
Gitblit v1.9.3