Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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 ? 'nosources-source-map' : false,  //正式版
-	//devtool: shouldUseSourceMap ? '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: {

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 ?
                                 <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</span>
-                                :
+                                :""
-                                <a
-                                    onClick={this.showfiles}
-                                    // href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
-                                    className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :""
                         }
 
 

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()?
                                 <span className="fl mt3 font-16 font-bd color-dark comnonwidth580" title={item.exercise_name}>{item.exercise_name}</span>
-                                :
+                                :""
-
-                                <a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name} href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
                         }
 
                         {

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?
                   <span className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span>
-                  :
+             :""
-                  <a href={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list"}
-										 title={discussMessage.name}
-                     className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
 
 

public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js

@@ -70,15 +70,17 @@ class GraduateTopicItem extends Component{
           `}</style>
             <h6>
               {
-                isNotMember && discussMessage.private_icon===true ?
+                isNotMember?
-                  <a className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:
+                  <a className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
-                  <a onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>
+
               }
               {
                 isStudent?<a onClick={() => this.toDetailPage(`${discussMessage.id}`)}
                              className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
-
+							{
+								isAdmin?<a onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+							}
               {
                discussMessage.private_icon===true?
                   <Tooltip  title={ this.props.isNotMember()===true?"私有属性，非课堂成员不能访问":"私有属性"}  placement="bottom">

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 {
 						</div>
 
 						<div className={"justify break_full_word new_li edu-back-white"} style={{minHeight: "480px"}}>
+
 							<style>{`
-              	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
+							.ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
-																			top: 72%;}
+													top: 72%;}
-						                }
+								}
-						              `}</style>
+							`}</style>
 							{datalist === undefined ? "" : <Table
 								dataSource={datalist}
 								columns={columns}
-								pagination={ datalist.length<11?false:{  //分页
+								pagination={false}
-									total: datalist.length===0?0:data&&data.all_reviews_count, //数据总数量
-									pageSize: 10,  //显示几条一页
-									current:page,
-								}}
-
-								onChange={this.TablePagination}
 							/>}
-						</div>
 
+						</div>
 					</div>:""}
+				</div>
+
+						{
+							datalist === undefined ? "":datalist.length<11?
+								<div className="edu-txt-center mt30 mb20">
+									<Pagination showQuickJumper current={page}
+															onChange={this.TablePagination} pageSize={10}
+															total={datalist.length===0?0:data&&data.copy_reviews_count}></Pagination>
+								</div>
+								: ""
+						}
 
-				</div></div>
+				</div>
-
-
-
 
 			</div>
 

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?
                   <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
-                  :
+                 :""
-                  <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
-                     className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }