diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 2a211007b..9989de401 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -104,7 +104,14 @@ class CommonWorkDetailIndex extends Component{
}
/// 确认是否下载
- confirmysl(url,params){
+ confirmysl(url,child){
+ let params = {}
+ if (isListModule) {
+ // TODO
+ if(child!=undefined) {
+ params = child._getRequestParams() !== undefined ? child._getRequestParams() : {};
+ }
+ }
axios.get(url+ '&export=true',{
params
}).then((response) => {
@@ -131,7 +138,7 @@ class CommonWorkDetailIndex extends Component{
this.setState({ donwloading: true })
downloadFile({
url: url,
- params:params,
+ params,
successCallback: (url) => {
this.setState({ donwloading: false })
console.log('successCallback')
@@ -317,13 +324,13 @@ class CommonWorkDetailIndex extends Component{
this.confirmysl(exportResultUrl, exportParams)}
+ onClick={() => this.confirmysl(exportResultUrl,this.child)}
>导出成绩
this.confirmysl(exportUrl, exportParams)}
+ onClick={() => this.confirmysl(exportUrl,this.child)}
>导出作品附件
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index fcfea19c3..3f60710c1 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -1389,7 +1389,8 @@ class Studentshavecompletedthelist extends Component {
loadingstate: true,
})
}
-
+ console.log(response);
+ console.log(1393);
thiss.Generatenewdatasy(response.data.exercise_users, response);
}
}).catch((error) => {
@@ -1992,6 +1993,8 @@ class Studentshavecompletedthelist extends Component {
this.setState({
loadingstate: false,
})
+ console.log(response);
+ console.log(1997);
this.Generatenewdatasy(response.data.exercise_users, response);
}).catch((error) => {
console.log(error)
@@ -2306,13 +2309,13 @@ class Studentshavecompletedthelist extends Component {
};
_getRequestParams() {
- const { order, course_groups,searchtext, page ,limit} = this.state
+ const { order, checkedValuesineinfo,searchtext, page ,limit} = this.state
return {
page,
search:searchtext,
- order,
+ group_id:checkedValuesineinfo,
limit: limit,
- group_id:course_groups,
+ order,
}
}
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index ec7fc189c..243ab98f5 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -163,9 +163,15 @@ class Testpapersettinghomepage extends Component{
}
/// 确认是否下载
- confirmysl(url,params){
+ confirmysl(url,child){
+ let params ={}
+ if(child!=undefined){
+ params =child._getRequestParams()!==undefined?child._getRequestParams():{};
+ }
+ console.log("170");
+ console.log(params);
axios.get(url,{
- params
+ params
}).then((response) => {
if(response.data.status&&response.data.status===-1){
@@ -240,12 +246,7 @@ class Testpapersettinghomepage extends Component{
const isAdmin =this.props.isAdmin();
const isStudent = this.props.isStudent();
// TODO
- let params ={}
- if(this.child!=undefined){
- params =this.child._getRequestParams()!==undefined?this.child._getRequestParams():{};
- }
- // console.log("246");
- // console.log(this.child);
+
return(