Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/services/private_messages/create_service.rb

@@ -30,6 +30,6 @@ class PrivateMessages::CreateService < ApplicationService
 
   def validate!
     raise Error, '内容不能为空' if content.blank?
-    raise Error, '内容太长' if content.size > 255
+    raise Error, '内容太长' if content.size > 500
   end
 end

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -1673,35 +1673,13 @@ class Listofworksstudentone extends Component {
 	}
 
 	componentDidCatch(error, info) {
-		// console.log("-----------------------------905错误信息");
+
-		// console.log(error);
+
-		// console.log(info);
+	}
-
+
-	}
+
-
-	// componentWillReceiveProps(nextProps) {
-	// 	console.log("+++++++++916");
-	// 	console.log(nextProps);
-	// 	console.log(this.props)
-	// 	// console.log(this.props.isAdmin());
-	// 	if (nextProps.code_review != this.props.code_review) {
-	// 		if (nextProps.code_review !== undefined) {
-	// 			console.log("diaoyonglwangluo1");
-	// 			if(this.props.isAdmin() === true){
-	// 				this.tearchar();
-	// 			}else{
-	// 				this.student();
-	// 			}
-	// 		}
-	// 		}
-	//
-	// }
 
 	componentDidMount() {
-		// console.log("componentDidMount ");
-		// console.log("调用子组件 ");
-		// console.log(this.props);
-		// console.log(this.props.isAdmin())
 		this.student();
 	}
 
@@ -1886,11 +1864,12 @@ class Listofworksstudentone extends Component {
 			console.log(error);
 		})
 	}
+	//一键评阅的按钮
 	AkeyreviewitGetalistofworkstwo=()=>{
 		this.setState({
 			loadingstate: true,
 		})
-		this.Getalistofworkstwo("", "", "", "", 1, 20);
+		this.Startsortingt("", "", "", "", 1, 20);
 	}
 // 获取作品列表
 	Getalistofworkstwo = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
@@ -2097,6 +2076,7 @@ class Listofworksstudentone extends Component {
 						user_name: teacherdata.user_name,
 						user_login: teacherdata.user_login,
 						Curcomlevel: teacherdata.current_complete_count===undefined||teacherdata.current_complete_count===null||teacherdata.current_complete_count===""?0:teacherdata.current_complete_count,
+
 					})
 
 					// }
@@ -2671,11 +2651,7 @@ class Listofworksstudentone extends Component {
 
 			}
 
-			// var teacherlist = {  //分页
+
-			// 	total: student_works.length, //数据总数量
-			// 	pageSize: 20,  //一页显示几条
-			// 	current: page,
-			// }
 
 			if (work_efficiency === false) {
 				if (JSON.stringify(course_group_info) === "[]" || course_group_info === undefined || course_group_info === null) {
@@ -2892,11 +2868,15 @@ class Listofworksstudentone extends Component {
 			}
 
 		} else {
+
 		}
 		//
 		// console.log(datalist);
 		// console.log("1712");
 
+		// console.log("开始赋值了");
+		// console.log(datalistjs);
+
 		this.setState({
 			datajs: datalistjs,
 			columns: columns2js,
@@ -3398,27 +3378,7 @@ class Listofworksstudentone extends Component {
 		});
 
 	};
-	//
+
-	// setComputeTime=()=>{
-	// 	this.setState({
-	// 		computeTimetype:false
-	// 	})
-	// 	let homeworkid = this.props.match.params.homeworkid;
-	// 	let url = "/homework_commons/"+homeworkid+"/update_score.json";
-	//
-	// 	axios.get(url).then((response) => {
-	// 		if(response){
-	// 			this.props.showNotification(response.data.message);
-	// 			this.setState({
-	// 				loadingstate: true
-	// 			})
-	// 			this.Startsortingt(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
-	// 		}
-	// 	}).catch((error) => {
-	// 		console.log(error)
-	// 	});
-	//
-	// }
 
 	daochushixunbaogao = () => {
 		let url = `/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo === undefined || this.state.course_groupyslstwo === null ? "" : this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo === undefined || this.state.checkedValuesineinfo === null ? "" : this.state.checkedValuesineinfo}&search=${this.state.searchtext === undefined || this.state.searchtext === null ? "" : this.state.searchtext}`