From 304df978223348418fbd77518639448818510978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 27 Jun 2019 14:36:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../graduation/tasks/GraduationTasksappraiseReply.js      | 4 +---
 .../modules/courses/shixunHomework/Trainingjobsetting.js  | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
index 0f98f4d8f..e2ab8ec05 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
@@ -159,7 +159,6 @@ class GraduationTasksappraiseReply extends Component{
       <React.Fragment>
 				{comment_scores.length===0? "": <div className="edu-back-white padding20-30" style={{marginTop: '16px'}}>
         {isStudent===true?
-
           <GraduationTasksappraiseReplyChild
               {...this.props}
               {...this.state}
@@ -169,8 +168,7 @@ class GraduationTasksappraiseReply extends Component{
               addSuccess={this.addSuccess}
               onDelete={this.onDelete}
             />
-          :
-              <GraduationTasksappraiseReplyChild {...this.state} {...this.props}
+          : <GraduationTasksappraiseReplyChild {...this.state} {...this.props}
                  cancelmodel={this.cancelmodel}
                  showModulationtype={(id)=>this.showModulationtype(id)}
                  saveModulationModal={(value,num)=>this.saveModulationModal(value,num)}
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index bece9862f..12d21fb53 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1747,7 +1747,7 @@ class Trainingjobsetting extends Component {
                                         <div>
                                             <div className="clearfix mb5 ml15">
                                                 <span className="font-16 mr15 fl mt6" style={{"color":"#999999"}}>发布时间：</span>
-                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : starttimetype === true ? "发布时间已过，则不能修改" : ""}></Tooltip>
+                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true ? "发布时间已过，则不能修改" : ""}>
                                                 <div className="fl">
                                                     <DatePicker
                                                         showToday={false}
@@ -1775,11 +1775,12 @@ class Trainingjobsetting extends Component {
                                                         }
                                                     </p>
                                                 </div>
+                                                </Tooltip>
                                                 <span className="ml20 fl mt10" style={{"color":"#999999","text-align":"left","font-size":"14px"}}>(学生收到作业的时间)</span>
                                             </div>
                                             <div className="clearfix ml15">
                                                 <span className="mr15 fl mt10 font-16" style={{"color":"#999999"}}>截止时间：</span>
-                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : starttimetype === true ? "截止时间已过，则不能修改" : ""}> </Tooltip>
+                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true ? "截止时间已过，则不能修改" : ""}>
                                                 <div className="fl">
                                                     <DatePicker
                                                         showToday={false}
@@ -1807,6 +1808,7 @@ class Trainingjobsetting extends Component {
                                                         }
                                                     </p>
                                                 </div>
+                                                </Tooltip>
                                                 <span className=" ml20 fl mt10 color-grey-9" style={{"text-align":"left","font-size":"14px"}}>(学生“按时”提交作品的时间截点)</span>
                                             </div>
                                         </div>
@@ -1924,7 +1926,7 @@ class Trainingjobsetting extends Component {
                                           checked={this.state.completionefficiencyscore} style={{"color":"#666666"}}>效率分<span
                                     className={"font-14 color-grey-9 font-14 ml15"} style={{"text-align":"left"}}>(选中，则学生最终成绩包含效率分)</span></Checkbox>
                             </div>
-                            <div className="ml80 mt30">
+                            <div className="ml85 mt30">
                                 <span className="c_grey mr10" style={{"color":"#999999"}}>分值</span>
                                 <InputNumber min={0} disabled={!flagPageEdit} max={100} className="ml10 h40 mr10  color-grey-9"
                                              style={{width: "100px","color":"#999999"}}

From aeedc74f409d02e2a0a928e47792aef26ce3efe9 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 27 Jun 2019 14:42:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E9=80=89=E9=A2=98-?=
 =?UTF-8?q?=E5=90=8C=E6=84=8F=E9=80=89=E9=A2=98=E7=82=B9=E5=87=BB=E6=97=A0?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/graduation/topics/GraduateTopicDetailTable.js      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
index bd58e555b..4e92f75ee 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
@@ -80,10 +80,11 @@ class GraduateTopicDetailTable extends Component{
   }
   sureAgreeTopic=(count)=>{
     if(count > 0){
+      debugger
       let{tableData}=this.props;
       let{operationId,classesId}=this.state
       let courseId=this.props.match.params.course_id;
-      let name=tableData.group_list.filter(item=>item.course_group_id==classesId)[0].group_name;
+      let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name;
       this.agreeChoose(courseId,operationId,classesId,name);
     }else{
       this.setState({