调整

public/react/src/modules/question/component/Headplugselection.js

@@ -53,8 +53,8 @@ class Headplugselection extends Component {
 		// console.log("Headplugselection");
 		// console.log(this.props.disciplinesdata);
 		return (
-			<div className=" clearfix">
+			<div className=" clearfix mt10 mb20 ">
-				<div className="educontent mt10 mb20 w1200">
+				<div className="educontent w1200">
 
 			<div className="clearfix edu-back-white   mt21 tophom">
 				{/*课程*/}
@@ -133,13 +133,9 @@ class Headplugselection extends Component {
 
 						{this.props.disciplinesdata&&this.props.disciplinesdata.map((objecta, index) => {
 							return (
-								titlestting==="全部"?
+								titlestting==="全部"&&titlesttings===null?
 									objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
-										console.log("知识点");
-										console.log(titlesttings);
-										console.log(objectb.name);
 										return (
-										titlesttings===objectb.name?
 										objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => {
 											return (
 												<div className={index===0&&indexs===0&&indexss===0&&titlesttingss===object.name?"titlesttingcss xiaoshou":
@@ -148,19 +144,26 @@ class Headplugselection extends Component {
 													{object.name}
 												</div>
 											)
-											}):	objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => {
+											})
-											return (
-												<div className={index===0&&indexs===0&&indexss===0&&titlesttingss===object.name?"titlesttingcss xiaoshou":
-													index===0&&indexs===0&&indexss===0&&titlesttingss!==object.name?"titlesttingcssmy xiaoshou"
-														:titlesttingss===object.name?" titlesttingcss xiaoshou":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttingss(object.name)}>
-													{object.name}
-												</div>
-											)
-										})
 									)
 								})
-							  :objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
+							  :titlestting==="全部"&&titlesttings!==null?
-
+									objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
+										return (
+											titlesttings===objectb.name?
+											objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => {
+												return (
+													<div className={index===0&&indexs===0&&indexss===0&&titlesttingss===object.name?"titlesttingcss xiaoshou":
+														index===0&&indexs===0&&indexss===0&&titlesttingss!==object.name?"titlesttingcssmy xiaoshou"
+															:titlesttingss===object.name?" titlesttingcss xiaoshou":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlesttingss(object.name)}>
+														{object.name}
+													</div>
+												)
+											}):""
+										)
+									})
+									:
+									objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
 							  	return (
 										titlesttings===objectb.name?
 										objectb.tag_disciplines&&objectb.tag_disciplines.map((object, indexss) => {