forked from Gitlink/forgeplus-react
Merge pull request 'pre-release merge' (#26) from pre_dev_military into dev_military
This commit is contained in:
commit
b73a38351b
|
|
@ -142,7 +142,7 @@ export default (props) => {
|
|||
setOrderBy('publishDateDesc');
|
||||
}
|
||||
|
||||
function cont(param, titleStr, key,svgStr) {
|
||||
function cont(param, titleStr, key, svgStr) {
|
||||
return <React.Fragment>
|
||||
<div className="item-head-title">
|
||||
<div className="item-head-title-content">
|
||||
|
|
@ -151,10 +151,10 @@ export default (props) => {
|
|||
</div>
|
||||
{param.length === 5 && <span className="link" onClick={() => { handleClick({ key: key }) }}>查看更多 <Icon type="arrow-right" /></span>}
|
||||
</div>
|
||||
{param.length>0?<ItemList
|
||||
{param.length > 0 ? <ItemList
|
||||
list={param}
|
||||
itemClick={noticeClick}
|
||||
/>:<Nodata _html="暂无数据" />}
|
||||
/> : <Nodata _html="暂无数据" />}
|
||||
{/* <ItemList
|
||||
list={param}
|
||||
itemClick={noticeClick}
|
||||
|
|
@ -164,20 +164,27 @@ export default (props) => {
|
|||
|
||||
function content() {
|
||||
if (tab === '0') {
|
||||
return <React.Fragment>
|
||||
{/* {callList.length <= 0 && changeList.length <= 0 && checkList.length <= 0 && abandonList.length <= 0 ? <Nodata _html="暂无数据" /> : ""} */}
|
||||
{cont(callList, "招标公告", '4',"iconfont icon-zhaobiaogonggao")}
|
||||
{cont(changeList, "更正公告", '1',"iconfont icon-gengzhenggonggao")}
|
||||
{cont(checkList, "中标公告", '2',"iconfont icon-zhongbiaogonggao")}
|
||||
{cont(abandonList, "废标公告", '3',"iconfont icon-feibiaogonggao")}
|
||||
</React.Fragment>
|
||||
if(callList.length === 0 && changeList.length === 0 && checkList.length === 0 && abandonList.length === 0){
|
||||
return <React.Fragment><Nodata _html="暂无数据" /></React.Fragment>
|
||||
}else{
|
||||
return <React.Fragment>
|
||||
{cont(callList, "招标公告", '4', "iconfont icon-zhaobiaogonggao")}
|
||||
{cont(changeList, "更正公告", '1', "iconfont icon-gengzhenggonggao")}
|
||||
{cont(checkList, "中标公告", '2', "iconfont icon-zhongbiaogonggao")}
|
||||
{cont(abandonList, "废标公告", '3', "iconfont icon-feibiaogonggao")}
|
||||
</React.Fragment>
|
||||
}
|
||||
} else if (tab === '7') {
|
||||
return <React.Fragment>
|
||||
{/* {technologyList.length <= 0 && dealList.length <= 0 ? <Nodata _html="暂无数据" /> : ""} */}
|
||||
{/* {technologyList.length > 0 && cont(technologyList, "技术资产", '5',"iconfont icon-jishuzichan")} */}
|
||||
{cont(technologyList, "技术资产", '5',"iconfont icon-jishuzichan")}
|
||||
{cont(dealList, "成交公告", '6',"iconfont icon-chengjiaogonggao")}
|
||||
</React.Fragment>
|
||||
if(technologyList.length === 0 && dealList.length === 0){
|
||||
return <React.Fragment><Nodata _html="暂无数据" /></React.Fragment>
|
||||
}else{
|
||||
return <React.Fragment>
|
||||
{cont(technologyList, "技术资产", '5', "iconfont icon-jishuzichan")}
|
||||
{cont(dealList, "成交公告", '6', "iconfont icon-chengjiaogonggao")}
|
||||
</React.Fragment>
|
||||
}
|
||||
} else if (tab === '8') {
|
||||
return <div></div>
|
||||
} else {
|
||||
|
|
@ -228,7 +235,7 @@ export default (props) => {
|
|||
showTotal={total => `共 ${total} 条`}
|
||||
/>
|
||||
</div>} */}
|
||||
{noticeList.length > 0 ? noticeList.length === 10 &&<div className="edu-txt-center mt30 mb30">
|
||||
{noticeList.length > 0 ? noticeList.length === 10 && <div className="edu-txt-center mt30 mb30">
|
||||
<Pagination
|
||||
showQuickJumper
|
||||
onChange={(page) => { setCurPage(page) }}
|
||||
|
|
@ -255,21 +262,21 @@ export default (props) => {
|
|||
onClick={handleClick}
|
||||
// style={{width: 216 }}
|
||||
mode="inline"
|
||||
// onOpenChange={onOpenChange}
|
||||
// defaultSelectedKeys={['4']}
|
||||
// defaultOpenKeys={['sub1']}
|
||||
// onOpenChange={onOpenChange}
|
||||
// defaultSelectedKeys={['4']}
|
||||
// defaultOpenKeys={['sub1']}
|
||||
>
|
||||
<Menu.Item key="0" id={tab === '0' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-xiangmugonggao"></i>项目公告</span></Menu.Item>
|
||||
{/* <SubMenu id={tab === '0' ? "menu-selected" : "menu"} key="sub1" title={<span className="itemClass"><i className="iconfont icon-xiangmugonggao"></i><span className="subMenuspan">项目公告</span></span>} > */}
|
||||
<Menu.Item key="4" id={tab === '4' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-zhaobiaogonggao" style={{marginLeft:'1.2em'}}></i>招标公告</span></Menu.Item>
|
||||
<Menu.Item key="1" id={tab === '1' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-gengzhenggonggao" style={{marginLeft:'1.2em'}}></i>更正公告</span></Menu.Item>
|
||||
<Menu.Item key="2" id={tab === '2' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-zhongbiaogonggao" style={{marginLeft:'1.2em'}}></i>中标公告</span></Menu.Item>
|
||||
<Menu.Item key="3" id={tab === '3' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-feibiaogonggao" style={{marginLeft:'1.2em'}}></i>废标公告</span></Menu.Item>
|
||||
<Menu.Item key="4" id={tab === '4' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-zhaobiaogonggao" style={{ marginLeft: '1.2em' }}></i>招标公告</span></Menu.Item>
|
||||
<Menu.Item key="1" id={tab === '1' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-gengzhenggonggao" style={{ marginLeft: '1.2em' }}></i>更正公告</span></Menu.Item>
|
||||
<Menu.Item key="2" id={tab === '2' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-zhongbiaogonggao" style={{ marginLeft: '1.2em' }}></i>中标公告</span></Menu.Item>
|
||||
<Menu.Item key="3" id={tab === '3' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-feibiaogonggao" style={{ marginLeft: '1.2em' }}></i>废标公告</span></Menu.Item>
|
||||
{/* </SubMenu> */}
|
||||
<Menu.Item key="7" id={tab === '7' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-chengguo"></i>成果转化</span></Menu.Item>
|
||||
{/* <SubMenu id={tab === '7' ? "menu-selected" : "menu"} key="sub2" title={<span className="itemClass"><i className="iconfont icon-chengguo"></i><span className="subMenuspan">成果转化</span></span>}> */}
|
||||
<Menu.Item key="5" id={tab === '5' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-jishuzichan" style={{marginLeft:'1.2em'}}></i>技术资产</span></Menu.Item>
|
||||
<Menu.Item key="6" id={tab === '6' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-chengjiaogonggao" style={{marginLeft:'1.2em'}}></i>成交公告</span></Menu.Item>
|
||||
<Menu.Item key="5" id={tab === '5' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-jishuzichan" style={{ marginLeft: '1.2em' }}></i>技术资产</span></Menu.Item>
|
||||
<Menu.Item key="6" id={tab === '6' ? "menu-selected" : "menu"}><span className="itemClass"><i className="iconfont icon-chengjiaogonggao" style={{ marginLeft: '1.2em' }}></i>成交公告</span></Menu.Item>
|
||||
{/* </SubMenu> */}
|
||||
</Menu>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
body{
|
||||
caret-color: rgba(0, 0, 0, 0);
|
||||
}
|
||||
.notice-list{
|
||||
.ant-tabs {
|
||||
.ant-tabs-left-bar{
|
||||
|
|
@ -83,6 +80,7 @@ body{
|
|||
}
|
||||
|
||||
.center-right-but{
|
||||
caret-color: rgba(0, 0, 0, 0);
|
||||
.piece{
|
||||
margin:0 .8rem;
|
||||
color: #aaa;
|
||||
|
|
@ -106,6 +104,11 @@ body{
|
|||
.navigationMenu{
|
||||
margin-right: 24px;
|
||||
width: 15.4em;
|
||||
caret-color: rgba(0, 0, 0, 0);
|
||||
}
|
||||
|
||||
.none_p_title{
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue