From bd56fb15fd8029243e8c2dca286320095f7a585e Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 4 Jul 2019 17:32:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=B7=E8=BE=93=E5=85=A5=E4=BD=9C?= =?UTF-8?q?=E5=93=81=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/busyWork/CommonWorkPost.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index 3f65faafa..2e882e819 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -664,7 +664,7 @@ render(){ > {getFieldDecorator('description', { rules: [{ - required: true, message: '请输入帖子内容', + required: true, message: '请输入作品内容', }, { max: 5000, message: '最大限制为5000个字符', }], From cb96cd2b420366558e864a77dcb48e081897054a 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, 4 Jul 2019 17:54:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/FindPasswordComponent.js | 2 +- public/react/src/modules/user/LoginRegisterComponent.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js index 2fe5df943..2fed8f3a8 100644 --- a/public/react/src/modules/user/FindPasswordComponent.js +++ b/public/react/src/modules/user/FindPasswordComponent.js @@ -402,7 +402,7 @@ class LoginRegisterComponent extends Component { :
} diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index 12afd7831..c909eb8c1 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -713,7 +713,7 @@ class LoginRegisterComponent extends Component { } From 01ee77ab6f947e53b6fb16bf90d10151064e4dd4 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 4 Jul 2019 18:07:49 +0800 Subject: [PATCH 3/5] fetchMoment --- .../courses/busyWork/CommonWorkSetting.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js index 72987d2ca..56eabb375 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js @@ -49,6 +49,8 @@ class CommonWorkSetting extends Component{ super(props) this.publishModal = React.createRef(); this.endModal = React.createRef(); + this.fetchMoment = moment() + this.state={ unified_setting: true, rules: [], @@ -123,6 +125,7 @@ class CommonWorkSetting extends Component{ } else if (result.data.publish_time && moment(result.data.publish_time) < moment()) { disable_unified_setting = true } + this.fetchMoment = moment() this.setState({ // starttimetype:starttype, // endtimetype:endtype, @@ -1042,7 +1045,7 @@ class CommonWorkSetting extends Component{ {/* */} - + 截止时间： {/* */} - + - 允许补交 + 允许补交
迟交扣分： @@ -1146,7 +1149,7 @@ class CommonWorkSetting extends Component{
结束时间： - + - 禁止补交 + 禁止补交 @@ -1194,7 +1197,7 @@ class CommonWorkSetting extends Component{
开启时间： - + */} - + 结束时间： {/* */} - + Date: Thu, 4 Jul 2019 18:09:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworks.js | 58 +++++++++---------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index a720cffd4..b86bcfce5 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1336,48 +1336,42 @@ class Listofworks extends Component { } // 导出实习报告批量 - internshipreport = ()=>{ + internshipreport = (url)=>{ console.log("internshipreport"); - let url = "/zip/shixun_report"; - let homeworkid = this.props.match.params.homeworkid; - axios.get((url),{ - params: { - homework_common_id: homeworkid, - work_status: this.state.course_groupyslstwo, - course_group: this.state.checkedValuesineinfo, - search: this.state.searchtext, - } - },{responseType: 'blob'}).then((response) => { - console.log("1342"); - console.log(response); + // params: { + // homework_common_id: homeworkid, + // work_status: this.state.course_groupyslstwo, + // course_group: this.state.checkedValuesineinfo, + // search: this.state.searchtext, + // } + // let url = "/zip/shixun_report"; + // let homeworkid = this.props.match.params.homeworkid; + axios.get(url).then((response) => { if(response.status === 200){ window.open(url, '_blank'); - }else{ } - }).catch((error) => { + }).catch((error) => { console.log(error) }); } // 课堂学生成绩的导出下载 - Classstudentachievement=()=>{ + Classstudentachievement=(url)=>{ console.log("Classstudentachievement"); - const course_id = this.props.match.params.coursesId; - let url = "/courses/"+course_id+"/export_member_scores_excel.xlsx"; - axios.get((url),{ - params: { - group_id: this.state.checkedValuesineinfo, - search: this.state.searchtext, - } - },{responseType: 'blob'}).then((response) => { - console.log("1306"); - console.log(response); - if(response.status === 200){ - window.open(url, '_blank'); - }else{ + // const course_id = this.props.match.params.coursesId; + // let url = "/courses/"+course_id+"/export_member_scores_excel.xlsx"; + // ,{ + // params: { + // group_id: this.state.checkedValuesineinfo, + // search: this.state.searchtext, + // } + // },{responseType: 'blob'}) + axios.get(url).then((response) => { + if(response.status === 200){ + window.open(url, '_blank'); - } + } }).catch((error) => { console.log(error) }); @@ -1531,8 +1525,8 @@ class Listofworks extends Component { {this.props.isAdmin()?
  • 导出
    • :""} {this.props.isAdmin() ? From 2eebc8ebe12edaf39272f3dede2992e435b4b071 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 4 Jul 2019 18:11:41 +0800 Subject: [PATCH 5/5] length --- .../graduation/tasks/GraduationTasksappraiseReplyChild.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js index 56f633d2a..27739b611 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js @@ -81,7 +81,7 @@ class GraduationTasksappraiseReplyChild extends Component{ > }
    -
    + {!!comment_scores.length &&
    -
    +
    } ) }