From a3c46ee41ac79619d0a07231a540b78e33099f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 16 Mar 2020 15:14:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coursesPublic/OneSelfOrderModal.js | 33 ++++++++++--------- .../shixunHomework/Trainingjobsetting.js | 5 +++ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js index 1f7fec57a..fb915164c 100644 --- a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js +++ b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js @@ -202,29 +202,32 @@ class OneSelfOrderModal extends Component{ } propsSaves=(ds,endtime)=>{ + debugger let {course_groups}=this.state; if(this.props.typs=="end"){ this.props.Saves() }else{ - - if(this.props.typs!="end"){ - if(!endtime){ - this.setState({ - endtimetype:true, - endtimetypevalue:"截止时间不能为空" - }) - return - } - if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){ - this.setState({ - endtimetype:true, - endtimetypevalue:"必须晚于当前时间" - }) - return + if(!this.props.immediatelyopen){ + if(this.props.typs!="end"){ + if(!endtime){ + this.setState({ + endtimetype:true, + endtimetypevalue:"截止时间不能为空" + }) + return + } + if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){ + this.setState({ + endtimetype:true, + endtimetypevalue:"必须晚于当前时间" + }) + return + } } } + let type=false if(course_groups===undefined||course_groups.length===0){ this.props.Saves(ds,moment(handleDateString(endtime),"YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm")) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index a6cefb466..427354bae 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -135,6 +135,7 @@ class Trainingjobsetting extends Component { borredszfls:'', total_scoretwo:0, total_score:0, + immediatelyopen:false } // console.log("获取到的值") // console.log("Trainingjobsetting") @@ -1758,6 +1759,7 @@ class Trainingjobsetting extends Component { Cancel: this.homeworkhide, Saves: this.homeworkstartend, course_groups: response.data.course_groups, + immediatelyopen:true }) } }).catch((error) => { @@ -1799,6 +1801,7 @@ class Trainingjobsetting extends Component { } // 立即发布 homeworkstartend = (ds, endtime) => { + debugger var homeworkid = this.props.match.params.homeworkid; let data = {} @@ -1914,6 +1917,7 @@ class Trainingjobsetting extends Component { typs: undefined, starttimes: undefined, starttimesend: undefined, + immediatelyopen:false }) } cancelBox = () => { @@ -2401,6 +2405,7 @@ class Trainingjobsetting extends Component { starttimes={this.state.starttimes} starttimesend={this.state.starttimesend} typs={this.state.typs} + immediatelyopen={this.state.immediatelyopen} /> : ""} Date: Mon, 16 Mar 2020 16:25:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=8B=E5=8D=B3?= =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coursesPublic/OneSelfOrderModal.js | 30 +++++++++++++++++-- .../shixunHomework/Trainingjobsetting.js | 12 +++++--- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js index fb915164c..d02b99834 100644 --- a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js +++ b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js @@ -35,7 +35,10 @@ class OneSelfOrderModal extends Component{ group_ids:[], endtime:"", course_groups:undefined, - Checkboxtype:true + Checkboxtype:true, + endtimetypevalue:undefined, + endtimetypeid:undefined, + endtimetypename:undefined } } componentDidMount() { @@ -203,6 +206,9 @@ class OneSelfOrderModal extends Component{ propsSaves=(ds,endtime)=>{ debugger + this.setState({ + endtimetype:false + }) let {course_groups}=this.state; if(this.props.typs=="end"){ @@ -241,6 +247,7 @@ class OneSelfOrderModal extends Component{ this.setState({ endtimetype:true, endtimetypeid:items.id, + endtimetypename:items.name, endtimetypevalue:"截止时间不能为空" }) return @@ -248,12 +255,29 @@ class OneSelfOrderModal extends Component{ // arr.push(moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")) }else{ if(moment(items.end_time,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){ + type=true this.setState({ endtimetype:true, - endtimetypevalue:"必须晚于当前时间" + endtimetypeid:items.id, + endtimetypename:items.name, + endtimetypevalue:"截止时间必须晚于当前时间" }) return } + + if(this.props.modallate_time){ + if(moment(items.end_time,"YYYY-MM-DD HH:mm") >= moment(this.props.modallate_time,"YYYY-MM-DD HH:mm")){ + type=true + this.setState({ + endtimetype:true, + endtimetypeid:items.id, + endtimetypename:items.name, + endtimetypevalue:"截止时间必须晚于补交结束时间" + }) + return + } + } + arr.push(handleDateString(items.end_time)) } } @@ -459,7 +483,7 @@ class OneSelfOrderModal extends Component{ } {this.state.endtimetype===true&&course_groupstype===true?
{this.state.endtimetypevalue}
:""} - {this.state.endtimetypeid!=undefined&&this.state.endtimetype===true?
{this.state.endtimetypevalue}
:""} + {this.state.endtimetypeid!=undefined&&this.state.endtimetype===true?
{this.state.endtimetypename}{this.state.endtimetypevalue}
:""} {course_groupstype===true?
{this.props.Cancelname} this.propsSaves(group_ids,this.state.endtime)}>{this.props.Savesname} diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 427354bae..e14ad1408 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -135,7 +135,8 @@ class Trainingjobsetting extends Component { borredszfls:'', total_scoretwo:0, total_score:0, - immediatelyopen:false + immediatelyopen:false, + modallate_time:undefined } // console.log("获取到的值") // console.log("Trainingjobsetting") @@ -1758,8 +1759,9 @@ class Trainingjobsetting extends Component { Savesname: "立即发布", Cancel: this.homeworkhide, Saves: this.homeworkstartend, - course_groups: response.data.course_groups, - immediatelyopen:true + course_groups:response.data.course_groups, + immediatelyopen:true, + modallate_time:response.data.late_time, }) } }).catch((error) => { @@ -1917,7 +1919,8 @@ class Trainingjobsetting extends Component { typs: undefined, starttimes: undefined, starttimesend: undefined, - immediatelyopen:false + immediatelyopen:false, + modallate_time:undefined, }) } cancelBox = () => { @@ -2406,6 +2409,7 @@ class Trainingjobsetting extends Component { starttimesend={this.state.starttimesend} typs={this.state.typs} immediatelyopen={this.state.immediatelyopen} + modallate_time={this.state.modallate_time} /> : ""} Date: Mon, 16 Mar 2020 18:36:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/busyWork/PublishRightnow.js | 7 +++++-- .../src/modules/courses/coursesPublic/OneSelfOrderModal.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/PublishRightnow.js b/public/react/src/modules/courses/busyWork/PublishRightnow.js index 9863a95d6..95d71cb16 100644 --- a/public/react/src/modules/courses/busyWork/PublishRightnow.js +++ b/public/react/src/modules/courses/busyWork/PublishRightnow.js @@ -24,7 +24,8 @@ class PublishRightnow extends Component{ Savesname:undefined, Cancel:undefined, Saves:undefined, - Topvalright:undefined + Topvalright:undefined, + modallate_time:undefined } } open = (usingCheckBeforePost) => { @@ -70,6 +71,7 @@ class PublishRightnow extends Component{ Cancel:this.homeworkhide, Saves:this.homeworkstartend, typs:showdatatypes ? "start" : "end", + modallate_time:showdatatypes?response.data.late_time:undefined, }) } homeworkhide=()=>{ @@ -91,7 +93,8 @@ class PublishRightnow extends Component{ StudentList_value:undefined, addname:undefined, addnametype:false, - addnametab:undefined + addnametab:undefined, + modallate_time:undefined }) } diff --git a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js index d02b99834..60f2df553 100644 --- a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js +++ b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js @@ -483,7 +483,7 @@ class OneSelfOrderModal extends Component{ } {this.state.endtimetype===true&&course_groupstype===true?
{this.state.endtimetypevalue}
:""} - {this.state.endtimetypeid!=undefined&&this.state.endtimetype===true?
{this.state.endtimetypename}{this.state.endtimetypevalue}
:""} + {this.state.endtimetypeid!=undefined&&this.state.endtimetype===true?
{this.state.endtimetypevalue}
:""} {course_groupstype===true?
{this.props.Cancelname} this.propsSaves(group_ids,this.state.endtime)}>{this.props.Savesname} From 62c6a1b0f86a46a328ef371e87c485c13ed2188f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 16 Mar 2020 21:20:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E3=80=81=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonWorkAppraiseReviseAttachments.js | 6 +- .../exercise/Studentshavecompletedthelist.js | 96 +++++++++++++++++-- .../shixunHomework/Listofworksstudentone.js | 8 +- .../src/modules/user/account/AccountImg.js | 17 +++- 4 files changed, 110 insertions(+), 17 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js index 31fd4b9e6..7305591df 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js @@ -14,9 +14,9 @@ function CommonWorkAppraiseReviseAttachments(props) { } `}
- 补交附件 + 补交内容
- + {/* {age} */}
@@ -47,6 +47,6 @@ function CommonWorkAppraiseReviseAttachments(props) {
} ) - + } export default CommonWorkAppraiseReviseAttachments; \ No newline at end of file diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index ec59c46e3..070ceeed2 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -295,10 +295,10 @@ class Studentshavecompletedthelist extends Component { ) }, { - title:最终成绩 + title:最终成绩 鼠标停留具体分值上可查
看得分明细
- }>, + }>, dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', @@ -340,6 +340,22 @@ class Studentshavecompletedthelist extends Component { }}>{record.efficiencyscore} : + + +
{record.objective_score===undefined?"":record.objective_score === "--" ? 客观题得分：0分 : + 客观题得分：{record.objective_score}分} +
+ +
{record.subjective_score===undefined?"":record.subjective_score === "--" ? 主观题得分：0分 : + 主观题得分：{record.subjective_score}分} +
+ +
{record.efficiencyscore === "--" ? 最终成绩：0分 : + 最终成绩：{record.efficiencyscore}分} +
+
+ + }> 90 ? { color: '#DD1717', textAlign: "center" @@ -353,6 +369,7 @@ class Studentshavecompletedthelist extends Component { color: '#747A7F', textAlign: "center" }}>{record.efficiencyscore} + } ) @@ -590,10 +607,10 @@ class Studentshavecompletedthelist extends Component { ) }, { - title:最终成绩 + title:最终成绩 鼠标停留具体分值上可查
看得分明细
- }>, + }>, dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', @@ -637,6 +654,22 @@ class Studentshavecompletedthelist extends Component { }}>{record.efficiencyscore} : + + +
{record.objective_score===undefined?"":record.objective_score === "--" ? 客观题得分：0分 : + 客观题得分：{record.objective_score}分} +
+ +
{record.subjective_score===undefined?"":record.subjective_score === "--" ? 主观题得分：0分 : + 主观题得分：{record.subjective_score}分} +
+ +
{record.efficiencyscore === "--" ? 最终成绩：0分 : + 最终成绩：{record.efficiencyscore}分} +
+
+ + }> 90 ? { color: '#DD1717', textAlign: "center", @@ -654,6 +687,7 @@ class Studentshavecompletedthelist extends Component { textAlign: "center", width:"199px" }}>{record.efficiencyscore} + } @@ -877,10 +911,10 @@ class Studentshavecompletedthelist extends Component { ) }, { - title: 最终成绩 + title: 最终成绩 鼠标停留具体分值上可查
看得分明细
- }>, + }>, dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', @@ -918,6 +952,22 @@ class Studentshavecompletedthelist extends Component { }}>{record.efficiencyscore} : + + +
{record.objective_score===undefined?"":record.objective_score === "--" ? 客观题得分：0分 : + 客观题得分：{record.objective_score}分} +
+ +
{record.subjective_score===undefined?"":record.subjective_score === "--" ? 主观题得分：0分 : + 主观题得分：{record.subjective_score}分} +
+ +
{record.efficiencyscore === "--" ? 最终成绩：0分 : + 最终成绩：{record.efficiencyscore}分} +
+ + + }> 90 ? { color: '#DD1717', textAlign: "center", @@ -931,6 +981,7 @@ class Studentshavecompletedthelist extends Component { color: '#747A7F', textAlign: "center", }}>{record.efficiencyscore} + } ) @@ -1104,10 +1155,10 @@ class Studentshavecompletedthelist extends Component { ) }, { - title: 最终成绩 + title: 最终成绩 鼠标停留具体分值上可查
看得分明细
- }>, + }>, dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', @@ -1144,6 +1195,22 @@ class Studentshavecompletedthelist extends Component { }}>{record.efficiencyscore} : + + +
{record.objective_score===undefined?"":record.objective_score === "--" ? 客观题得分：0分 : + 客观题得分：{record.objective_score}分} +
+ +
{record.subjective_score===undefined?"":record.subjective_score === "--" ? 主观题得分：0分 : + 主观题得分：{record.subjective_score}分} +
+ +
{record.efficiencyscore === "--" ? 最终成绩：0分 : + 最终成绩：{record.efficiencyscore}分} +
+ + + }> 90 ? { color: '#DD1717', textAlign: "center", @@ -1157,6 +1224,7 @@ class Studentshavecompletedthelist extends Component { color: '#747A7F', textAlign: "center", }}>{record.efficiencyscore} + } ) @@ -1511,6 +1579,8 @@ class Studentshavecompletedthelist extends Component { completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, + objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, + subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, operating: "评阅", commit_method:exercise_users[i].commit_method, }) @@ -1527,6 +1597,8 @@ class Studentshavecompletedthelist extends Component { completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, + objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, + subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, operating: "--", commit_method:exercise_users[i].commit_method }) @@ -1552,6 +1624,8 @@ class Studentshavecompletedthelist extends Component { submitstate: current_answer_user.commit_status === 1 ? "已提交" : "未提交", updatetime: moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm'), efficiencyscore: current_answer_user.score === undefined ? "--" : current_answer_user.score === null ? "--" : current_answer_user.score === "" ? "--" : current_answer_user.score, + objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, + subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, review_status: current_answer_user.review_status, completion: current_answer_user.objective_score === undefined ? "--" : current_answer_user.objective_score === null ? "--" : current_answer_user.objective_score === "" ? "--" : current_answer_user.objective_score, levelscore: current_answer_user.subjective_score === undefined ? "--" : current_answer_user.subjective_score === null ? "--" : current_answer_user.subjective_score === "" ? "--" : current_answer_user.subjective_score, @@ -1594,6 +1668,8 @@ class Studentshavecompletedthelist extends Component { completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, + objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, + subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, operating: "查看", commit_method:exercise_users[i].commit_method, }) @@ -1739,6 +1815,8 @@ class Studentshavecompletedthelist extends Component { completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, + objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, + subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, finalscore: "评阅", user_id: exercise_users[i].user_id, commit_method:exercise_users[i].commit_method @@ -1756,6 +1834,8 @@ class Studentshavecompletedthelist extends Component { completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, + objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, + subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, finalscore: "--", user_id: exercise_users[i].user_id, commit_method:exercise_users[i].commit_method diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 3bd67f6c6..cd8061906 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1204,10 +1204,10 @@ class Listofworksstudentone extends Component { ) }, { - title: 当前成绩 + title: 当前成绩 鼠标停留具体分值上可查
看得分明细
- }>, + }>, dataIndex: 'work_score', key: 'work_score', align: 'center', @@ -1572,10 +1572,10 @@ class Listofworksstudentone extends Component { ) }, { - title: 当前成绩 + title: 当前成绩 鼠标停留具体分值上可查
看得分明细
- }>, + }>, dataIndex: 'work_score', key: 'work_score', align: 'center', diff --git a/public/react/src/modules/user/account/AccountImg.js b/public/react/src/modules/user/account/AccountImg.js index 3202c2bf7..bc95e4259 100644 --- a/public/react/src/modules/user/account/AccountImg.js +++ b/public/react/src/modules/user/account/AccountImg.js @@ -13,6 +13,7 @@ class AccountImg extends Component { - 头像 -

修改头像

+ 头像 +
修改头像
); } From e6ba3fe70ef1faed71bb8e5dcf47e9087aa300c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 16 Mar 2020 21:33:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E3=80=81=E5=88=86=E7=BB=84=E3=80=81=E6=99=AE=E9=80=9A=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/busyWork/PublishRightnow.js | 13 ++++++++++--- .../courses/coursesPublic/OneSelfOrderModal.js | 2 +- .../modules/courses/poll/PollDetailTabForthRules.js | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/PublishRightnow.js b/public/react/src/modules/courses/busyWork/PublishRightnow.js index 95d71cb16..54e87a4c5 100644 --- a/public/react/src/modules/courses/busyWork/PublishRightnow.js +++ b/public/react/src/modules/courses/busyWork/PublishRightnow.js @@ -25,7 +25,9 @@ class PublishRightnow extends Component{ Cancel:undefined, Saves:undefined, Topvalright:undefined, - modallate_time:undefined + modallate_time:undefined, + immediatelyopen:false, + starttimeslate_time:undefined } } open = (usingCheckBeforePost) => { @@ -71,7 +73,8 @@ class PublishRightnow extends Component{ Cancel:this.homeworkhide, Saves:this.homeworkstartend, typs:showdatatypes ? "start" : "end", - modallate_time:showdatatypes?response.data.late_time:undefined, + immediatelyopen:true, + modallate_time:showdatatypes?this.state.starttimeslate_time:undefined, }) } homeworkhide=()=>{ @@ -94,7 +97,8 @@ class PublishRightnow extends Component{ addname:undefined, addnametype:false, addnametab:undefined, - modallate_time:undefined + modallate_time:undefined, + immediatelyopen:false }) } @@ -190,6 +194,7 @@ class PublishRightnow extends Component{ this.setState({ course_groups: response.data.course_groups, starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time, + starttimeslate_time:response.data.late_time===undefined||response.data.late_time===null||response.data.late_time===""?undefined:response.data.late_time, }) }) .catch(function (error) { @@ -263,6 +268,8 @@ class PublishRightnow extends Component{ starttimes={this.state.starttimes} starttimesend={this.state.starttimesend} typs={this.state.typs} + immediatelyopen={this.state.immediatelyopen} + modallate_time={this.state.starttimeslate_time} />:""} { showActionButton && { showdatatypes ? "立即发布" : "立即截止" } } diff --git a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js index 60f2df553..6776cea0f 100644 --- a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js +++ b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js @@ -205,7 +205,7 @@ class OneSelfOrderModal extends Component{ } propsSaves=(ds,endtime)=>{ - debugger + this.setState({ endtimetype:false }) diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js index 707c757fd..5e912524c 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js +++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js @@ -353,7 +353,7 @@ class PollDetailTabForthRules extends Component{ render(){ let {rules,course_group,flagPageEdit}=this.state let isAdmin=this.props.isAdmin(); - console.log(flagPageEdit) + // console.log(flagPageEdit) return(

From 257b7e35e9cc8e120ec120fb07dde432dd97daaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 16 Mar 2020 21:33:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/coursesPublic/OneSelfOrderModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js index 6776cea0f..c51b9a813 100644 --- a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js +++ b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js @@ -205,7 +205,7 @@ class OneSelfOrderModal extends Component{ } propsSaves=(ds,endtime)=>{ - + this.setState({ endtimetype:false })