From 3df9ee5bed5394c2042c9448d4344db3c0c97b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 9 Sep 2019 15:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=B9=E7=AA=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/exercise/Ecerciseallbackagain.js  | 60 +++++++++++++++----
 .../Shixunworkdetails/ShixunWorkModal.js      |  6 +-
 .../paths/PathDetail/DetailCardsEditAndAdd.js |  2 +-
 .../PathDetail/DetailCardsEditAndEdit.js      |  2 +-
 4 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
index 11c0fd07b..35556da54 100644
--- a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
+++ b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
@@ -157,9 +157,44 @@ class Ecerciseallbackagain extends Component{
         console.log()
         return(
             <div>
+							<style>
+								{
+									`
+								@media (max-width: 2000px) {
+											.newupload_select_box{
+											  height: 265px !important;
+											}
+									}
+
+								 @media (max-width: 1350px) {
+										.HomeworkModal{
+ 										  top:10px !important;
+ 										}
+ 											.newupload_select_box{
+											  height: 220px !important;
+											}
+									}
+
+	 								@media (max-width: 1250px) {
+ 										.HomeworkModal{
+ 										  top:0px !important;
+ 										}
+
+ 										.newupload_select_box{
+											  height: 150px !important;
+									  }
+									}
+									.eerxisbox:hover {
+											background: #e4eaf6;
+									}
+									.upload_select_box li:hover {
+										background:transparent;
+									}
+									`
+								}
+							</style>
                 <Modal
                     className={"HomeworkModal"}
-										style={{ top: 20 }}
                     title={this.props.modalname}
                     visible={this.props.visible}
                     closable={false}
@@ -170,11 +205,12 @@ class Ecerciseallbackagain extends Component{
                     <div className="task-popup-content">
 
                         <style>{`
-                .greybackHead{
-                  padding:0px 30px;
-                }
-                .fontlefts{text-align: left;}
-              `}</style>
+												.greybackHead{
+													padding:0px 30px;
+												}
+												.fontlefts{text-align: left;}
+											`}</style>
+
                         <div className="clearfix edu-txt-center mb10" style={{color:"#333333",fontSize: '15px'}}>学生将得到一次重新答题的机会，现有的答题情况将被清空</div>
                         <ul className="clearfix edu-txt-center ml35">
                             <li className="fl paddingleft22 fontlefts" style={{width:'160px'}}>姓名</li>
@@ -183,7 +219,7 @@ class Ecerciseallbackagain extends Component{
                         </ul>
 
                         {datalist===undefined?"":
-                            <ul className="upload_select_box fl clearfix mt10 mb10" style={{"overflow-y":"auto",height: "217px"}}
+                            <ul className="upload_select_box fl clearfix mt10 mb10 newupload_select_box" style={{"overflow-y":"auto"}}
                                 id="search_not_members_list"
                                 onScroll={this.contentViewScroll}
                             >
@@ -191,7 +227,7 @@ class Ecerciseallbackagain extends Component{
 
                                     { datalist.map((item,key)=>{
                                                 return(
-                                                    <div className="clearfix edu-txt-center lineh-40" key={key}>
+                                                    <div className="clearfix edu-txt-center lineh-40 eerxisbox" key={key}>
                                                         <li className="fl" style={{width: '158px'}}>
                                                             <Checkbox
                                                                 className="fl task-hide edu-txt-left"
@@ -199,8 +235,12 @@ class Ecerciseallbackagain extends Component{
                                                                 value={item.user_id}
 																																key={item.user_id}
                                                             >
-                                                                <label style={{"textAlign": "left", "color": "#05101A"}}
-                                                                       className="task-hide color-grey-name" title="frerere">{item.user_name}</label>
+                                                                <a style={{"textAlign": "left"}}
+                                                                   className="task-hide color-grey-name"
+																																	 href={`/users/${item.user_id}/courses`}
+																																	 target={'_blank'}
+																																	 title={item.user_name}
+																																>{item.user_name}</a>
                                                             </Checkbox>
                                                         </li>
                                                         <li className="fl" style={{width: '150px'}}>
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index ec245c29b..22a97ed21 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -273,7 +273,7 @@ class ShixunWorkModal extends Component{
 
 								</div>
 								:
-							<ul className="upload_select_box fl clearfix mt10 mb10" tyle={{"overflow-y":"auto"}}id="search_not_members_list"
+							<ul className="upload_select_box fl clearfix mt10 mb10" style={{"overflow-y":"auto"}} id="search_not_members_list"
 									onScroll={this.contentViewScroll}
 							>
 
@@ -286,7 +286,7 @@ class ShixunWorkModal extends Component{
 											group_list&&group_list.length===0?"":group_list.map((item,key)=>{
 												return(
 													 <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
-														<li className="fl task-hide" style={{width: '240px'}}>
+														<li className="fl task-hide" style={{width: '240px',paddingLeft: '10px'}}>
 															<Checkbox
 																className="fl task-hide edu-txt-left"
 																name="shixun_homework[]"
@@ -294,7 +294,7 @@ class ShixunWorkModal extends Component{
 																key={item=== undefined?"":item.id}
 															>
 																<label style={{"textAlign": "left", "color": "#05101A"}}
-																			 className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label>
+																			 className="task-hide color-grey-name" title={item===undefined?"":item.name}>{item===undefined?"":item.name}</label>
 															</Checkbox>
 														</li>
 														<li className="fl" style={{width: '100px'}}>
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index f3c9d514b..10c78dddf 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -518,7 +518,7 @@ class DetailCardsEditAndAdd extends Component{
                                     style={{"width":"298px"}}
                                     name="shixun_homework[]"
                                   >
-                                    <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title="frerere">{item.shixun_name}</label>
+                                    <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title={item.shixun_name}>{item.shixun_name}</label>
                                   </Checkbox>
                                 </li>
                                 <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school_users}</li>
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
index b4b8cb536..30859d962 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
@@ -554,7 +554,7 @@ class DetailCardsEditAndEdit extends Component{
                                   style={{"width":"298px"}}
                                   name="shixun_homework[]"
                                 >
-                                  <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title="frerere">{item.shixun_name}</label>
+                                  <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title={item.shixun_name}>{item.shixun_name}</label>
                                 </Checkbox>
                               </li>
                               <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school_users}</li>