调整

public/react/src/modules/courses/poll/PollNew.js

@@ -779,13 +779,13 @@ class PollNew extends Component {
 			}
 
 		}
-		if (maxtie < 2) {
+		if (maxtie < 3) {
 			if (object.question.question_type === 1) {
-				this.props.showNotification(`选项不能少于2个!`);
+				this.props.showNotification(`选项不能少于3个!`);
 
 				return
 			} else if (object.question.question_type === 2) {
-				this.props.showNotification(`选项不能少于2个!`);
+				this.props.showNotification(`选项不能少于3个!`);
 
 				return
 			}
@@ -1259,12 +1259,12 @@ class PollNew extends Component {
 			}
 
 		}
-		if (maxtie < 2) {
+		if (maxtie < 3) {
 			if (object.question.question_type === 1) {
-				this.props.showNotification('选项不能少于2个!');
+				this.props.showNotification('选项不能少于3个!');
 				return
 			} else if (object.question.question_type === 2) {
-				this.props.showNotification('选项不能少于2个!');
+				this.props.showNotification('选项不能少于3个!');
 				return
 			}
 

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

@@ -36,7 +36,6 @@ class TraineetraininginformationModal extends Component {
             props: this.props,
             userids: this.props.userids,
             game_list:this.props.game_list,
-            boolgalist:this.props.boolgalist,
             experience:this.props.experience,
 
         })
@@ -52,26 +51,26 @@ class TraineetraininginformationModal extends Component {
         // this.seacthdata();
 
     }
-  componentWillReceiveProps(nextProps) {
-    // console.log("46");
-    // console.log(nextProps);
-    // console.log(this.props);
-    if (nextProps.boolgalist != this.props.boolgalist) {
-      // console.log("50");
-      // console.log(nextProps.user);
-      if (nextProps.boolgalist !== undefined) {
-        // console.log("53");
-        // console.log(nextProps.user);
-        this.setState({
-          boolgalist: nextProps.boolgalist,
-        })
-      }
-
-
-    }
-
-
-  }
+  // componentWillReceiveProps(nextProps) {
+  //   // console.log("46");
+  //   // console.log(nextProps);
+  //   // console.log(this.props);
+  //   if (nextProps.boolgalist != this.props.boolgalist) {
+  //     // console.log("50");
+  //     // console.log(nextProps.user);
+  //     if (nextProps.boolgalist !== undefined) {
+  //       // console.log("53");
+  //       // console.log(nextProps.user);
+  //       this.setState({
+  //         boolgalist: nextProps.boolgalist,
+  //       })
+  //     }
+  //
+  //
+  //   }
+  //
+  //
+  // }
   LimitNumber=(txt)=> {
     var str = txt;
     if(str.length>25){
@@ -81,7 +80,7 @@ class TraineetraininginformationModal extends Component {
   }
     render() {
       var columns;
-      if(this.state.boolgalist&&this.state.boolgalist === true) {
+      if(this.props.boolgalist&&this.props.boolgalist === true) {
         columns = [
           {
             title: '关卡',