From 0ed99a5645bac9974a4e7f1d462969cfb90603ce 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 14:23:02 +0800 Subject: [PATCH 1/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/poll/PollDetailTabForthRules.js | 2 + .../courses/shixunHomework/Listofworks.js | 35 +++-- .../shixunHomework/Trainingjobsetting.js | 135 ++++++++++++++---- 3 files changed, 138 insertions(+), 34 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js index 2f3621844..cb24ebc8d 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js +++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js @@ -48,6 +48,8 @@ class PollDetailTabForthRules extends Component{ selectedCourse:[], flagPageEdit:this.props.flagPageEdit } + console.log("PollDetailTabForthRules"); + console.log(props); } componentDidUpdate(prevProps) { if (JSON.stringify(this.props.rules) != JSON.stringify(prevProps.rules) ) { diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index e7b85b19d..438a7f152 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -67,6 +67,7 @@ class Listofworks extends Component { order: "update_time", b_order:"desc", search: null, + allow_late:false, task_status: [], course_group_info: [], teacherdata: undefined, @@ -220,7 +221,7 @@ class Listofworks extends Component { { record.efficiencyscore&& record.efficiencyscore=== "--"?( - record.submitstate==="按时提交"? + this.state.allow_late&&this.state.allow_late===false?
作业截止时，系统根据学生在课堂成员中的效率表现自动评分
}> @@ -229,7 +230,7 @@ class Listofworks extends Component { : - record.submitstate==="延时提交"? + this.state.allow_late&&this.state.allow_late===true?
补交结束时，系统根据学生在课堂成员中的效率表现自动评分
}> @@ -472,7 +473,7 @@ class Listofworks extends Component { { record.efficiencyscore&& record.efficiencyscore=== "--"?( - record.submitstate==="按时提交"? + this.state.allow_late&&this.state.allow_late===false?
作业截止时，系统根据学生在课堂成员中的效率表现自动评分
}> @@ -481,7 +482,7 @@ class Listofworks extends Component { : - record.submitstate==="延时提交"? + this.state.allow_late&&this.state.allow_late===true?
补交结束时，系统根据学生在课堂成员中的效率表现自动评分
}> @@ -653,6 +654,7 @@ class Listofworks extends Component { this.setState({ teacherdata: result.data, task_status: result.data.task_status, + allow_late:result.data.allow_late, course_group_info: result.data.course_group_info, loadingstate: false, jobsettingsdata: result, @@ -713,6 +715,7 @@ class Listofworks extends Component { course_group_info: result.data.course_group_info, loadingstate: false, jobsettingsdata: result, + allow_late:result.data.allow_late, publish_immediately: result.data.publish_immediately, work_efficiency: result.data.work_efficiency, end_immediately: result.data.end_immediately, @@ -1340,10 +1343,18 @@ class Listofworks extends Component { course_group: this.state.checkedValuesineinfo, search: this.state.searchtext, } - }).then((response) => { + },{responseType: 'blob'}).then((response) => { console.log("1342"); console.log(response); - + var blob = new Blob([response.data]) + var downloadElement = document.createElement('a'); + var href = window.URL.createObjectURL(blob); //创建下载的链接 + downloadElement.href = href; + downloadElement.download = '实习报告.pdf'; //下载后文件名 + document.body.appendChild(downloadElement); + downloadElement.click(); //点击下载 + document.body.removeChild(downloadElement); //下载完成移除元素 + window.URL.revokeObjectURL(href); //释放掉blob对象 }).catch((error) => { console.log(error) }); @@ -1359,10 +1370,18 @@ class Listofworks extends Component { group_id: this.state.checkedValuesineinfo, search: this.state.searchtext, } - }).then((response) => { + },{responseType: 'blob'}).then((response) => { console.log("1306"); console.log(response); - + var blob = new Blob([response.data]) + var downloadElement = document.createElement('a'); + var href = window.URL.createObjectURL(blob); //创建下载的链接 + downloadElement.href = href; + downloadElement.download = '课堂学生成绩.xlsx'; //下载后文件名 + document.body.appendChild(downloadElement); + downloadElement.click(); //点击下载 + document.body.removeChild(downloadElement); //下载完成移除元素 + window.URL.revokeObjectURL(href); //释放掉blob对象 }).catch((error) => { console.log(error) }); diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 362e3dc40..84f2f72ba 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -162,28 +162,33 @@ class Trainingjobsetting extends Component { }) }else { for(var i=0;i0){ var Proportion=100; + var oushution=0; //获取占用分后的值 Proportion=Proportion-latedeductiontwos; + oushution=Proportion; var srorelength=0; //计算选中用户 for (var k=0;k{ + this.setState({ + modalsType: false, + modalsTopval: "", + loadtype: false, + }) + } //编辑 editSetting = () => { try { @@ -1540,7 +1566,8 @@ class Trainingjobsetting extends Component { handclass: undefined, unit_e_tip: "", }) - this.refs.targetElementTrainingjobsetting.scrollIntoView() + this.refs.targetElementTrainingjobsetting.scrollIntoView(); + this.getTrainingjobsetting(); } rulesCheckInfo=(rules)=>{ @@ -1580,6 +1607,37 @@ class Trainingjobsetting extends Component { showmodel:false }) } +// 导出实习报告批量 + internshipreport = () => { + console.log("internshipreport"); + var homeworkid = this.props.match.params.homeworkid; + let url = "/zip/shixun_report"; + axios.get((url),{ + params: { + homework_common_id: homeworkid, + } + }).then((response) => { + console.log("1593"); + console.log(response); + + }).catch((error) => { + console.log(error) + }); + } + + // 课堂学生成绩的导出下载 + Classstudentachievement = () => { + console.log("Classstudentachievement"); + const course_id = this.props.match.params.coursesId; + let url = "/courses/" + course_id + "/export_member_scores_excel.xlsx"; + axios.get(url).then((response) => { + console.log("1607"); + console.log(response); + + }).catch((error) => { + console.log(error) + }); + } render() { @@ -1698,10 +1756,35 @@ class Trainingjobsetting extends Component { {/**/} {/*查看实训报告*/} {/**/} - {this.props.isAdmin() ? 导出 : ""} + + {this.props.isAdmin() ?
  • + 导出 + +
    • : ""} {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true? 立即截止 : "": ""} {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.publish_immediately===true? @@ -1997,7 +2080,7 @@ class Trainingjobsetting extends Component { 提交 {/*提交*/} - 取消 + this.cancelEdit()}>取消 : "" } From 19cfbc2cc11601bba40259ca744135db59c2c6c3 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 14:24:21 +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 --- .../react/src/modules/courses/coursesPublic/AccessoryModal.js | 2 -- .../react/src/modules/courses/coursesPublic/SelectSetting.js | 1 - .../modules/courses/exercise/Studentshavecompletedthelist.js | 1 - public/react/src/modules/courses/members/teacherList.js | 1 - .../react/src/modules/courses/poll/PollDetailTabForthRules.js | 3 +-- .../src/modules/courses/shixunHomework/Trainingjobsetting.js | 1 + public/react/src/modules/login/Trialapplication.js | 1 - 7 files changed, 2 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js index 72512be43..5541a01a6 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js @@ -151,7 +151,6 @@ class AccessoryModal extends Component{ }).then((result)=>{ if(result.data.status===0){ - debugger this.props.Cancel() this.props.setupdate() @@ -199,7 +198,6 @@ class AccessoryModal extends Component{ }).then((result)=>{ if(result.data.status===0){ - debugger this.props.Cancel() this.props.setupdate() diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js index 4e84bae8c..08e01e28e 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js +++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js @@ -175,7 +175,6 @@ class Selectsetting extends Component{ } savecouseShixunModal=()=>{ - debugger let {fileList,is_public,unified_setting,description,datatime,course_groups}=this.state; let newfileList=[]; diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 09cfdf947..a3ee9ef1a 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -2192,7 +2192,6 @@ class Studentshavecompletedthelist extends Component { } funtaskstatustwo = (checkedValues, data) => { - debugger // console.log(checkedValues); if (JSON.stringify(checkedValues) === "[]") { // console.log(checkedValues); diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index c5422b96f..5f2459dd3 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -211,7 +211,6 @@ class studentsList extends Component{ } onCheckAllChange = (e, item, index) => { const that = this; - debugger; const checkAllArray = that.state.checkAllArray.slice(0) checkAllArray[index] = !checkAllArray[index] that.setState({checkAllArray}) diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js index cb24ebc8d..ac0417f39 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js +++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js @@ -48,8 +48,7 @@ class PollDetailTabForthRules extends Component{ selectedCourse:[], flagPageEdit:this.props.flagPageEdit } - console.log("PollDetailTabForthRules"); - console.log(props); + } componentDidUpdate(prevProps) { if (JSON.stringify(this.props.rules) != JSON.stringify(prevProps.rules) ) { diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 84f2f72ba..91cbec710 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1623,6 +1623,7 @@ class Trainingjobsetting extends Component { }).catch((error) => { console.log(error) }); + } // 课堂学生成绩的导出下载 diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js index cd3b72dad..89164da2b 100644 --- a/public/react/src/modules/login/Trialapplication.js +++ b/public/react/src/modules/login/Trialapplication.js @@ -227,7 +227,6 @@ class Trialapplication extends Component { postregistered = () => { //提交按钮 - debugger if (this.state.user_phone_binded === false) { if (this.state.Phonenumberisnotcobool === false) { From 1c4315697ffd68978d4174b5c03c09c46ccd9c5b 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 14:32:24 +0800 Subject: [PATCH 3/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 --- .../react/src/modules/courses/shixunHomework/Listofworks.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 438a7f152..a922172bc 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1325,6 +1325,10 @@ class Listofworks extends Component { axios.get(url).then((response) => { this.props.showNotification(`${response.data.message}`); + this.setState({ + loadingstate: true + }) + this.Startsorting(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit); }).catch((error) => { console.log(error) }); From a7e6972e76dee72616a34ce158656a56b8c8036f 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 14:55:26 +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 --- .../react/src/modules/courses/shixunHomework/Listofworks.js | 2 +- .../modules/courses/shixunHomework/Listofworksstudentone.js | 4 ++-- .../src/modules/courses/shixunHomework/ShixunStudentWork.js | 2 +- .../src/modules/courses/shixunHomework/Trainingjobsetting.js | 2 +- .../modules/courses/shixunHomework/Workquestionandanswer.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index a922172bc..2553300ab 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1481,7 +1481,7 @@ class Listofworks extends Component {

    -

    +

    {teacherdata === undefined ? "" : teacherdata.homework_name}

    -

    +

    {teacherdata === undefined ? "" : teacherdata.homework_name}

    -

    +

    {jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}

    -

    +

    {data&&data.homework_name}

    -

    +

    {jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}

    diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js index c342227c6..28560d4fe 100644 --- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js +++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js @@ -412,7 +412,7 @@ class Workquestionandanswer extends Component {

    -

    +

    {jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}

    Date: Thu, 4 Jul 2019 15:12:05 +0800 Subject: [PATCH 5/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 --- .../shixunHomework/ShixunStudentWork.js | 7 ++- .../shixunHomework/ShixunhomeWorkItem.js | 2 +- .../Shixunworkdetails/ShixunWorkModal.js | 57 ++++++++++--------- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index 7188c65bd..30d5830d2 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -659,7 +659,7 @@ class ShixunStudentWork extends Component { {data&&data?
    -
      +
      • 查重时间：{data&&data.last_review_time} @@ -715,7 +715,7 @@ class ShixunStudentWork extends Component {
      -
      +
      @@ -755,11 +755,12 @@ class ShixunStudentWork extends Component { {datalist === undefined ? "" : } diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index 5731c3b73..d6c96182b 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -358,7 +358,7 @@ class ShixunhomeWorkItem extends Component{ ` } - {this.props.isAdmin?
      + {this.props.isAdmin?
      实训详情 {this.props.isAdminOrTeacher()?this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名:""} 设置 diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js index 5a4ad673c..173346c81 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js @@ -31,7 +31,9 @@ class ShixunWorkModal extends Component{ response.data.group_list.map((item,key)=>{ newgroup_list.push(item) }) - if( response.data.ungroup_list!== undefined || response.data.ungroup_list !== null){ + if(response.data.ungroup_list===undefined){ + + }else{ newgroup_list.push(response.data.ungroup_list) } this.setState({ @@ -255,31 +257,10 @@ class ShixunWorkModal extends Component{ { - group_list===undefined?course_groups.ungroup_list.work_count===0?"": - -
      -
    • - - - -
      • -
    • - {course_groups.ungroup_list.work_count} -
      • -
    • - {course_groups.ungroup_list.last_review_time} -
      • -
      - - : - group_list&&group_list.length===0?"":group_list[0]===undefined?"":group_list.map((item,key)=>{ + group_list===undefined?"": + group_list&&group_list.length===0?"":group_list.map((item,key)=>{ return( - item.work_count===0?"":
      +
    • +//
    • +// +// +// +//
      • +//
    • +// {course_groups.ungroup_list.work_count} +//
      • +//
    • +// {course_groups.ungroup_list.last_review_time} +//
      • +//
      +// +// : \ No newline at end of file