From c7f79abded9ad2e29f297da4a04a641b96b61c5e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 12 十月 2019 09:51:22 +0800
Subject: [PATCH] add-datamanage
---
src/components/header/index.jsx | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index d4204be..8673e4c 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -5,11 +5,12 @@
import { is, fromJS } from 'immutable'
import {Dropdown, Menu, Icon, Modal, message, Form } from 'antd'
import md5 from 'md5'
-import {toggleCollapse, modifyMainMenu, resetState} from '@/store/action'
+import {toggleCollapse, modifyMainMenu, resetState, resetDebug} from '@/store/action'
import Resetpwd from '@/components/resetpwd'
import Api from '@/api'
import zhCN from '@/locales/zh-CN/header.js'
import enUS from '@/locales/en-US/header.js'
+import Utils from '@/utils/utils.js'
import logourl from '../../assets/img/mlogo.png'
import avatar from '../../assets/img/avatar.jpg'
import './index.scss'
@@ -27,8 +28,9 @@
state = {
menulist: null,
visible: false,
- dict: (!sessionStorage.getItem('lang') || sessionStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
- confirmLoading: false
+ dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
+ confirmLoading: false,
+ userName: localStorage.getItem('username')
}
handleCollapse = () => {
@@ -98,7 +100,6 @@
return Api.logoutsystem().then(res => {
if (res.status) {
sessionStorage.removeItem('UserID')
- sessionStorage.removeItem('lang')
_this.props.resetState()
_this.props.history.replace('/login')
} else {
@@ -119,19 +120,31 @@
// 鑾峰彇涓昏彍鍗�
let result = await Api.getMainMenuData()
if (result.status) {
- this.setState({
- menulist: result.data.map((menu, index) => { // 澧炲姞绱㈠紩锛岀敤浜庢墦寮�鏂伴〉闈㈡椂鏌ヨ鑿滃崟
- menu.index = index
- return menu
- })
- })
+ let _avatar = Utils.getrealurl(result.HeadIcon) // 澶村儚
+ if (_avatar) {
+ avatar = _avatar
+ }
+
+ if (result.debug === 'true') { // 鏄惁涓篸ebug妯″紡锛屽嵆鍙鍒惰彍鍗曞弬鏁�
+ this.props.resetDebug()
+ }
+
let param = sessionStorage.getItem('view_param') // 鏄惁涓烘墦寮�鏂伴〉闈�
if (param) {
- let i = parseInt(param.split('&')[0])
- this.props.modifyMainMenu(result.data[i] || result.data[0])
+ // 閫氳繃url涓璵enuid绛涢�夊嚭閫変腑鐨勪富鑿滃崟
+ let menuId = param.split('&')[0]
+ let _menu = result.data.filter(item => item.MenuID === menuId)[0]
+ if (!_menu) {
+ sessionStorage.removeItem('view_param')
+ }
+ this.props.modifyMainMenu(_menu || result.data[0])
} else {
this.props.modifyMainMenu(result.data[0])
}
+
+ this.setState({
+ menulist: result.data
+ })
}
}
@@ -161,7 +174,7 @@
{this.state.menulist && <ul className="header-menu">{
this.state.menulist.map(item => {
return (
- <li key={item.id} onClick={() => {this.changeMenu(item)}} className={this.props.selectmenu.id === item.id ? 'active' : ''}>
+ <li key={item.MenuID} onClick={() => {this.changeMenu(item)}} className={this.props.selectmenu.MenuID === item.MenuID ? 'active' : ''}>
{item.MenuName}
</li>
)
@@ -171,7 +184,7 @@
<div>
<img src={avatar} alt=""/>
<span>
- admin <Icon type="down" />
+ {this.state.userName} <Icon type="down" />
</span>
</div>
</Dropdown>
@@ -202,7 +215,8 @@
return {
toggleCollapse: (collapse) => dispatch(toggleCollapse(collapse)),
modifyMainMenu: (selectmenu) => dispatch(modifyMainMenu(selectmenu)),
- resetState: () => dispatch(resetState())
+ resetState: () => dispatch(resetState()),
+ resetDebug: () => dispatch(resetDebug())
}
}
--
Gitblit v1.8.0