6.28 党建攻坚第二版

src/pages/PartyMemberTopic/PartyBranch/index.tsx

@@ -3,78 +3,11 @@ import '../Style/ld_style.less';
 import { Input, List } from 'antd';
 import { history } from 'umi'
 import { getBranchList, getMemberAndBranch } from './service';
+import person from '@/assets/topic/person.png'
+import branch from '@/assets/topic/branch.png'
 
 const { Search } = Input;
 
-const data = [
-  {
-    title: '集团党支部',
-    num: 987,
-  },
-  {
-    title: '北京分公司党支部',
-    num: 127,
-  },
-  {
-    title: '山东分公司党支部',
-    num: 110,
-  },
-  {
-    title: '吉林分公司党支部',
-    num: 121,
-  },
-  {
-    title: '辽宁分公司党支部',
-    num: 130,
-  },
-  {
-    title: '陕西分公司党支部',
-    num: 105,
-  },
-  {
-    title: '山西分公司党支部',
-    num: 104,
-  },
-  {
-    title: '湖北分公司党支部',
-    num: 113,
-  },
-  {
-    title: '湖南分公司党支部',
-    num: 111,
-  },
-  {
-    title: '江苏分公司党支部',
-    num: 987,
-  },
-  {
-    title: '河南分公司党支部',
-    num: 121,
-  },
-  {
-    title: '河北分公司党支部',
-    num: 100,
-  },
-  {
-    title: '天津分公司党支部',
-    num: 86,
-  },
-  {
-    title: '上海分公司党支部',
-    num: 98,
-  },
-  {
-    title: '安徽分公司党支部',
-    num: 105,
-  },
-  {
-    title: '江西分公司党支部',
-    num: 121,
-  },
-];
-
-
-
 const PartyBranch: React.FC<{}> = () => {
   //member number and branch number
   const [memberNumber, setMemberNumber] = useState<any>({});
@@ -97,11 +30,17 @@ const PartyBranch: React.FC<{}> = () => {
       }
     })
   }
+  //search params redirect
+  const onSearch = (value: string) => {
+    const params = {
+      param: value
+    }
+    history.push({ pathname: "/partyMemberTopic/personInfor", state: params });
+  }
 
   //onclick
   const clickCard = (data: any) => {
-    sessionStorage.setItem("detailData", JSON.stringify(data));
-    history.push("/partyMemberTopic/personInfor");
+    history.push({ pathname: "/partyMemberTopic/personInfor", state: data });
   }
 
   //to home
@@ -121,13 +60,14 @@ const PartyBranch: React.FC<{}> = () => {
         </div>
       </div>
       <div className="search">
-        <span className="text"><span>党员名录</span>(当前共270条)</span>
+        <span className="text"><span>党员名录</span>(当前共{memberNumber?.member}条)</span>
         <div className="search-box">
           <Search
             placeholder="输入姓名/邮箱/电话"
             allowClear
             enterButton="搜索"
             style={{ width: 322 }}
+            onSearch={onSearch}
           />
         </div>
       </div>
@@ -144,9 +84,23 @@ const PartyBranch: React.FC<{}> = () => {
               <div className="wrapper" onClick={() => clickCard(item)}>
                 <div className="pic-bg">{item.branchName}</div>
                 <div className="mess">
-                  <div className="mess-left">党员数量</div>
+                  {/* <div className="mess-left">党员数量</div>
                   <div className="mess-right">
                     <span>{item.count}</span>人
+                  </div> */}
+                  <div className="mess-left">
+                    <span>{item.branchCount}</span>个
+                    <div>
+                      <img src={branch} />
+                      <span>党支部数</span>
+                    </div>
+                  </div>
+                  <div className="mess-right">
+                    <span>{item.count}</span>人
+                    <div>
+                      <img src={person} />
+                      <span>党员数量</span>
+                    </div>
                   </div>
                 </div>
               </div>