diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index c4b5d10b0..e2d6d1618 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -668,7 +668,7 @@ class Fileslists extends Component{
共 {total_count} 个资源
已发布:{public_count}个
- {this.props.isAdmin()||this.props.isStudent()?未发布:{private_count}个:""}
+ 未发布:{private_count}个
}
onPressEnter={this.onPressEnter}
diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index b9da3f2eb..31c293659 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -561,7 +561,7 @@ class ExerciseReviewAndAnswer extends Component{
{
exercise && exercise.exercise_description &&
- {exercise.exercise_description}
+ {exercise.exercise_description}
}
{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 76ff783d3..63865c577 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -35,6 +35,7 @@ class GraduationTasksSubmitedit extends Component{
attachments:undefined,
spinnings:false,
shixunsreplace:false,
+ limit:20
}
}
@@ -59,7 +60,7 @@ class GraduationTasksSubmitedit extends Component{
if(result.data.task_type===1){
}else{
- this.searchList("",1,10,result.data.task_id)
+ this.searchList("",1,20,result.data.task_id)
}
this.props.form.setFieldsValue({
@@ -222,15 +223,15 @@ class GraduationTasksSubmitedit extends Component{
let {search,workslist} = this.state;
- this.searchList(search,1,10,workslist.task_id)
+ this.searchList(search,1,20,workslist.task_id)
}
- searchList=(search,page,limit,id)=>{
+ searchList=(search,page,limit,id,types)=>{
+ let {memberslist}=this.state;
+ let newmemberslist=memberslist
this.setState({
- search:search,
- page:page,
- limit:10
+
})
let newid=id
if(newid===undefined){
@@ -245,9 +246,28 @@ class GraduationTasksSubmitedit extends Component{
}).then((result)=>{
if(result.status===200){
- this.setState({
- memberslist:result.data
- })
+ if(types===1){
+ if(result.data.members.length>0) {
+ result.data.members.map((item, key) => {
+ newmemberslist.push(item)
+ })
+ }
+ this.setState({
+ memberslist:newmemberslist,
+ search:search,
+ page:page,
+ limit:limit
+ })
+
+ }else{
+ this.setState({
+ memberslist:result.data.members,
+ search:search,
+ page:page,
+ limit:limit
+ })
+ }
+
}
}).catch((error)=>{
@@ -265,7 +285,7 @@ class GraduationTasksSubmitedit extends Component{
let newpage=page+2
- this.searchList(search,newpage,limit,workslist.task_id)
+ this.searchList(search,newpage,limit,workslist.task_id,1)
}
@@ -274,7 +294,7 @@ class GraduationTasksSubmitedit extends Component{
funtaskstatus=(checkedValues)=>{
let{memberslist,selectobjct}=this.state;
- let newlist =memberslist.members;
+ let newlist =memberslist;
let newcheckedValues=checkedValues;
let selects=[];
@@ -666,8 +686,8 @@ class GraduationTasksSubmitedit extends Component{
text-overflow:ellipsis;
white-space:nowrap
}
- .width87{
- width: 87px;
+ .width100{
+ width: 100px;
height: 24px;
}
img.edu-nodata-img {
@@ -675,22 +695,25 @@ class GraduationTasksSubmitedit extends Component{
margin: 50px 90px 20px;
display: block;
}
+ .autos{
+ overflow: auto;
+ }
`}
-
- {memberslist===undefined?"":memberslist.members.length===0?
+ {memberslist===undefined?"":memberslist.length===0?
未找到包含{search}的学生
-
:memberslist&&memberslist.members.map((item,key)=>{
+
:memberslist&&memberslist.map((item,key)=>{
return(
-
{item.user_name}
-
{item.group_name}
-
{item.student_id}
+
{item.user_name}
+
{item.group_name}
+
{item.student_id}
{item.commit_status===false?已提交 :""}
)
@@ -719,22 +742,30 @@ class GraduationTasksSubmitedit extends Component{
-
+
{selectmemberslist&&selectmemberslist.map((item,key)=>{
- return(
-
-
{item.user_name}
-
{item.group_name}
-
{item.student_id}
- {key>0?
this.delecttask_status(item.user_id)}>
:""}
-
- )
+ if(item.group_name!=undefined) {
+ return (
+
+
{item.user_name}
+
{item.group_name}
+
{item.student_id}
+ {key > 0 ?
+
this.delecttask_status(item.user_id)}>
+
: ""}
+
+ )
+ }
})}
+
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index a49d38212..87044ee61 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -32,7 +32,8 @@ class GraduationTasksSubmitnew extends Component{
selectobjct:undefined,
Loadtype:false,
spinnings:false,
- shixunsreplace:false
+ shixunsreplace:false,
+ limit:20
}
}
@@ -58,7 +59,7 @@ class GraduationTasksSubmitnew extends Component{
if(result.data.task_type===1){
}else{
- this.searchList("",1,10)
+ this.searchList("",1,20)
}
this.setState({
workslist:result.data,
@@ -219,25 +220,42 @@ class GraduationTasksSubmitnew extends Component{
}
- searchList=(search,page,limit)=>{
- this.setState({
- search:search,
- page:page,
- limit:10
- })
+ searchList=(search,page,limit,types)=>{
let id=this.props.match.params.task_Id;
+ let {memberslist}=this.state;
+ let newmemberslist=memberslist
let url="/graduation_tasks/"+id+"/graduation_works/search_member_list.json";
+
axios.post(url,{
search:search,
page:page,
- limit:limit
+ limit:15
}).then((result)=>{
if(result.status===200){
if(result.data.status!=403){
- this.setState({
- memberslist:result.data
- })
+ if(types===1){
+ if(result.data.members.length>0){
+ result.data.members.map((item,key)=>{
+ newmemberslist.push(item)
+ })
+ }
+ this.setState({
+ memberslist:newmemberslist,
+ search:search,
+ page:page,
+ limit:limit
+ })
+
+ }else{
+ this.setState({
+ memberslist:result.data.members,
+ search:search,
+ page:page,
+ limit:limit
+ })
+ }
+
}
}
@@ -256,7 +274,7 @@ class GraduationTasksSubmitnew extends Component{
let newpage=page+2
- this.searchList(search,newpage,limit)
+ this.searchList(search,newpage,limit,1)
}
@@ -265,7 +283,7 @@ class GraduationTasksSubmitnew extends Component{
funtaskstatus=(checkedValues)=>{
let{memberslist,selectobjct}=this.state;
- let newlist =memberslist.members;
+ let newlist =memberslist;
let newcheckedValues=checkedValues;
let selects=[];
selects.push(selectobjct)
@@ -318,7 +336,7 @@ class GraduationTasksSubmitnew extends Component{
let {search} = this.state;
- this.searchList(search,1,10)
+ this.searchList(search,1,20)
}
}
onSearchKeywordKeyUps= (e)=>{
@@ -648,8 +666,8 @@ render(){
text-overflow:ellipsis;
white-space:nowrap
}
- .width87{
- width: 87px;
+ .width100{
+ width: 100px;
height: 24px;
}
img.edu-nodata-img {
@@ -657,21 +675,25 @@ render(){
margin: 50px 90px 20px;
display: block;
}
+ .autos{
+ overflow: auto;
+ }
`}
-
- {memberslist===undefined?"":memberslist.members.length===0?
+ {memberslist===undefined?"":memberslist.length===0?
}/)
-
未找到包含{search}的学生
+ {/*
未找到包含{search}的学生
*/}
+
未找到该学生
-
:memberslist&&memberslist.members.map((item,key)=>{
+ :memberslist&&memberslist.map((item,key)=>{
return(
-
{item.user_name}
-
{item.group_name}
-
{item.student_id}
+
{item.user_name}
+
{item.group_name}
+
{item.student_id}
{item.commit_status===true?已提交 :""}
)
@@ -704,22 +726,25 @@ render(){
white-space:nowrap
}
`}
-
+
{selectmemberslist&&selectmemberslist.map((item,key)=>{
- return(
-
-
{item.user_name}
-
{item.group_name}
-
{item.student_id}
- {key>0?
this.delecttask_status(item.user_id)}>
:""}
-
-
- )
+ if(item.group_name!=undefined){
+ return(
+
+
{item.user_name}
+
{item.group_name}
+
{item.student_id}
+ {key>0?
this.delecttask_status(item.user_id)}>
:""}
+
+
+ )
+ }
+
})}
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index a41f65ccd..0170cac00 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -523,9 +523,7 @@ class Poll extends Component{
共{polls_counts && polls_counts.polls_total_counts}个问卷
已发布:{polls_counts && polls_counts.polls_published_counts}个
- {
- isAdmin && 未发布:{polls_counts && polls_counts.polls_unpublish_counts}个
- }
+ 未发布:{polls_counts && polls_counts.polls_unpublish_counts}个
{
- checkedValues.map((list,li)=>{
- if(item.id===list){
- if(item.works_count<2){
- this.props.showNotification(`有效作品数少于2个,无法查重`)
- types=true
- return
+ if(item!=undefined){
+ checkedValues.map((list,li)=>{
+ if(item.id===list){
+ if(item.works_count<2){
+ this.props.showNotification(`有效作品数少于2个,无法查重`)
+ types=true
+ return
+ }
}
- }
- })
-
+ })
+ }
})
if(types===false){