合并

public/react/src/modules/courses/new/CoursesNew.js

@@ -808,6 +808,7 @@ class CoursesNew extends Component {
                                             ],
                                         })(
                                             <Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
+                                            <Checkbox value={"announcement"} className="fl">公告栏</Checkbox>
                                             <Checkbox value={"shixun_homework"} className="fl">实训作业</Checkbox>
                                             <Checkbox value={"common_homework"} className="fl">普通作业</Checkbox>
                                             <Checkbox value={"group_homework"} className="fl">分组作业</Checkbox>

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

@@ -812,6 +812,7 @@ class PollNew extends Component {
 				problemtopicbool: false,
 				bindingid:undefined,
 				Newdisplay:false,
+				newoption: false,
 			})
 
 		}else{
@@ -821,6 +822,7 @@ class PollNew extends Component {
 				problemtopic: null,
 				problemtopicbool: false,
 				Newdisplay:false,
+				newoption: false,
 			})
 		}
 
@@ -834,12 +836,13 @@ class PollNew extends Component {
 				q_countst: 1,
 				bindingid:undefined,
 				Newdisplay:false,
-
+				newoption: false,
 			})
 		}else {
 			this.setState({
 				q_countst: 1,
 				Newdisplay:false,
+				newoption: false,
 			})
 		}
 
@@ -1350,6 +1353,7 @@ class PollNew extends Component {
 		}
     this.setState({
 			Newdisplay:false,
+			newoption: false,
 		})
 		// console.log("deleteadddom 349")
 		var thiss = this;