From 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 18 九月 2024 15:19:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/components/common/CommonHeader.vue | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index aa3672e..39799db 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -2,16 +2,16 @@
<div class="common-header">
<div class="header">
<div class="logo">
- <div>{{ title }}</div>
+ <div class="title">{{ title }}</div>
<div class="list">
<div class="item active">
<div>鏈嶅姟涓績</div>
<div class="linellae"></div>
</div>
- <div class="item">瀹夐槻涓績</div>
- <div class="item">娑堥槻涓績</div>
- <div class="item">鑳界涓績</div>
- <div class="item">椹鹃┒鑸�</div>
+ <div class="item" @click="getHeaderNav('')">瀹夐槻涓績</div>
+ <div class="item" @click="getHeaderNav('')">娑堥槻涓績</div>
+ <div class="item" @click="getHeaderNav('')">鑳界涓績</div>
+ <div class="item" @click="getHeaderNav('')">椹鹃┒鑸�</div>
</div>
<!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
</div>
@@ -84,6 +84,7 @@
import { mapState, mapMutations } from 'vuex'
import GlobalAlertWindow from './GlobalAlertWindow'
import { logout, updatePwd } from '@/api/system/common'
+import { getAppHeaderNav } from '@/api'
export default {
name: 'CommonHeader',
components: { GlobalAlertWindow },
@@ -96,6 +97,7 @@
data() {
return {
title: process.env.VUE_APP_TITLE,
+ headerNavData: {},
visible: {
// 淇敼瀵嗙爜
changePwd: false
@@ -153,6 +155,13 @@
this.$refs.changePwdDataForm.resetFields()
})
},
+ getHeaderNav(){
+ getAppHeaderNav({
+ type: ''
+ }).then(res => {
+ this.headerNavData = res
+ })
+ },
// 纭畾淇敼瀵嗙爜
confirmChangePwd() {
if (this.isWorking.changePwd) {
@@ -208,6 +217,7 @@
background-color: #2080f7;
}
.list{
+ flex: 1;
display: flex;
align-items: center;
margin-left: 60px;
@@ -241,7 +251,7 @@
.logo {
/* background: url("../../assets/images/top_ic_chilun@2x.png") no-repeat; */
box-sizing: border-box;
- min-width: 280px;
+ min-width: 360px;
height: 56px;
padding: 10px 30px;
// flex-shrink: 0;
@@ -251,6 +261,9 @@
color: #fff;
display: flex;
align-items: center;
+ .title{
+ width: 200px;
+ }
// display: inline;
.title-en {
font-size: 11px;
@@ -259,7 +272,7 @@
}
}
.user {
- width: 712px;
+ width: 212px;
box-sizing: border-box;
height: 56px;
padding-right: 25px;
--
Gitblit v1.9.3