diff --git a/src/assets/topic/bannerListPic_member.jpg b/src/assets/topic/bannerListPic_member.jpg new file mode 100644 index 0000000..ed4f777 Binary files /dev/null and b/src/assets/topic/bannerListPic_member.jpg differ diff --git a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx index 9a42d98..81c117e 100644 --- a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx +++ b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx @@ -14,6 +14,8 @@ const PersonInfor: React.FC<{}> = () => { const [gracefulList, setGracefulList] = useState([]); //loading const [loading, setLoading] = useState(false); + //page + const [page, setPage] = useState(1); //get graceful const getGracefulData = (value: string) => { @@ -22,6 +24,7 @@ const PersonInfor: React.FC<{}> = () => { if (res?.code == 200) { const data = await getImageUrl(res?.data, 'image', topic_activity_default); setGracefulList(data); + setPage(1); } }).finally(() => { setLoading(false); @@ -36,9 +39,13 @@ const PersonInfor: React.FC<{}> = () => { const toHome = () => { history.push("/partyMemberTopic/home"); } - //goback lastpage - const toGoBack = () => { - window.history.go(-1); + //to previous page + const toPreviousPage = () => { + setPage((page) => page - 1); + } + //to next page + const toNextPage = () => { + setPage((page) => page + 1); } useEffect(() => { @@ -49,7 +56,8 @@ const PersonInfor: React.FC<{}> = () => {
toHome()}>返回首页 - toGoBack()}>上一页 + {page > 1 && toPreviousPage()}>上一页} + {gracefulList.length != 0 && page < Math.ceil(gracefulList.length / 10) && toNextPage()}>下一页}
@@ -70,6 +78,10 @@ const PersonInfor: React.FC<{}> = () => { itemLayout="horizontal" pagination={{ size: 'small', + onChange: page => { + setPage(page); + }, + current: page, showTotal: (total) => `共 ${total} 条`, pageSize: 10, }} diff --git a/src/pages/PartyMemberTopic/Home/index.less b/src/pages/PartyMemberTopic/Home/index.less index d9a7bf4..fd71201 100644 --- a/src/pages/PartyMemberTopic/Home/index.less +++ b/src/pages/PartyMemberTopic/Home/index.less @@ -278,17 +278,17 @@ font-size: 12px; letter-spacing: 1px; - .right-display-content-percentage { - margin-left: 8px; + // .right-display-content-percentage { + // margin-left: 8px; - .right-display-content-percentage-increase { - color: #28e099; - } + // .right-display-content-percentage-increase { + // color: #28e099; + // } - .right-display-content-percentage-reduce { - color: #eb5527; - } - } + // .right-display-content-percentage-reduce { + // color: #eb5527; + // } + // } } .right-display-content-content { @@ -535,7 +535,7 @@ align-items: center; .radio-group { - width: 260px; + width: 300px; margin-bottom: 12px; .radio-content { diff --git a/src/pages/PartyMemberTopic/Home/index.tsx b/src/pages/PartyMemberTopic/Home/index.tsx index efc0573..a3cadba 100644 --- a/src/pages/PartyMemberTopic/Home/index.tsx +++ b/src/pages/PartyMemberTopic/Home/index.tsx @@ -51,9 +51,7 @@ const RightDisplayTitle = (props: any) => { //右侧专业线内容 const RightDisplayContent = (props: any) => { const displayContentClick = () => { - if (props.index == 0) {//党员数量 - window.open("/partyMemberTopic/personInfor"); - } else if (props.index == 1) {//党支部数量 + if (props.index == 0 || props.index == 1) {//党员数量 //党支部数量 window.open("/partyMemberTopic/partyBranch"); } } @@ -64,14 +62,14 @@ const RightDisplayContent = (props: any) => {
{props.data[props.index].dataName} - {props.data[props.index].dataCompare != null && + {/* {props.data[props.index].dataCompare != null && 同比 {props.data[props.index].dataCompare[0] == '+' ? ( {props.data[props.index].dataCompare} ↑ ) : ( {props.data[props.index].dataCompare} ↓ )} - } + } */}
{props.data[props.index].dataValue} @@ -214,11 +212,12 @@ const CommentModal = (props: any) => {
- - 系统优化 - 制度优化 - 组织优化 - 其他 + + 网络运营 + IT + 市场 + 综合行政 + 其他