From 28511ff80c4e90d12f12996d284c1c7c44d100dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 20 Jul 2019 23:18:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/busyWork/CommonWorkPost.js | 2 +- .../src/modules/courses/busyWork/UseBank.js | 2 +- .../modules/courses/coursesPublic/ShixunModal.js | 16 ++++++++++------ .../courses/exercise/Ecerciseallbackagain.js | 1 + .../exercise/Exercisestatisticalresult.js | 1 + .../exercise/Studentshavecompletedthelist.js | 4 ++++ .../graduation/tasks/GraduationTasksSubmitnew.js | 2 +- .../tasks/GraduationTaskssettinglist.js | 10 +++++----- public/react/src/modules/courses/poll/PollNew.js | 2 +- .../courses/shixunHomework/Listofworks.js | 2 ++ .../shixunHomework/Listofworksstudentone.js | 2 ++ .../courses/shixunHomework/ShixunStudentWork.js | 2 +- .../src/modules/paths/PathDetail/sendPanel.js | 2 +- 13 files changed, 31 insertions(+), 17 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index ae51d04a0..4c5578d2c 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -650,7 +650,7 @@ render(){ width: '375px', height: '30px' }}> -
{item.user_name}
diff --git a/public/react/src/modules/courses/busyWork/UseBank.js b/public/react/src/modules/courses/busyWork/UseBank.js index 4cd1b424e..671a09fff 100644 --- a/public/react/src/modules/courses/busyWork/UseBank.js +++ b/public/react/src/modules/courses/busyWork/UseBank.js @@ -278,7 +278,7 @@ class UseBank extends Component{ */ return (

- + diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js index 1fc218908..afba47723 100644 --- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js +++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js @@ -80,7 +80,7 @@ class ShixunModal extends Component{ //勾选实训 shixunhomeworkedit=(list)=>{ - +debugger let newpatheditarry=[]; if (this.props.singleChoose == true) { if (list.length > 0) { @@ -99,6 +99,7 @@ class ShixunModal extends Component{ } contentViewScrolledit=(e)=>{ + //滑动到底判断 if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ let {Searchvalue,type,page}=this.state; @@ -122,9 +123,9 @@ class ShixunModal extends Component{ this.setState({ page:1, }) - + this.props.funpatheditarry([]) this.setupdatalist(value,type,true,1) - this.props.funpatheditarry([]) + } //tag @@ -135,9 +136,9 @@ class ShixunModal extends Component{ page:1, newshixunmodallist:undefined }) - + this.props.funpatheditarry([]) this.setupdatalist(Searchvalue,types,true,1) - this.props.funpatheditarry([]) + } @@ -353,11 +354,14 @@ class ShixunModal extends Component{ { newshixunmodallist === undefined ? "": newshixunmodallist.map((item,key)=>{ + console.log(item) return(

  • diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js index b5e7ab820..f6389613b 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js @@ -122,6 +122,7 @@ class Exercisestatisticalresult extends Component { return ( {item.exercise_group_name} ({item.exercise_group_students}) diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 5cd59f704..6f4cec877 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -2404,6 +2404,7 @@ class Studentshavecompletedthelist extends Component { course_groupyslstwodata.map((item, key) => { return ( {item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users}) ) }) @@ -2435,6 +2436,7 @@ class Studentshavecompletedthelist extends Component { course_groupyslstwodatas.map((item, key) => { return ( {item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unreview_counts : Teacherliststudentlist.exercise_types.review_counts}) ) }) @@ -2464,6 +2466,7 @@ class Studentshavecompletedthelist extends Component { course_groupyslstwodata.map((item, key) => { return ( {item.tu}({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users}) ) }) @@ -2492,6 +2495,7 @@ class Studentshavecompletedthelist extends Component { course_groups.map((item, key) => { return ( {item.exercise_group_name}({item.exercise_group_students}) ) }) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index ee0e98f16..355a514a4 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -737,7 +737,7 @@ render(){ width: '375px', height: '30px' }}> - { return parseInt(task_status[key])===item.user_id?true:false }) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index a5b6ccaa6..4aa01d44e 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -1188,7 +1188,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{ return( - {item.name} + {item.name} ({item.count}) @@ -1211,7 +1211,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{ return( - {item.group_group_name} + {item.group_group_name} ({item.count}) @@ -1423,7 +1423,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.map((item,key)=>{ return( - {item.name} + {item.name} ({item.count}) @@ -1456,7 +1456,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{ return( - {item.name} + {item.name} ({item.count}) @@ -1479,7 +1479,7 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{ return( - {item.group_group_name} + {item.group_group_name} ({item.count}) diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index e6dc94515..675e355f3 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -2596,7 +2596,7 @@ class PollNew extends Component { {item.question.answers === undefined ? "" : item.question.answers.map((items, i) => { return (
    - + {items.answer_text}
    ) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 070aee271..e289918e1 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -810,6 +810,7 @@ class Listofworks extends Component { return ( {item.name} ({item.count}) @@ -841,6 +842,7 @@ class Listofworks extends Component { return ( {item.group_group_name} ({item.count}) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index a774d6684..51af9e57e 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2451,6 +2451,7 @@ class Listofworksstudentone extends Component { return ( {item.name} ({item.count}) @@ -2482,6 +2483,7 @@ class Listofworksstudentone extends Component { return ( {item.group_group_name} ({item.count}) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index cf9374f08..fa549d403 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -780,7 +780,7 @@ class ShixunStudentWork extends Component { {data&&data.group_info === undefined ? "" : data&&data.group_info.map((item, key) => { return ( - + {item.name}({item.members_count}) diff --git a/public/react/src/modules/paths/PathDetail/sendPanel.js b/public/react/src/modules/paths/PathDetail/sendPanel.js index edbe083b1..8aedc2770 100644 --- a/public/react/src/modules/paths/PathDetail/sendPanel.js +++ b/public/react/src/modules/paths/PathDetail/sendPanel.js @@ -181,7 +181,7 @@ class sendPanel extends Component{ item.shixuns.map((items,keys)=>{ return(
    - {items.shixun_name} + {items.shixun_name}
    ) })