调整

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

@@ -1757,7 +1757,7 @@ class PollNew extends Component {
 			})
 	}
 
-	//上移到服务器中
+	//上下移到服务器中
 	Upanddownmovementof = (bool, poll_question_id) => {
 		// console.log("调用了Upanddownmovementofr")
 		// console.log(poll_question_id)
@@ -1769,7 +1769,7 @@ class PollNew extends Component {
 			}).then((result) => {
 				try {
 					if (result.data.status === 0) {
-						this.props.showNotification(`已完成`);
+						this.props.showNotification(`上移成功`);
 						thiss.thisinitializationdatanew();
 					}
 					// console.log(JSON.stringify(result))
@@ -1787,7 +1787,7 @@ class PollNew extends Component {
 				try {
 					if (result.data.status === 0) {
 						// message.success("下移题目成功", 1)
-						this.props.showNotification(`已完成`);
+						this.props.showNotification(`下移成功`);
 						thiss.thisinitializationdatanew();
 					}
 					// console.log(JSON.stringify(result))
@@ -2483,7 +2483,7 @@ class PollNew extends Component {
 									}
 
 								</p>
-								<p className="mt20"> <span className="font-16  flex1" style={{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
+								<p className="mt20"> <span className="font-16  flex1" style={item.question.question_type === 1?{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}:item.question.question_type === 2? {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}: {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
 								{/*<pre className="mt20 mb20 font-16 break_word flex1">{item.question.question_title}</pre>*/}
 								{item.question.question_type === 1 ?
 									(<RadioGroup defaultChecked={false} disabled>
@@ -2823,9 +2823,9 @@ class PollNew extends Component {
 								}}
 							>
 								<li className="clearfix mt30 mb50">
-									<a type="primary" className="defalutSubmitbtn fl mr20"
+									<a   className="defalutSubmitbtn fl mr20"onClick={() => this.props.history.goBack()}>取消</a>
+									<a type="primary" className="defalutCancelbtn fl"
 										 onClick={() => this.submitQuestionnaire()}>提交</a>
-									<a className="defalutCancelbtn fl" onClick={() => this.props.history.goBack()}>取消</ a>
 								</li>
 							</div>
 					}

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

@@ -52,7 +52,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,
+        })
+      }
+
 
+    }
+
+
+  }
   LimitNumber=(txt)=> {
     var str = txt;
     if(str.length>25){
@@ -62,7 +81,7 @@ class TraineetraininginformationModal extends Component {
   }
     render() {
       var columns;
-      if(this.props.boolgalis&&this.props.boolgalist === true) {
+      if(this.state.boolgalist&&this.state.boolgalist === true) {
         columns = [
           {
             title: '关卡',