From a13b5ac4c8a9482bee974d25e92d22dfaa4547c5 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 11:20:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/CommonWorkList.js        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 773fa52fe..b31c70926 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -40,11 +40,15 @@ function getScoreTip(score, dom) {
 }
 function buildColumns(that, student_works) {
   let gotWorkGroup = false;
+  let gotProjectInfo = false;
   if (student_works) {
     student_works.forEach(item => {
       if (item.work_group) {
         gotWorkGroup = true
       }
+      if (item.project_info && item.project_info.name) {
+        gotProjectInfo = true;
+      }
     })
   }
   let courseId= that.props.match.params.coursesId;
@@ -136,6 +140,22 @@ function buildColumns(that, student_works) {
       ),
     })
   }
+  if (gotProjectInfo) {
+    columns.push({
+      width: 72,
+      title: '关联项目',
+      dataIndex: 'project_info',
+      key: 'project_info',
+
+      render: (project_info, record) => (
+        <span>
+          {project_info && project_info.name && <a href={`/projects/${project_info.id}`} target="_blank"  
+              className="overflowHidden1" style={{color:'#4CACFF', width: '80px', margin: '0 auto'}} title={project_info.name}
+          >{project_info.name}</a>}
+        </span>
+      ),
+    })
+  }
   columns = columns.concat([{
     width: 88,
     title: '提交状态',

From 9fc8778ed9ca3be1fa5ab68b5b3818f61aa29f09 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 13:56:00 +0800
Subject: [PATCH 2/2] 72

---
 .../src/modules/courses/busyWork/CommonWorkList.js     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index b31c70926..b1a1d5553 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -150,7 +150,7 @@ function buildColumns(that, student_works) {
       render: (project_info, record) => (
         <span>
           {project_info && project_info.name && <a href={`/projects/${project_info.id}`} target="_blank"  
-              className="overflowHidden1" style={{color:'#4CACFF', width: '80px', margin: '0 auto'}} title={project_info.name}
+              className="overflowHidden1" style={{color:'#4CACFF', width: '80px', margin: '0 auto', display: 'block'}} title={project_info.name}
           >{project_info.name}</a>}
         </span>
       ),
@@ -196,7 +196,7 @@ function buildColumns(that, student_works) {
   }]) 
   if (!niPingAndIsStudent) {
     columns.push({
-      width: 72,
+      width: 70,
       title: '教师评分',
       key: 'teacher_score',
       dataIndex: 'teacher_score',
@@ -212,7 +212,7 @@ function buildColumns(that, student_works) {
     })
 
     columns.push({
-      width: 72,
+      width: 70,
       title: '助教评分',
       key: 'teaching_asistant_score',
       dataIndex: 'teaching_asistant_score',
@@ -271,7 +271,7 @@ function buildColumns(that, student_works) {
   
   if (that.state.anonymous_appeal) {
     columns.push({
-      width: 72,
+      width: 70,
       title: '匿评申诉',
       key: 'appeal_all_count',
       dataIndex: 'appeal_all_count',
@@ -291,7 +291,7 @@ function buildColumns(that, student_works) {
   }
   if (!niPingAndIsStudent) {
     columns.push({
-      width: 72,
+      width: 70,
       title: '最终成绩',
       key: 'work_score',
       dataIndex: 'work_score',