From 9c51bcc29f197813fec0dfbbf8036db12e86830a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:01:38 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/components/common/CommonHeader.vue | 89 +++++++++++++++++---------------------------
1 files changed, 35 insertions(+), 54 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 8773c62..0916086 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -2,7 +2,7 @@
<div class="common-header">
<div class="header">
<div class="logo">
- <div class="title"> <img src="@/assets/system.png" alt="" />{{sysConfig.subtitle || title }}</div>
+ <div class="title"> <img src="@/assets/system.png" alt="" />{{ title }}</div>
<div class="list">
<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>
@@ -26,9 +26,9 @@
<img src="@/assets/icons/ic_3.jpg" alt="">
<img src="@/assets/icons/ic_4.jpg" alt="">
<img src="@/assets/icons/ic_5.jpg" alt="">
-<!-- <img src="@/assets/icons/ic_6.jpg" alt="">-->
+ <img src="@/assets/icons/ic_6.jpg" alt="">
<img src="@/assets/icons/ic_7.jpg" alt="">
-<!-- <img src="@/assets/icons/ic_8.jpg" alt="">-->
+ <img src="@/assets/icons/ic_8.jpg" alt="">
</div>
<el-dropdown v-if="isLogined" trigger="click">
<span class="el-dropdown-link" style="cursor: pointer; color: rgba(255,255,255,.56);">
@@ -65,7 +65,7 @@
show-password></el-input>
</el-form-item>
<el-form-item label="鏂板瘑鐮�" prop="newPwd" required>
- <el-input v-model="changePwdData.form.newPwd" type="password" placeholder="璇疯緭鍏ユ柊瀵嗙爜锛岃嚦灏戝寘鎷暟瀛椼�佸ぇ鍐欏瓧姣嶃�佸皬鍐欏瓧姣嶃�佺壒娈婂瓧绗︿腑鐨勪笁绉嶅瓧绗︼紝涓旇嚦灏�8浣嶆暟"
+ <el-input v-model="changePwdData.form.newPwd" type="password" placeholder="璇疯緭鍏ユ柊瀵嗙爜锛屽瘑鐮侀渶鍖呭惈瀛楁瘝銆佹暟瀛楀強鐗规畩瀛楃涓殑鑷冲皯涓ょ"
maxlength="20" show-password></el-input>
</el-form-item>
<!-- <div style="font-size: 12px;color:#999999">瀵嗙爜闇�鍖呭惈瀛楁瘝銆佹暟瀛楀強鐗规畩瀛楃涓殑鑷冲皯涓ょ</div> -->
@@ -81,7 +81,7 @@
<script>
import { mapState, mapMutations } from 'vuex'
import GlobalAlertWindow from './GlobalAlertWindow'
-import { getSystemConfig, logout, updatePwd } from '@/api/system/common'
+import { logout, updatePwd } from '@/api/system/common'
import { getAppHeaderNav } from '@/api'
export default {
name: 'CommonHeader',
@@ -96,6 +96,7 @@
return {
title: process.env.VUE_APP_TITLE,
headerNavData: {},
+ currentIndex: 0,
visible: {
// 淇敼瀵嗙爜
changePwd: false
@@ -128,13 +129,13 @@
}
},
computed: {
- ...mapState(['menuData', 'userInfo', 'topMenuList', 'currentIndex', 'sysConfig'])
+ ...mapState(['menuData', 'userInfo', 'topMenuList'])
// title () {
// return this.$route.meta.title
// }
},
created () {
- this.getSystemConfig()
+
},
mounted () {
// needChangePwd 0 : 榛樿瀵嗙爜闇�瑕佷慨鏀癸紝1 涓嶉渶瑕�
@@ -155,7 +156,7 @@
}
},
methods: {
- ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo', 'setTopMenuCurrent', 'setCurrentIndex', 'setSysconfig']),
+ ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo', 'setTopMenuCurrent']),
// 淇敼瀵嗙爜
changePwd () {
this.visible.changePwd = true
@@ -163,51 +164,31 @@
this.$refs.changePwdDataForm.resetFields()
})
},
- getSystemConfig () {
- if (!this.sysConfig.subTitle) {
- getSystemConfig()
- .then((res) => {
- if (res && res.subtitle) {
- this.setSysconfig(res)
- }
- })
- }
- },
validatePassword (rule, value, callback) {
if (!value) {
callback(new Error('璇疯緭鍏ュ瘑鐮�'))
} else {
- // const lengthValid = /^.{6,20}$/.test(value)
- // const hasLetter = /[a-zA-Z]/.test(value)
- // const hasNumber = /[0-9]/.test(value)
- // const hasSpecial = /[!@#$%^&*(),.?":{}|<>]/.test(value)
- //
- // const typesCount = [hasLetter, hasNumber, hasSpecial].filter(Boolean).length
- //
- // if (!lengthValid) {
- // callback(new Error('瀵嗙爜闀垮害闇�涓�6鍒�20涓瓧绗�'))
- // } else if (typesCount < 2) {
- // callback(new Error('瀵嗙爜闇�鍖呭惈瀛楁瘝銆佹暟瀛楀強鐗规畩瀛楃涓殑鑷冲皯涓ょ'))
- // } else {
- // callback() // 楠岃瘉閫氳繃
- // }
- let typeCount = 0
- if (/[a-z]/.test(value)) typeCount++ // 灏忓啓瀛楁瘝
- if (/[A-Z]/.test(value)) typeCount++ // 澶у啓瀛楁瘝
- if (/\d/.test(value)) typeCount++ // 鏁板瓧
- if (/[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(value)) typeCount++ // 鐗规畩瀛楃
- if (typeCount >= 3) {
- callback()
+ const lengthValid = /^.{6,20}$/.test(value)
+ const hasLetter = /[a-zA-Z]/.test(value)
+ const hasNumber = /[0-9]/.test(value)
+ const hasSpecial = /[!@#$%^&*(),.?":{}|<>]/.test(value)
+
+ const typesCount = [hasLetter, hasNumber, hasSpecial].filter(Boolean).length
+
+ if (!lengthValid) {
+ callback(new Error('瀵嗙爜闀垮害闇�涓�6鍒�20涓瓧绗�'))
+ } else if (typesCount < 2) {
+ callback(new Error('瀵嗙爜闇�鍖呭惈瀛楁瘝銆佹暟瀛楀強鐗规畩瀛楃涓殑鑷冲皯涓ょ'))
} else {
- callback(new Error('鑷冲皯鍖呮嫭鏁板瓧銆佸ぇ鍐欏瓧姣嶃�佸皬鍐欏瓧姣嶃�佺壒娈婂瓧绗︿腑鐨勪笁绉嶅瓧绗︼紝涓旇嚦灏�8浣嶆暟'))
+ callback() // 楠岃瘉閫氳繃
}
}
},
- getHeaderNav (item, index) {
- this.setCurrentIndex(index)
- if (item.linkType === 0) {
+ getHeaderNav (item,index) {
+ this.currentIndex = index
+ if(item.linkType === 0){
this.setTopMenuCurrent(item)
- } else {
+ }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) {
@@ -218,10 +199,10 @@
getHKAFHeaderNav (type, label) {
getAppHeaderNav(type).then(res => {
if (label === '瀹夐槻涓績') {
- const openWindow = window.open(res, '_blank')
- // setTimeout(() => {
- // openWindow.close()
- // }, 7 * 1000)
+ let openWindow = window.open(res, '_blank')
+ setTimeout(() => {
+ openWindow.close()
+ }, 7 * 1000)
} else {
window.open(res, '_blank')
}
@@ -344,7 +325,7 @@
@import "@/assets/style/variables.scss";
.common-header {
- background-color: #1E7FFF;
+ background-color: #2080f7;
}
.list {
@@ -354,7 +335,7 @@
display: flex;
align-items: center;
.item {
- margin-right: 24px;
+ margin-right: 40px;
font-size: 16px;
font-weight: 400;
display: flex;
@@ -389,7 +370,7 @@
box-sizing: border-box;
min-width: 360px;
height: 56px;
- padding: 10px 12px;
+ padding: 10px 20px;
// flex-shrink: 0;
line-height: 36px;
font-size: 22px;
@@ -494,9 +475,9 @@
align-items: center;
img {
top: 0 !important;
- width: 18px;
- height: 18px;
- margin-right: 12px;
+ width: 24px;
+ height: 24px;
+ margin-right: 15px;
}
}
.el-dropdown {
--
Gitblit v1.9.3