From fc41485f217c8cff16fbb4f8799132d7eb269fab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:01:10 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/components/common/CommonHeader.vue | 105 ++++++++++++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 44 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 2e95744..4b8a03f 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -2,21 +2,12 @@
<div class="common-header">
<div class="header">
<div class="logo">
- <div class="title">{{ title }}</div>
+ <div class="title"> <img src="@/assets/system.png" alt="" />{{ title }}</div>
<div class="list">
- <div class="item active">
- <div>鏈嶅姟涓績</div>
- <div class="linellae"></div>
- </div>
- <div class="item" v-for="(item,index) in topMenuList.list" :key="item.id" @click="getHeaderNav(item)" :index="index">{{item.label}}</div>
-<!-- <div class="item" @click="getHeaderNav('0')">瀹夐槻涓績</div>
- <div class="item" @click="getHeaderNav('1')">娑堟帶涓績</div>
- <div class="item" @click="getHeaderNav('2')">鑳界涓績</div>
- <div class="item" @click="getHeaderNav('7')">鍚庡嫟涓績</div>
- <div class="item" @click="getHeaderNav('3')">椹鹃┒鑸�</div>-->
- <!-- <div class="item" @click="handleTest">娴嬭瘯</div> -->
+ <div :class="index==currentIndex?'item active':'item'" v-for="(item,index) in topMenuList.list" :key="item.id" @click="getHeaderNav(item,index)" :index="index">{{item.label}}
+ <div v-if="index==currentIndex" class="linellae"></div>
+ </div>
</div>
- <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
</div>
<div class="user">
<el-dropdown v-if="isLogined" trigger="click">
@@ -75,6 +66,7 @@
return {
title: process.env.VUE_APP_TITLE,
headerNavData: {},
+ currentIndex: 0,
visible: {
// 淇敼瀵嗙爜
changePwd: false
@@ -134,7 +126,7 @@
}
},
methods: {
- ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo']),
+ ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo', 'setTopMenuCurrent']),
// 淇敼瀵嗙爜
changePwd () {
this.visible.changePwd = true
@@ -162,16 +154,28 @@
}
}
},
- getHeaderNav (item) {
- if (item.url && item.url === 'goHKAF' && item.params != null) {
- this.getHKAFHeaderNav(item.params)
- } else if (item.url && item.url.indexOf('http') === 0) {
- window.open(item.url, '_blank')
+ getHeaderNav (item,index) {
+ this.currentIndex = index
+ if(item.linkType === 0){
+ this.setTopMenuCurrent(item)
+ }else{
+ if (item.url && item.url === 'goHKAF' && item.params != null) {
+ this.getHKAFHeaderNav(item.params, item.label)
+ } else if (item.url && item.url.indexOf('http') === 0) {
+ window.open(item.url, '_blank')
+ }
}
},
- getHKAFHeaderNav (type) {
+ getHKAFHeaderNav (type, label) {
getAppHeaderNav(type).then(res => {
- window.open(res, '_blank')
+ if (label === '瀹夐槻涓績') {
+ let openWindow = window.open(res, '_blank')
+ setTimeout(() => {
+ openWindow.close()
+ }, 7 * 1000)
+ } else {
+ window.open(res, '_blank')
+ }
})
},
handleTest () {
@@ -257,8 +261,9 @@
newPwd: this.changePwdData.form.newPwd
})
.then(() => {
+ console.log('淇敼鎴愬姛')
this.$tip.apiSuccess('淇敼鎴愬姛')
- this.$store.commit('setUserInfo', { needChangePwd: 1 })
+ // this.$store.commit('setUserInfo', { needChangePwd: 1 })
this.visible.changePwd = false
})
.catch(e => {
@@ -295,31 +300,32 @@
.list {
flex: 1;
- display: flex;
- align-items: center;
margin-left: 60px;
-
- .item {
- margin-right: 40px;
- font-size: 16px;
- font-weight: 400;
+ margin-top: 10px;
display: flex;
- flex-direction: column;
align-items: center;
- justify-content: flex-start;
- height: 40px;
- cursor: pointer;
+ .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;
+ .linellae {
+ width: 64px;
+ height: 2px;
+ background: #FFFFFF;
+ }
}
- }
- .active {
- font-weight: 500;
- }
+ .active {
+ font-weight: 500;
+ }
+
}
.header {
@@ -334,7 +340,7 @@
box-sizing: border-box;
min-width: 360px;
height: 56px;
- padding: 10px 30px;
+ padding: 10px 20px;
// flex-shrink: 0;
line-height: 36px;
font-size: 22px;
@@ -344,7 +350,18 @@
align-items: center;
.title {
- width: 240px;
+ display: flex;
+ color: rgb(255, 255, 255);
+ font-size: 18px;
+ font-weight: 700;
+ font-family: "Microsoft Yahei", "sans-serif", "segoe UI", "PingFang SC", arial, Helvetica;
+ //font-size: 18px;
+ //width: 320px;
+ img{
+ width:auto ;
+ height: 32px;
+ margin-right: 5px;
+ }
}
// display: inline;
@@ -356,7 +373,7 @@
}
.user {
- width: 212px;
+ width: 152px;
box-sizing: border-box;
height: 56px;
padding-right: 25px;
--
Gitblit v1.9.3