迟交扣分:
@@ -1146,7 +1149,7 @@ class CommonWorkSetting extends Component{
结束时间:
-
+
- 禁止补交
+ 禁止补交
@@ -1194,7 +1197,7 @@ class CommonWorkSetting extends Component{
开启时间:
-
+
*/}
-
+
结束时间:
{/*
*/}
-
+
}
-
+ {!!comment_scores.length &&
+
}
)
}
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() ?
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 {
}