From 6088c0f6e10dbd7efbad3f92bec62af956d1ae33 Mon Sep 17 00:00:00 2001
From: zhangxiaozhuozhuo <7658685+zhangxiaozhuozhuo@user.noreply.gitee.com>
Date: Mon, 20 Nov 2023 14:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E6=88=90=E6=9E=9C=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/achievement.js                   | 13 +++----
 .../achievement/components/itemList/index.jsx | 15 ++++++--
 src/military/achievement/noticeList/index.jsx | 34 ++++++++++++-------
 src/military/achievement/overview/index.jsx   |  2 +-
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/military/achievement.js b/src/military/achievement.js
index c8929bcaf..5b8f84710 100644
--- a/src/military/achievement.js
+++ b/src/military/achievement.js
@@ -60,12 +60,13 @@ class Index extends Component {
             )}
           ></Route>
 
-            <Route
-                path="/achievement/overview"
-                render={(props) => (
-                    <Overview {...this.props} {...props} />
-                )}
-            ></Route>
+          <Route
+            path="/achievement/overview"
+            render={(props) => (
+                <Overview {...this.props} {...props} />
+            )}
+          ></Route>
+
         </Switch>
       </div>
     );
diff --git a/src/military/achievement/components/itemList/index.jsx b/src/military/achievement/components/itemList/index.jsx
index f6cabb36e..0ab7bcad2 100644
--- a/src/military/achievement/components/itemList/index.jsx
+++ b/src/military/achievement/components/itemList/index.jsx
@@ -3,12 +3,23 @@ import { NewSvg } from '../../svg';
 import './index.scss';
 export default (props) => {
   const { list, itemClick, } = props;
+  let cleanedText = '';
 
   return (
     list.map(item => {
+      if (item.text) {
+        cleanedText = item.text.replace(/<p>|<\/p>/g, '');
+      } else {
+        cleanedText = '';
+      }
+      console.log('@@@',item.id);
+      
       return (
         <div className="list-box" key={item.id}>
-          <div className="list-title" onClick={() => { itemClick(item.id) }}>
+          <div className="list-title" onClick={() => { 
+              console.log('###点击了：'+item.id)
+              itemClick(item.id) 
+            }}>
             {item.achievementName || item.title} {item.new && <NewSvg color="#ffb300"/>}
           </div>
           <div className="list-other">
@@ -19,7 +30,7 @@ export default (props) => {
             <p><i className="iconfont icon-dianjiliang mr5 font-12" />{item.visits || 0}</p>
           </div>
           <div className="list-text">
-            <p>摘要：{item.text && item.text.substring(3, item.text.length-4)}</p>
+            <p>摘要：{cleanedText}</p>
           </div>
         </div>
       )
diff --git a/src/military/achievement/noticeList/index.jsx b/src/military/achievement/noticeList/index.jsx
index 6d298658a..f95a0d011 100644
--- a/src/military/achievement/noticeList/index.jsx
+++ b/src/military/achievement/noticeList/index.jsx
@@ -79,15 +79,19 @@ export default (props) => {
     }
   }, [tab, title, orderBy, curPage]);
 
+  // @@@ 排序实现逻辑
   function changeSort(sortType) {
     setOrderBy(sortType);
     setCurPage(1);
   }
 
+  // @@@ 跳转到成果详情页 
   function noticeClick(id) {
+    console.log('$$$noticeClick:'+id)
     props.history.push(`/achievement/noticeDetail/${id}`);
   }
 
+  // @@@ 右侧 上方 搜索、排序功能的DOM
   function sortNav() {
     return <div className="notice-sort-nav">
       <Search
@@ -105,6 +109,7 @@ export default (props) => {
     </div>
   }
 
+  // @@@ 查看更多 跳转逻辑
   function handleClick(e) {
     setTab(e.key);
     setCurPage(1);
@@ -112,6 +117,7 @@ export default (props) => {
     setOrderBy('publishDateDesc');
   }
 
+  // @@@ 左侧menu菜单项 跳转逻辑
   function click(e){
     setTab(e);
     setCurPage(1);
@@ -119,25 +125,27 @@ export default (props) => {
     setOrderBy('publishDateDesc');
   }
 
+  // @@@ 右侧根据成果来源类型 分块显示 的 实现逻辑
   function cont(param, titleStr, key, svgStr) {
-    return <React.Fragment>
-      <div className="item-head-title">
-        <div className="item-head-title-content">
-          <i className={svgStr}></i>
-          <span>{titleStr}</span>
+    return (
+      <React.Fragment>
+        <div className="item-head-title">
+          <div className="item-head-title-content">
+            <i className={svgStr}></i>
+            <span>{titleStr}</span>
+          </div>
+          {param.length === 5 && <span className="link" onClick={() => { handleClick({ key: key }) }}>查看更多 <Icon type="arrow-right" /></span>}
         </div>
-        {param.length === 5 && <span className="link" onClick={() => { handleClick({ key: key }) }}>查看更多 <Icon type="arrow-right" /></span>}
-      </div>
-      {param.length > 0 ? <ItemList
-        list={param}
-        itemClick={noticeClick}
-      /> : <Nodata _html="暂无数据" />}
-    </React.Fragment>
+        {param.length > 0 ? <ItemList list={param} itemClick={noticeClick} /> : <Nodata _html="暂无数据" />}
+      </React.Fragment>
+    )
   }
 
   // 成果库具体jsx渲染函数
+  // @@@ 右侧 下方
   function content() {
     if (tab === '0') {
+      // @@@ 如果选中“成果来源” 默认选项 右侧显示逻辑
       if(callList.length === 0 && changeList.length === 0 && competitionList.length === 0 && checkList.length === 0 && abandonList.length === 0){
         return <React.Fragment><Nodata _html="暂无数据" /></React.Fragment>
       }else{
@@ -150,6 +158,7 @@ export default (props) => {
         </React.Fragment>
       }
     } else {
+      // @@@ 如果选中除“成果来源” 外其他选项 右侧显示逻辑
       let titleStr;
       let svgStr;
       switch (tab) {
@@ -198,6 +207,7 @@ export default (props) => {
     }
   }
 
+  // @@@ 【成果列表】整体（包含：左侧 右侧 ）的主界面DOM
   return (
     <React.Fragment>
       <div className="centerbox notice-list clearfix">
diff --git a/src/military/achievement/overview/index.jsx b/src/military/achievement/overview/index.jsx
index 27c8ccee1..5536c0030 100644
--- a/src/military/achievement/overview/index.jsx
+++ b/src/military/achievement/overview/index.jsx
@@ -40,7 +40,7 @@ export default (props) => {
         </div>
       </div>
       {showChart && <AchivChart />}
-      {showList1 && < NoticeList />}
+      {showList1 && <NoticeList {...props} />}
 
     </React.Fragment>
   )