diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 135cd5152..246eeb7ba 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -376,12 +376,12 @@ class NewHeader extends Component { }
{/* { search_url && } */} - { + {/* { current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)? :"" - } + } */} {/* { (settings && settings.common && settings.common.notice) && (current_user && current_user.login)?

- {organizeDetail && organizeDetail.nickname} + {organizeDetail && organizeDetail.nickname}

{(organizeDetail && organizeDetail.is_admin && enterpriseOpenInfo) && !enterpriseOpenInfo.isOpen ? : enterpriseOpenInfo.url ? : } diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 60f450c41..9bb795c36 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -12,6 +12,7 @@ import SystemNotice from '../../forge/Component/NoticeModal/SystemNotice'; import cookie from 'react-cookies'; import NpsModal from '../modals/npsModal'; import { IsPC } from 'educoder'; +import { getOrzCompanyList } from '../../forge/Information/api'; const items = [ @@ -39,6 +40,21 @@ const items = [ name: '制品库', icon: 'zhipinkuicon', path: '/repositories' + }, + { + name: '知识库', + icon: 'wendangicon', + path: '/docs' + }, + { + name: '成员', + icon: 'chengyuanicon', + path: '/members' + }, + { + name: '设置', + icon: 'shezhiicon', + path: '/admin' } ] @@ -67,7 +83,8 @@ export function TPMIndexHOC(WrappedComponent) { npsModalVisible: false, npsActionType: undefined, npsActionId: undefined, - active:"" + active:"", + companyList:undefined } } @@ -106,6 +123,16 @@ export function TPMIndexHOC(WrappedComponent) { } ///请求定制化的信息 this.getAppdata(); + this.getComlist(); + } + getComlist=()=>{ + console.log(this.props.history.location); + getOrzCompanyList().then(res=>{ + console.log(res); + this.setState({ + companyList:res.data.rows + }) + }) } @@ -321,7 +348,7 @@ export function TPMIndexHOC(WrappedComponent) { render() { let { isRender , current_user , giteaVisible , email , completeProfile , showCP , showNotice , publicNav , mygetHelmetapi, - npsModalVisible, npsActionType, npsActionId , supplyPhone } = this.state; + npsModalVisible, npsActionType, npsActionId , supplyPhone , companyList } = this.state; const common = { showLoginDialog: this.showLoginDialog, checkIfLogin: this.checkIfLogin, @@ -356,24 +383,24 @@ export function TPMIndexHOC(WrappedComponent) { { !pathCheck &&
} {!publicNav &&
}