From 589155e1446f1f89b6df6329c11f67d1a12a8ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 11 Oct 2019 17:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=88=E7=8E=87=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/ShixunhomeWorkItem.js      |  6 ++--
 .../shixunHomework/Trainingjobsetting.js      | 36 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 7aa1d44de..01bcae9a8 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -354,8 +354,8 @@ class ShixunhomeWorkItem extends Component{
               <span className="mr50 df">
                 {/* <a href="/users/innov" className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a> */}
                 { discussMessage.author && <span className="mr15 color-grey-3">{discussMessage.author}</span> }
-								{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9">已开始做题 {discussMessage.commit_count}</span>}
-								{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">未开始做题 {discussMessage.uncommit_count}</span>}
+								{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9">已开始做题 {discussMessage.commit_count}人</span>}
+								{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">未开始做题 {discussMessage.uncommit_count}人</span>}
                 {/*<span className="mr15 color-grey9">{discussMessage.replies_count} 3 未评</span>*/}
 
                 {
@@ -381,7 +381,7 @@ class ShixunhomeWorkItem extends Component{
                 {
                   discussMessage && discussMessage.upper_category_name &&
                   <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
-                    { <span className="mr15 color-grey9 task-hide" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4?{"maxWidth":"111px"}:{"maxWidth":"272px"}} title={discussMessage.upper_category_name}>{discussMessage.upper_category_name}</span>}
+                    { <span className="mr15 color-grey9 task-hide" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4||discussMessage.time_status===5?{"maxWidth":"85px"}:{"maxWidth":"272px"}} title={discussMessage.upper_category_name}>{discussMessage.upper_category_name}</span>}
                   </ConditionToolTip>
                 }
                 
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 142d1e074..1b468d8ff 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1722,20 +1722,20 @@ class Trainingjobsetting extends Component {
                             flagPageEditstwo:releasetime,
                             flagPageEditsthrees:deadline,
                             flagPageEditsfor:endtime,
-                            completionefficiencyscore:true,
+                            completionefficiencyscore:false,
                             work_efficiencys:this.state.work_efficiencys,
                             unifiedsetting:this.state.unifiedsetting,
-                            latedeductiontwo:20,
+                            latedeductiontwo:0,
                         });
                         //均分比例
                         try {
-                            if(this.state.proportion==="均分比例"){
-                                this.Equalproportion(20);
-
-                            }else if(this.state.proportion==="经验值比例"){
-                                this.Empiricalvalueratio(20);
-
-                            }
+                            // if(this.state.proportion==="均分比例"){
+                            //     this.Equalproportion(20);
+														//
+                            // }else if(this.state.proportion==="经验值比例"){
+                            //     this.Empiricalvalueratio(20);
+														//
+                            // }
                         }catch (e) {
 
                         }
@@ -1838,21 +1838,21 @@ class Trainingjobsetting extends Component {
                             flagPageEditstwo:releasetime,
                             flagPageEditsthrees:deadline,
                             flagPageEditsfor:endtime,
-                            completionefficiencyscore:true,
+                            completionefficiencyscore:false,
                             work_efficiencys:datas.data.work_efficiency,
                             unifiedsetting:datas.data.unified_setting,
-                            latedeductiontwo:20,
+                            latedeductiontwo:0,
                         });
                         //均分比例
                         // result.data.shixun_evaluation === 0 ? "均分比例" : result.data.shixun_evaluation === 1 ? "经验值比例" : result.data.shixun_evaluation === 2 ?
                         try {
-                            if(datas.data.shixun_evaluation === 0){
-                                this.Equalproportion(20);
-
-                            }else if(datas.data.shixun_evaluation === 1){
-                                this.Empiricalvalueratio(20);
-
-                            }
+                            // if(datas.data.shixun_evaluation === 0){
+                            //     this.Equalproportion(20);
+														//
+                            // }else if(datas.data.shixun_evaluation === 1){
+                            //     this.Empiricalvalueratio(20);
+														//
+                            // }
                         }catch (e) {
                             console.log(1);
                             console.log(e);