From 08119e95da0f61cf792616fa15d7fad474b93380 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 10 Jul 2019 15:26:47 +0800
Subject: [PATCH] wo

---
 .../src/modules/courses/busyWork/CommonWorkDetailIndex.js     | 4 +++-
 public/react/src/modules/courses/busyWork/CommonWorkList.js   | 2 +-
 .../modules/courses/busyWork/common/WorkDetailPageHeader.js   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index ac8f91b74..1986ddd43 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -150,7 +150,9 @@ class CommonWorkDetailIndex extends Component{
               ]}></CBreadcrumb>
 
               <div style={{ width:'100%',height:'52px'}} >
-                <span className=" fl color-black summaryname" title={`${homework_name && homework_name.length > 36 ? homework_name : ''}`}>
+                <span className=" fl color-black summaryname" title={`${homework_name && homework_name.length > 36 ? homework_name : ''}`}
+                    style={{height: 'auto'}}
+                >
                    {homework_name}
                   {/* <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link> */}
                 </span>
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 67da6c549..5938d037a 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -70,7 +70,7 @@ function buildColumns(that, student_works) {
     render: (text, record, index) => {
       return (
        <span style={{ minWidth: '50px', display: 'inline-block', textAlign: 'center' }} >
-        {record.isMine == true ? '我' : (that.state.page - 1) * PAGE_SIZE + index + 1}
+        {record.isMine == true && (student_works && student_works.length) ? '我' : (that.state.page - 1) * PAGE_SIZE + index + 1}
       </span>
     )},
   }, {
diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
index 782a1c07d..76d9d3727 100644
--- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
+++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
@@ -97,7 +97,7 @@ class WorkDetailPageHeader extends Component{
               ]}></CBreadcrumb>
 
               <div style={{ width:'100%',height:'52px'}} >
-                <span className=" fl color-black summaryname" style={{}}>
+                <span className=" fl color-black summaryname" style={{height: 'auto'}}>
                    {homework_name}
                   {/* <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link> */}
                 </span>