From 02a4009821abe49d61facc2469bd54c8f035e24a Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 26 Jun 2019 16:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/busyWork/CommonWorkAnswer.js |  2 +-
 .../modules/courses/busyWork/CommonWorkList.js   |  6 ++++--
 .../src/modules/courses/common/courseMessage.css |  1 +
 .../src/modules/courses/members/studentsList.js  | 16 +++++++++++-----
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAnswer.js b/public/react/src/modules/courses/busyWork/CommonWorkAnswer.js
index 51031de17..d7614459c 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAnswer.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAnswer.js
@@ -86,7 +86,7 @@ class CommonWorkAnswer extends Component{
         {/* 内容区 */}
         <div className="padding40 memoContent new_li">
           {reference_answer ? <MarkdownToHtml content={reference_answer || "还未设置答案。"}></MarkdownToHtml> :
-            reference_answer === undefined ? '' : <NoneData></NoneData>}
+            reference_answer === undefined ? '' : ((!attachments || attachments.length == 0) && <NoneData></NoneData>)}
           
           { attachments && attachments.map((item) => {
             return ( <div className="color-grey">
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 28de13fe7..31532f78e 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -64,7 +64,9 @@ function buildColumns(that, student_works) {
     key: 'id',
     render: (text, record, index) => {
       return (
-       <span style={{ minWidth: '50px', display: 'inline-block', textAlign: 'center' }} >{(that.state.page - 1) * PAGE_SIZE + index + 1}</span>
+       <span style={{ minWidth: '50px', display: 'inline-block', textAlign: 'center' }} >
+        {record.isMine == true ? '我' : (that.state.page - 1) * PAGE_SIZE + index + 1}
+      </span>
     )},
   }, {
     title: '姓名',
@@ -547,7 +549,7 @@ class CommonWorkList extends Component{
       StudentData=isStudent ? [{ id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score,
       ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,
       late_penalty, absence_penalty, appeal_penalty,
-      work_group: '' }] : []
+      work_group: '', isMine: true }] : []
     }
     let params = this._getRequestParams()
     let exportUrl = `/api/homework_commons/${workId}/works_list.zip?${queryString.stringify(params)}`;
diff --git a/public/react/src/modules/courses/common/courseMessage.css b/public/react/src/modules/courses/common/courseMessage.css
index c219df018..fede51ded 100644
--- a/public/react/src/modules/courses/common/courseMessage.css
+++ b/public/react/src/modules/courses/common/courseMessage.css
@@ -40,6 +40,7 @@
 .course-message .comment_item_cont:last-child {
   /* 作品评阅需要 */
   border-bottom: none;
+  padding-bottom: 0px;
 }
 
 .course-message .memoMore {
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index d997592ef..9c6254cbd 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -46,24 +46,30 @@ const buildColumns = (that) => {
     key: 'login',
     align:'center',
     className:"color-grey-6",
-    // render: (name, record) => {
-    //   return <a className="color-dark" target="_blank" href={`/users/${record.login}`}>{name}</a>
-    // }
+    render: (name, record) => {
+      return <span className="color-dark overflowHidden1" style={{maxWidth: '110px'}}>{name}</span>
+    }
   }, {
     title: '姓名',
     dataIndex: 'name',
     key: 'name',
     align:'center',
+    width:"10%",
     className:"color-grey-6",
     render: (name, record) => {
-      return <a className="color-dark" target="_blank" href={`/users/${record.login}`}>{name}</a>
+      return <a className="color-dark overflowHidden1" target="_blank" 
+          style={{maxWidth: '120px'}} href={`/users/${record.login}`}>{name}</a>
     }
   }, {
     title: '学号',
     dataIndex: 'student_id',
     key: 'student_id',
     align:'center',
-    className:"color-grey-6"
+    className:"color-grey-6",
+    render: (student_id, record) => {
+      return <span className="color-dark overflowHidden1" 
+          style={{maxWidth: '110px'}} >{student_id}</span>
+    }
   }, {
     title: '分班',
     dataIndex: 'course_group_name',