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: {
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/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?
+
+ : ""
+ }
-
-
-
-
+
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}:""
+ :""
}