From a25959bfa0d3a5c7ef7fb4c6c1e49329d61d8754 Mon Sep 17 00:00:00 2001 From: xiesi <2897217417@qq.com> Date: Wed, 25 Aug 2021 09:33:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=A2=E5=B1=B1?= =?UTF-8?q?=E5=BC=80=E6=BA=90=E5=85=AC=E5=91=8A=E9=A1=B5=E9=9D=A2=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/notice/noticeList/index.jsx | 47 +++++++++++++----------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/src/military/notice/noticeList/index.jsx b/src/military/notice/noticeList/index.jsx index 5b4ef5d1..105f3ccf 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 ? :} + /> : } {/* { 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")} + {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 +233,7 @@ export default (props) => { showTotal={total => `共 ${total} 条`} /> } */} - {noticeList.length > 0 ? noticeList.length === 10 &&
+ {noticeList.length > 0 ? noticeList.length === 10 &&
{ setCurPage(page) }} @@ -255,21 +260,21 @@ export default (props) => { onClick={handleClick} // style={{width: 216 }} mode="inline" - // onOpenChange={onOpenChange} - // defaultSelectedKeys={['4']} - // defaultOpenKeys={['sub1']} + // onOpenChange={onOpenChange} + // defaultSelectedKeys={['4']} + // defaultOpenKeys={['sub1']} > 项目公告 {/* 项目公告} > */} - 招标公告 - 更正公告 - 中标公告 - 废标公告 + 招标公告 + 更正公告 + 中标公告 + 废标公告 {/* */} 成果转化 {/* 成果转化}> */} - 技术资产 - 成交公告 + 技术资产 + 成交公告 {/* */}
From b7fc83edf932341959b8dac9bc10425750e24f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Thu, 26 Aug 2021 10:28:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/notice/noticeList/index.jsx | 18 ++++++++++-------- src/military/notice/noticeList/index.scss | 5 ++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/military/notice/noticeList/index.jsx b/src/military/notice/noticeList/index.jsx index 105f3ccf..19dea876 100644 --- a/src/military/notice/noticeList/index.jsx +++ b/src/military/notice/noticeList/index.jsx @@ -164,15 +164,17 @@ export default (props) => { 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') { - {/* {technologyList.length <= 0 && dealList.length <= 0 ? : ""} */} {/* {technologyList.length > 0 && cont(technologyList, "技术资产", '5',"iconfont icon-jishuzichan")} */} if(technologyList.length === 0 && dealList.length === 0){ diff --git a/src/military/notice/noticeList/index.scss b/src/military/notice/noticeList/index.scss index d0c88901..d563ea08 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,7 @@ body{ .navigationMenu{ margin-right: 24px; width: 15.4em; + caret-color: rgba(0, 0, 0, 0); } } From e733f1886e99f67197ae0e03b31778f5adb4699c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Thu, 26 Aug 2021 13:28:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BA=A2=E5=B1=B1=E5=BC=80=E6=BA=90?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E9=A1=B5=E9=9D=A2=E6=9A=82=E6=97=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=88=E5=B1=85=E4=B8=AD=E6=A0=B7=E5=BC=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/notice/noticeList/index.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/military/notice/noticeList/index.scss b/src/military/notice/noticeList/index.scss index d563ea08..a0a02574 100644 --- a/src/military/notice/noticeList/index.scss +++ b/src/military/notice/noticeList/index.scss @@ -106,6 +106,10 @@ width: 15.4em; caret-color: rgba(0, 0, 0, 0); } + + .none_p_title{ + text-align: center; + } } #menu-selected{