Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/exercise/Exercisestatisticalresult.js

@@ -87,15 +87,16 @@ class Exercisestatisticalresult extends Component {
 	funtaskstatustwo=(checkedValues,list)=>{
 
 		let{sort,page,limit}=this.state;
-    if(checkedValues.length===list.length){
-			this.setState({
-				exercise_group_id:[]
-			})
-		}else{
-			this.setState({
-				exercise_group_id:checkedValues
-			})
-		}
+    // if(checkedValues.length===list.length){
+		// 	this.setState({
+		// 		exercise_group_id:[]
+		// 	})
+		// }else{
+		//
+		// }
+		this.setState({
+			exercise_group_id:checkedValues
+		})
 		this.updatefun(sort,checkedValues,page,limit)
 	}
 
@@ -144,7 +145,7 @@ class Exercisestatisticalresult extends Component {
 								<span className="fl ">
 									<a id="graduation_comment_no_limit"
 										 className={this.state.exercise_group_id.length === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20"}
-										 onClick={() => this.alldatalist()}>不限</a>
+										 onClick={() => this.alldatalist()}>全部</a>
 								</span>
 								<CheckboxGroup onChange={(e)=>this.funtaskstatustwo(e,data&&data.course_groups)} value={this.state.exercise_group_id} style={{width:'87%',paddingTop: '4px'}}>
 									{ data&&data.course_groups.map((item, key) => {

public/react/src/modules/tpm/shixuns/ShixunSearchBar.js

@@ -229,6 +229,9 @@ render() {
 															}
 															.ant-dropdown-menu-item, .ant-dropdown-menu-submenu-title{
     															padding: 0px 12px;
+															}
+															.ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu-title:hover{
+													      background:transparent !important;
 															}
 															`
 														}