From 4898564fb2510dcdbe10d01eaa94886512aebc77 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 20 十一月 2025 16:55:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/common/CommonHeader.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 7b28a6b..50f7f6e 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -66,7 +66,6 @@
return {
title: process.env.VUE_APP_TITLE,
headerNavData: {},
- currentIndex: 0,
visible: {
// 淇敼瀵嗙爜
changePwd: false
@@ -99,7 +98,7 @@
}
},
computed: {
- ...mapState(['menuData', 'userInfo', 'topMenuList'])
+ ...mapState(['menuData', 'userInfo', 'topMenuList', 'currentIndex'])
// title () {
// return this.$route.meta.title
// }
@@ -126,7 +125,7 @@
}
},
methods: {
- ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo', 'setTopMenuCurrent']),
+ ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo', 'setTopMenuCurrent', 'setCurrentIndex']),
// 淇敼瀵嗙爜
changePwd () {
this.visible.changePwd = true
@@ -165,20 +164,27 @@
}
},
getHeaderNav (item,index) {
- this.currentIndex = index
+ this.setCurrentIndex(index)
if(item.linkType === 0){
this.setTopMenuCurrent(item)
}else{
if (item.url && item.url === 'goHKAF' && item.params != null) {
- this.getHKAFHeaderNav(item.params)
+ 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 () {
@@ -264,8 +270,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 => {
--
Gitblit v1.9.3