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/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..f8b9d2b 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}
@@ -215,10 +213,11 @@ const CommentModal = (props: any) => {
- 系统优化
- 制度优化
- 组织优化
- 其他
+ 网络运营
+ IT
+ 市场
+ 综合行政
+ 其他
-
+
@@ -504,7 +503,7 @@ const Home: React.FC<{}> = () => {
-
+
{contactData.length > 0 && contactData.map(([name, value], index) => (
{name}
diff --git a/src/pages/PartyMemberTopic/PartyBranch/index.tsx b/src/pages/PartyMemberTopic/PartyBranch/index.tsx
index 97d6b6a..148fb16 100644
--- a/src/pages/PartyMemberTopic/PartyBranch/index.tsx
+++ b/src/pages/PartyMemberTopic/PartyBranch/index.tsx
@@ -48,6 +48,11 @@ const PartyBranch: React.FC<{}> = () => {
history.push("/partyMemberTopic/home");
}
+ //to total personInfor
+ const personNumClick = () => {
+ history.push({ pathname: "/partyMemberTopic/personInfor" });
+ }
+
useEffect(() => {
getMemberNumber();
getBranchData();
@@ -72,7 +77,7 @@ const PartyBranch: React.FC<{}> = () => {
-
党员数量{memberNumber?.member}人
+
personNumClick()}>党员数量{memberNumber?.member}人
党支部数量{memberNumber?.branch}个
diff --git a/src/pages/PartyMemberTopic/PersonInfor/index.tsx b/src/pages/PartyMemberTopic/PersonInfor/index.tsx
index 2f1eb20..16f85d1 100644
--- a/src/pages/PartyMemberTopic/PersonInfor/index.tsx
+++ b/src/pages/PartyMemberTopic/PersonInfor/index.tsx
@@ -59,7 +59,7 @@ const PersonInfor: React.FC<{}> = (props: any) => {
return (
-
+
toHome()}>返回首页
toGoBack()}>上一页
diff --git a/src/pages/PartyMemberTopic/Style/ld_style.less b/src/pages/PartyMemberTopic/Style/ld_style.less
index aff0b21..1620e60 100644
--- a/src/pages/PartyMemberTopic/Style/ld_style.less
+++ b/src/pages/PartyMemberTopic/Style/ld_style.less
@@ -35,6 +35,10 @@
}
}
+ .member-top-banner {
+ background: url("../../../assets/topic/bannerListPic_member.jpg") no-repeat;
+ }
+
.search {
height: 68px;
line-height: 64px;
@@ -81,6 +85,7 @@
position: absolute;
right: 360px;
top: 24px;
+ cursor: pointer;
}
.party-num {