diff --git a/src/military/notice/noticeList/index.jsx b/src/military/notice/noticeList/index.jsx index 5b4ef5d1..19dea876 100644 --- a/src/military/notice/noticeList/index.jsx +++ b/src/military/notice/noticeList/index.jsx @@ -142,7 +142,7 @@ export default (props) => { setOrderBy('publishDateDesc'); } - function cont(param, titleStr, key,svgStr) { + function cont(param, titleStr, key, svgStr) { return
@@ -151,10 +151,10 @@ export default (props) => {
{param.length === 5 && { handleClick({ key: key }) }}>查看更多 }
- {param.length>0? 0 ? :} + /> : } {/* { function content() { if (tab === '0') { - return - {/* {callList.length <= 0 && changeList.length <= 0 && checkList.length <= 0 && abandonList.length <= 0 ? : ""} */} - {cont(callList, "招标公告", '4',"iconfont icon-zhaobiaogonggao")} - {cont(changeList, "更正公告", '1',"iconfont icon-gengzhenggonggao")} - {cont(checkList, "中标公告", '2',"iconfont icon-zhongbiaogonggao")} - {cont(abandonList, "废标公告", '3',"iconfont icon-feibiaogonggao")} - + if(callList.length === 0 && changeList.length === 0 && checkList.length === 0 && abandonList.length === 0){ + return + }else{ + return + {cont(callList, "招标公告", '4', "iconfont icon-zhaobiaogonggao")} + {cont(changeList, "更正公告", '1', "iconfont icon-gengzhenggonggao")} + {cont(checkList, "中标公告", '2', "iconfont icon-zhongbiaogonggao")} + {cont(abandonList, "废标公告", '3', "iconfont icon-feibiaogonggao")} + + } } else if (tab === '7') { - return {/* {technologyList.length <= 0 && dealList.length <= 0 ? : ""} */} {/* {technologyList.length > 0 && cont(technologyList, "技术资产", '5',"iconfont icon-jishuzichan")} */} - {cont(technologyList, "技术资产", '5',"iconfont icon-jishuzichan")} - {cont(dealList, "成交公告", '6',"iconfont icon-chengjiaogonggao")} - + if(technologyList.length === 0 && dealList.length === 0){ + return + }else{ + return + {cont(technologyList, "技术资产", '5', "iconfont icon-jishuzichan")} + {cont(dealList, "成交公告", '6', "iconfont icon-chengjiaogonggao")} + + } } else if (tab === '8') { return
} else { @@ -228,7 +235,7 @@ export default (props) => { showTotal={total => `共 ${total} 条`} /> } */} - {noticeList.length > 0 ? noticeList.length === 10 &&
+ {noticeList.length > 0 ? noticeList.length === 10 &&
{ 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']} > 项目公告 {/* 项目公告} > */} - 招标公告 - 更正公告 - 中标公告 - 废标公告 + 招标公告 + 更正公告 + 中标公告 + 废标公告 {/* */} 成果转化 {/* 成果转化}> */} - 技术资产 - 成交公告 + 技术资产 + 成交公告 {/* */}
diff --git a/src/military/notice/noticeList/index.scss b/src/military/notice/noticeList/index.scss index d0c88901..a0a02574 100644 --- a/src/military/notice/noticeList/index.scss +++ b/src/military/notice/noticeList/index.scss @@ -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; } }