From b61bb1310c80b7b52a07fbd7cd9d11ad7dc4a7ac Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 22 Jun 2019 17:41:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AE=9E=E8=AE=AD-images?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/GraduationTaskssettinglist.js       | 32 +++++++++++--------
 .../src/modules/user/usersInfo/InfosShixun.js |  2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 752d61d33..5907674b5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -1279,6 +1279,9 @@ class GraduationTaskssettinglist extends Component{
 						text-overflow: ellipsis;
 						white-space: nowrap;
 						 }
+						 .ant-table-tbody > tr:last-child > td{
+							 border:none!important;
+						 }
 						`
 						}
 					</style>
@@ -1545,21 +1548,22 @@ class GraduationTaskssettinglist extends Component{
 											<div id="graduation_work_list" style={{padding:'0px 40px 10px 40px'}}>
 
 												<div className="clearfix">
-													{this.props.isAdmin()?<span className="fl color-grey-6 font-12"><span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） </span>:""}
-													{this.props.isAdmin()?<div className="fr color-grey-6 edu-menu-panel">
-														<p>
-															<a data-remote="true">
-															{order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
-															<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
-														<ul className="edu-menu-list">
-															<li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a>
-															</li>
-															<li onClick={(e)=>this.funorder("work_score" )}><a  data-remote="true">最终成绩</a>
-															</li>
-															<li  onClick={(e)=>this.funorder("student_id" )}><a data-remote="true">学生学号</a>
+													{this.props.isAdmin()?<span className="fl color-grey-9 font-12"><span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） </span>:""}
+													{
+														this.props.isAdmin() ?
+														<div className="fr">
+															<li className="drop_down edu-txt-center">
+																<span className="color-grey-6">{order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</span>
+																<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-9"></i>
+																<ul className="drop_down_normal with100">
+																	<li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a></li>
+																	<li onClick={(e)=>this.funorder("work_score" )}><a  data-remote="true">最终成绩</a></li>
+																	<li onClick={(e)=>this.funorder("student_id" )}><a data-remote="true">学生学号</a></li>
+																</ul>
 															</li>
-														</ul>
-													</div>:""}
+														</div>
+														:""
+												}
 												</div>
 
 											</div>
diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js
index d6835098a..2a1210faf 100644
--- a/public/react/src/modules/user/usersInfo/InfosShixun.js
+++ b/public/react/src/modules/user/usersInfo/InfosShixun.js
@@ -171,7 +171,7 @@ class InfosShixun extends Component{
                     item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span><img src={getImageUrl("/images/educoder/tag2.png")}/></div>
                   }
                   <a href="javascript:void(0)" className="square-img">
-                    <img alt="Shixun6" src={getImageUrl(`${item.image_url}`)}/>
+                    <img alt="Shixun6" src={`${item.image_url}`}/>
                   </a>
                   <div className="square-main">
                     <p className="task-hide">