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 2f3621844..ac0417f39 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js +++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js @@ -48,6 +48,7 @@ class PollDetailTabForthRules extends Component{ selectedCourse:[], flagPageEdit:this.props.flagPageEdit } + } 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..2553300ab 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, @@ -1322,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) }); @@ -1340,10 +1347,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 +1374,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) }); @@ -1458,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}

0){ 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,38 @@ 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() { @@ -1656,7 +1715,7 @@ class Trainingjobsetting extends Component {
-

+

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

@@ -1698,10 +1757,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 +2081,7 @@ class Trainingjobsetting extends Component { 提交 {/*提交*/} - 取消 + this.cancelEdit()}>取消
    : "" } 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}

    { //提交按钮 - debugger if (this.state.user_phone_binded === false) { if (this.state.Phonenumberisnotcobool === false) { diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js index 2ef1d5e19..016a32eb5 100644 --- a/public/react/src/modules/user/account/AccountBasicEdit.js +++ b/public/react/src/modules/user/account/AccountBasicEdit.js @@ -28,8 +28,8 @@ class AccountBasic extends Component { } } - componentDidUpdate =(prevState)=>{ - if(this.props.basicInfo && this.props.basicInfo != prevState.basicInfo){ + componentDidUpdate =(prevProps)=>{ + if(this.props.basicInfo && prevProps.basicInfo == undefined){ this.setValue(this.props.basicInfo); this.getSchoolList(this.props.basicInfo); }