From d778481f9d9ab3d1e414020c6df5381aa83c5e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 12 Aug 2019 22:05:22 +0800 Subject: [PATCH 1/3] =?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/boards/TopicDetail.css | 25 +++--- .../src/modules/courses/boards/TopicDetail.js | 2 +- .../Shixunworkdetails/ShixunCustomsPass.js | 77 ++++++++++--------- 3 files changed, 55 insertions(+), 49 deletions(-) diff --git a/public/react/src/modules/courses/boards/TopicDetail.css b/public/react/src/modules/courses/boards/TopicDetail.css index de3aeb69b..7500268bf 100644 --- a/public/react/src/modules/courses/boards/TopicDetail.css +++ b/public/react/src/modules/courses/boards/TopicDetail.css @@ -1,12 +1,15 @@ -.edu-class-container { - width: 1200px; - margin: 10px auto 20px; -} -#forum_index_list { - margin-top: 90px; - margin-bottom: 320px; -} - -.uploadBtn { - margin-left: 0px; +.edu-class-container { + width: 1200px; + margin: 10px auto 20px; +} +#forum_index_list { + margin-top: 90px; + margin-bottom: 320px; +} +#yslforum_index_list { + margin-top: 20px; + margin-bottom: 320px; +} +.uploadBtn { + margin-left: 0px; } \ No newline at end of file diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js index d60c34461..7d0e6d37d 100644 --- a/public/react/src/modules/courses/boards/TopicDetail.js +++ b/public/react/src/modules/courses/boards/TopicDetail.js @@ -526,7 +526,7 @@ class TopicDetail extends Component { const courseId=this.props.match.params.coursesId; const boardId = this.props.match.params.boardId return ( -
{/* fl with100 */} +
{/* fl with100 */} { data&&data.challenge_list.map((item,key)=>{ + console.log("203challenge_list下面的数据"); + console.log(item); + console.log(JSON.stringify(item)); return(
@@ -213,46 +216,46 @@ class ShixunCustomsPass extends Component { {item.subject} - 代码文件：{item.code_list[0].path} + 代码文件：{item.code_list.length===0?"无":item.code_list[0].path===undefined?"无":item.code_list[0].path}

- {item.code_list.map((ite,k)=>{ + {item.code_list.length===0?"":item.code_list.map((ite,k)=>{ return( -
-
-

- - {item.username} - 的代码文件 - - - {item.copy_username} - 的代码文件 - -

- -
-
  • - -
    • -
    -
    -
    +
    +
    +

    + + {item.username} + 的代码文件 + + + {item.copy_username} + 的代码文件 + +

    + +
    +
  • + +
    • +
    +
    +
    ) })}
    @@ -267,4 +270,4 @@ class ShixunCustomsPass extends Component { } } -export default ShixunCustomsPass; \ No newline at end of file +export default ShixunCustomsPass; From 885e6e1b334fc7365956e642a3a23cbaa198a7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 12 Aug 2019 22:52:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/ShixunWorkDetails.js | 6 +++--- .../shixunHomework/Shixunworkdetails/ShixunCustomsPass.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js index 508fc285e..d37aea5a7 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js @@ -71,13 +71,13 @@ class ShixunWorkDetails extends Component {

    this.goback(1)} + href={`/courses/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}`} > - {data&&data.course_name}123 + {data&&data.course_name} > 实训作业 diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js index 3fc2d516a..8ffa8a1dd 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js @@ -200,9 +200,9 @@ class ShixunCustomsPass extends Component { { data&&data.challenge_list.map((item,key)=>{ - console.log("203challenge_list下面的数据"); - console.log(item); - console.log(JSON.stringify(item)); + // console.log("203challenge_list下面的数据"); + // console.log(item); + // console.log(JSON.stringify(item)); return(

    From ca3edc22db6177574fb22eae469cbd8376149552 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 13 Aug 2019 09:18:17 +0800 Subject: [PATCH 3/3] d --- public/react/src/modules/courses/busyWork/CommonWorkPost.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index 60383988b..7f4020590 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -278,7 +278,7 @@ class CommonWorkPost extends Component{ } // 附件相关 START handleChange = (info) => { - if (info.file.status === 'uploading') { + if (info.file.status === 'uploading' || info.file.status === 'done') { let fileList = info.fileList; this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });