From d9ed04f79922a0688779d09142d01c2b98a7d447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 5 Jul 2019 17:01:37 +0800 Subject: [PATCH 1/4] b --- public/react/config/webpack.config.prod.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js index 0d5ef2747..0abd707af 100644 --- a/public/react/config/webpack.config.prod.js +++ b/public/react/config/webpack.config.prod.js @@ -58,8 +58,8 @@ module.exports = { bail: true, // We generate sourcemaps in production. This is slow but gives good results. // You can exclude the *.map files from the build during deployment. - devtool: shouldUseSourceMap ? 'nosources-source-map' : false, //正式版 - //devtool: shouldUseSourceMap ? 'source-map' : false,//测试版 + // devtool: shouldUseSourceMap ? 'nosources-source-map' : false, //正式版 + devtool: shouldUseSourceMap ? 'source-map' : false,//测试版 // In production, we only want to load the polyfills and the app code. entry: [require.resolve('./polyfills'), paths.appIndexJs], output: { From b99cc427810f1158397a299ae0b751025160951b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 5 Jul 2019 17:20:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/Resource/Fileslistitem.js | 8 ++------ .../src/modules/courses/exercise/ExerciseListItem.js | 6 ++---- .../courses/graduation/tasks/GraduateTaskItem.js | 7 ++----- .../courses/graduation/topics/GraduateTopicItem.js | 10 ++++++---- .../courses/shixunHomework/ShixunhomeWorkItem.js | 6 ++---- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index a2f57a8e1..404214dfc 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -215,13 +215,9 @@ class Fileslistitem extends Component{ } { - this.props.isNotMember ? discussMessage.is_lock === true ? + this.props.isNotMember ? {discussMessage.title} - : - {discussMessage.title} :"" + :"" } diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js index f11509fc8..8ffd16937 100644 --- a/public/react/src/modules/courses/exercise/ExerciseListItem.js +++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js @@ -107,11 +107,9 @@ class ExerciseListItem extends Component{ } { - this.props.isNotMember()? item.lock_status === 0 ? + this.props.isNotMember()? {item.exercise_name} - : - - {item.exercise_name}:"" + :"" } { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index f66874330..10ce65436 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -229,12 +229,9 @@ class GraduateTaskItem extends Component{ } { - this.props.isNotMember?this.props.discussMessage.private_icon===true? + this.props.isNotMember? {discussMessage.name} - : - {discussMessage.name}:"" + :"" } diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js index c5130d299..9f61e69d4 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js @@ -70,15 +70,17 @@ class GraduateTopicItem extends Component{ `}
{ - isNotMember && discussMessage.private_icon===true ? - {discussMessage.name}: - this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name} + isNotMember? + {discussMessage.name}:"" + } { isStudent? this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:"" } - + { + isAdmin? this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:"" + } { discussMessage.private_icon===true? diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index d6c96182b..06f22c87e 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -304,11 +304,9 @@ class ShixunhomeWorkItem extends Component{ } { - this.props.isNotMember?this.props.discussMessage.private_icon===true? + this.props.isNotMember? {discussMessage.name} - : - {discussMessage.name}:"" + : "" } From 05516fdff4d573862d26d14bc3a549e481df3415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 5 Jul 2019 17:23:27 +0800 Subject: [PATCH 3/4] =?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/shixunHomework/ShixunhomeWorkItem.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index d6c96182b..3a2366848 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -304,11 +304,9 @@ class ShixunhomeWorkItem extends Component{ } { - this.props.isNotMember?this.props.discussMessage.private_icon===true? + this.props.isNotMember? {discussMessage.name} - : - {discussMessage.name}:"" + :"" } From 9f16821756f13f29fde68aed51a5506f5d408672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 5 Jul 2019 17:38:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/ShixunStudentWork.js | 59 ++++++++++++------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index 3171349a0..109988fa9 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -21,7 +21,8 @@ import { DatePicker, Radio, Tooltip, - notification + notification, + Pagination } from "antd"; import {Link, Switch, Route, Redirect} from 'react-router-dom'; import axios from 'axios'; @@ -89,11 +90,22 @@ class ShixunStudentWork extends Component { }) } - getupdata=()=>{ + getupdata=(pages)=>{ + let {order,b_order,page,limit,group_infolist,search}=this.state; var homeworkid = this.props.match.params.homeworkid; let url = "/homework_commons/" + homeworkid + "/code_review_results.json"; - axios.get(url).then((response) => { + axios.get(url,{params:{ + order:order, + sort:b_order, + page:pages===undefined?page:pages, + limit:limit, + group_ids:group_infolist, + search:search + }, + paramsSerializer: function(params) { + return qs.stringify(params, {arrayFormat: 'brackets'}) + }}).then((response) => { if (response.data.status === undefined || response.data.status === 0) { if(response.data!=undefined){ if(response.data.status!=-2){ @@ -198,12 +210,12 @@ class ShixunStudentWork extends Component { } - TablePagination = (e) => { + TablePagination = (pages) => { this.setState({ - page:e.current + page:pages }) - + this.getupdata(pages) } inputSearchValue=(e)=>{ @@ -818,30 +830,33 @@ class ShixunStudentWork extends Component {
+ + .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot { + top: 72%;} + } + `} {datalist === undefined ? "" : } - + :""} + + + { + datalist === undefined ? "":datalist.length<11? +
+ +
+ : "" + } - - - - +