From 6ea1b2a936ce6fd6cb58e1bd4e382938aff4af57 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Wed, 19 Feb 2020 15:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/ShixunhomeWorkItem.js      | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index c8639e6eb..f27cd9d49 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -277,7 +277,7 @@ class ShixunhomeWorkItem extends Component{
           /*list style*/
           .boardsList {
             display: flex;
-            align-items: center;
+            align-items: flex-start;
 
             padding-top: 8px;
             padding-bottom: 10px;
@@ -297,12 +297,12 @@ class ShixunhomeWorkItem extends Component{
           `}</style>
 
           {this.props.isAdmin?
-            <span className={`shixunitem${index} fl`} style={{"height":"55px"}}>{checkBox}</span>
+            <span className={`shixunitem${index} fl`} style={{"height":"55px",paddingTop:"2px"}}>{checkBox}</span>
             :
             ""
           }
 
-          <div className="clearfix ds pr pt5 contentSection" >
+          <div className="clearfix ds pr contentSection" >
 						<style>{`
             .maxwidth333{
                 max-width: 333px;
@@ -404,14 +404,21 @@ class ShixunhomeWorkItem extends Component{
 
 
             </h6>
-
+            {/* style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4||discussMessage.time_status===5||discussMessage.time_status===6?{"maxWidth":"216px"}:{"maxWidth":"550px"}} */}
+            {
+              discussMessage && discussMessage.upper_category_name &&
+              // <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
+                <div className="color-grey9 task-hide mt5" title={discussMessage.upper_category_name}>所属目录：{discussMessage.upper_category_name}</div>
+              // </ConditionToolTip>
+            }
             <div className="cl"></div>
-            <p className="color-grey mt16 fl" style={{"width":"820px"}}>
+            <p className="color-grey mt15 fl" style={{"width":"820px"}}>
               <span >
                 {/* <a href="/users/innov" className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a> */}
                 { discussMessage.author && <span className="mr15 color-grey-3">{discussMessage.author}</span> }
 								{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9">已开始做题 {discussMessage.commit_count}人</span>}
-								{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">未开始做题 {discussMessage.uncommit_count}人</span>}
+                {discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">未开始做题 {discussMessage.uncommit_count}人</span>}
+                {discussMessage.compelete_count===undefined?"":<span className="mr15 color-grey9">已完成做题 {discussMessage.compelete_count}人</span>}
                 {/*<span className="mr15 color-grey9">{discussMessage.replies_count} 3 未评</span>*/}
 
                 {
@@ -426,12 +433,7 @@ class ShixunhomeWorkItem extends Component{
                   :
                    <span className="mr15 color-grey9">{discussMessage.status_time}</span>
                 }
-                {
-                  discussMessage && discussMessage.upper_category_name &&
-                  <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
-                    { <div className=" color-grey9 task-hide fr" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4||discussMessage.time_status===5||discussMessage.time_status===6?{"maxWidth":"216px"}:{"maxWidth":"550px"}} title={discussMessage.upper_category_name}>所属目录：{discussMessage.upper_category_name}</div>}
-                  </ConditionToolTip>
-                }
+