diff --git a/public/react/src/modules/question/Paperreview.js b/public/react/src/modules/question/Paperreview.js
index c9da91fda..47593ea2d 100644
--- a/public/react/src/modules/question/Paperreview.js
+++ b/public/react/src/modules/question/Paperreview.js
@@ -289,7 +289,7 @@ class Paperreview extends Component {
 								</Paperreview_item>
 								:
 								<Comthetestpaperst {...this.state} {...this.props}
-																	getcontentMdRef={(ref) => this.getcontentMdRef(ref)}
+																	 getJudquestio={(ref) => this.getcontentMdRef(ref)}
 																	setitem_type={(item) => this.setitem_type(item)}
 
 								></Comthetestpaperst>
diff --git a/public/react/src/modules/question/Paperreview_item.js b/public/react/src/modules/question/Paperreview_item.js
index 0f3726dcb..562da69c1 100644
--- a/public/react/src/modules/question/Paperreview_item.js
+++ b/public/react/src/modules/question/Paperreview_item.js
@@ -142,8 +142,8 @@ class Paperreview_item extends Component {
 
 	onDragEndsss = (result) => {
 
-		const ids = this.props.judgement_questions.questions[result.source.index].id;
-		const positions = this.props.judgement_questions.questions[result.destination.index].position;
+		const ids = this.props.program_questions.questions[result.source.index].id;
+		const positions = this.props.program_questions.questions[result.destination.index].position;
 		const url = `/item_baskets/${ids}/adjust_position.json`
 		var data = {
 			position: positions
diff --git a/public/react/src/modules/question/Question.js b/public/react/src/modules/question/Question.js
index a05a581a3..e2ec41a5e 100644
--- a/public/react/src/modules/question/Question.js
+++ b/public/react/src/modules/question/Question.js
@@ -10,7 +10,7 @@ import {
 	Drawer,
 	Input
 } from "antd";
-import Headplugselection from "./component/Headplugselection";
+import Headplugselections from "./component/Headplugselections";
 import QuestionModal from "./component/QuestionModal";
 import QuestionModals from "./component/QuestionModals";
 import Contentpart from "./component/Contentpart";
@@ -18,6 +18,7 @@ import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
 import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import SiderBar from "../tpm/SiderBar";
+import ShixunSearchBar from "../tpm/shixuns/ShixunSearchBar";
 
 class Question extends Component {
 	constructor(props) {
@@ -695,12 +696,12 @@ class Question extends Component {
 					showDrawer={() => this.showDrawer()}
 					Headertop={Headertop}/>
 				{/*顶部*/}
-				<Headplugselection {...this.props} {...this.state}
-													 setdiscipline_id={(e)=>this.setdiscipline_id(e)}
-													 setsub_discipline_id={(e)=>this.setsub_discipline_id(e)}
-													 settag_discipline_id={(e)=>this.settag_discipline_id(e)}
 
-				></Headplugselection>
+				<Headplugselections
+					disciplinesdata={this.state.disciplinesdata}
+					{...this.props}
+					{...this.state}
+				/>
 				{/*头部*/}
 				<Contentpart {...this.state} {...this.props}
 										 getitem_basketss={(id)=>this.getitem_basketss(id)}
diff --git a/public/react/src/modules/question/component/Headplugselections.js b/public/react/src/modules/question/component/Headplugselections.js
index 23bb9c5a7..896655ff4 100644
--- a/public/react/src/modules/question/component/Headplugselections.js
+++ b/public/react/src/modules/question/component/Headplugselections.js
@@ -2,13 +2,27 @@ import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
 import {WordsBtn, ActionBtn,SnackbarHOC,getImageUrl} from 'educoder';
 import axios from 'axios';
-import {
-	notification,
+import './../questioncss/questioncom.css';
+import { Select, Input,Menu, Dropdown,notification,
 	Spin,
 	Table,
-	Pagination,
-} from "antd";
-import './../questioncss/questioncom.css';
+	Pagination} from 'antd';
+
+import 'antd/lib/style/index.css';
+
+import 'antd/lib/select/style/index.css';
+
+import 'antd/lib/input/style/index.css';
+
+import '../../tpm/shixuns/shixunCss/ShixunSearchBar.css';
+
+
+const $ = window.$;
+
+const Option = Select.Option;
+
+const Search = Input.Search;
+
 class Headplugselections extends Component {
 	constructor(props) {
 		super(props);
@@ -18,6 +32,14 @@ class Headplugselections extends Component {
 			titlesttingid:null,
 			titlesttings:null,
 			titlesttingss:null,
+			status: undefined,
+			diff: 0,
+			InputValue: undefined,
+			shixunhoverData: [],
+			shixunchildValues:'',
+			shixunsearchAllvalue:"a",
+			openStatus:false,
+			openLevel:false
 
 		}
 	}
@@ -25,6 +47,10 @@ class Headplugselections extends Component {
 	componentDidMount(){
 
 	}
+//
+// 	setdiscipline_id={(e)=>this.setdiscipline_id(e)}
+// setsub_discipline_id={(e)=>this.setsub_discipline_id(e)}
+// settag_discipline_id={(e)=>this.settag_discipline_id(e)}
 	settitlestting=(name,id)=>{
 		//如果全部其他的选项重置
 		this.setState({
@@ -71,191 +97,187 @@ class Headplugselections extends Component {
 
 
 	}
-	render() {
-		let {page,titlestting,titlesttings,titlesttingss}=this.state;
-		var kc=0;
-		var zsd=0;
-
-		if(this.props.disciplinesdata){
-			const didata = this.props.disciplinesdata;
-			for (var i = 0; i < didata.length; i++) {
-				//方向
-				const fxdidata = didata[i].sub_disciplines;
-
-				if(titlestting===didata[i].name){
-					for (var j = 0; j < fxdidata.length; j++) {
-						kc=kc+1;
-
-						//课程
-						const zsddata = fxdidata[j].tag_disciplines;
-						for (var k = 0; k < zsddata.length; k++) {
-							//知识点
-							zsd=zsd+1;
-						}
-					}
-				}else if(titlestting==="全部"){
-					kc=kc+1;
-					zsd=zsd+1;
-				}else{
 
-				}
 
+	shixunsearchall=(e)=>{
+		let{shixunsearchAllvalue}=this.state;
+		let id = "a";
 
-			}
+		if(shixunsearchAllvalue===id){
+			return
+		}
+		this.setState({
+			shixunsearchAllvalue:"a",
+			shixunchildValues:""
+		})
+		// this.props.allUpdatashixunlist();
+	}
+	//查询
+	shixunsearchAll = (e) => {
+		let{shixunsearchAllvalue}=this.state;
+		let id = e.target.value;
+
+		if(shixunsearchAllvalue===id){
+			return
+		}
+		if(id===0){
+			id=" "
+			this.setState({
+				InputValue: " "
+			})
+			// this.props.OnSearchInput("");
+		}
+		let list=[{'tag_level':1},{'tag_id':id}];
+		if(id!=undefined){
+			this.setState({
+				shixunsearchAllvalue:id,
+				shixunchildValues:""
+			})
+			// this.props.Updatasearchlist(list);
 		}
+
+	}
+
+	render() {
+		let {shixunhoverData, shixunchildValues, shixunsearchAllvalue, InputValue,openStatus,openLevel} = this.state;
+		let {disciplinesdata} = this.props;
+		let overlaymenu=(item,id)=>(
+			<Menu>
+				{
+					item.map((list,k)=>{
+						return(
+							<Menu.Item>
+								<div className="mt5 subshaicontent-part" key={k}>
+									<a style={{ height: '20px' }} className={ "mb15 shixun_repertoire color-dark"}  name={list.id} id={id} onClick={this.getshixunchildValue}>{list.name}</a>
+									{/*<div className="sub-Item clearfix">*/}
+									{/*	{*/}
+									{/*		list.tag_disciplines.map((tag,e)=>{*/}
+									{/*			return(*/}
+									{/*				<a className={parseInt(shixunchildValues)===tag.id?"shixun_repertoire active":"shixun_repertoire"} key={e} id={tag.id} name={id} rel="subshaicontent" onClick={this.getshixunchildValues}>{tag.name}</a>*/}
+									{/*			)*/}
+									{/*		})*/}
+									{/*	}*/}
+									{/*</div>*/}
+								</div>
+							</Menu.Item>
+						)
+					})
+				}
+			</Menu>
+		)
 		return (
 			<div className=" clearfix mt21  ">
 				<div className="educontent w1200dbl">
 
 					<div className="clearfix edu-back-white    tophoms">
 						{/*课程*/}
-						<div className=" sortinxdirection">
-							<div className="w60  tophomsembolds">
-								方向：
-							</div>
-							<div className="sortinxdirection minleng40">
-								<div className={titlestting==="全部"?" titlesttingcss xiaoshou":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlestting("全部",null)}>
-									全部
-								</div>
-								{this.props.disciplinesdata&&this.props.disciplinesdata.map((object, index) => {
-									return (
-										<div className={titlestting===object.name?" xiaoshou titlesttingcss":" titlesttingcssmy xiaoshou"} onClick={()=>this.settitlestting(object.name,object.id)}>
-											{object.name}
+
+
+						<div className="edu-back-white" >
+							<div className="educontent">
+								<div className="pt40 pb40">
+									<div className="clearfix mb30 shaiContent">
+										<span className="shaiTitle fl mt3">方向：</span>
+										<div className="fl pr shaiAllItem">
+											<li className={shixunsearchAllvalue==="a"?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value= "a"    onClick={this.shixunsearchall}>全部</li>
+											<style>
+												{
+													`
+															.ant-dropdown{
+														     width: 800px;
+															}
+															.shixun_repertoire{
+																	cursor: pointer;
+																	float: left;
+																	margin-right: 20px;
+																	color: #999;
+																	cursor: pointer;
+																	margin-bottom: 10px;
+															}
+															.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;
+															}
+															.dingbus .ant-dropdown-menu ul{
+															display: flex;
+															flex-direction: row;
+															flex-wrap: wrap;
+															}
+															`
+												}
+											</style>
+											<div className="dingbus">
+
+
+											{
+												disciplinesdata.map((item,key)=>{
+													return(
+														<Dropdown overlay={overlaymenu(item.sub_disciplines,item.id)} key={key} placement={item.id<4?"bottomRight":item.id>=8?"bottomLeft":"bottomCenter"}>
+															<li  key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id}  onClick={this.shixunsearchAll}>
+																{item.name}
+															</li>
+														</Dropdown>
+													)
+												})
+											}
+
+											</div>
 										</div>
-									)
-								})}
+									</div>
+
+
+
+									{/*<div className="clearfix">*/}
+									{/*	<span className="shaiTitle fl mt6">筛选：</span>*/}
+									{/*	{*/}
+									{/*		<style>*/}
+									{/*			{`*/}
+									{/*						  .shaiItems{*/}
+									{/*									padding: 3px 15px;*/}
+									{/*									float: left;*/}
+									{/*									border-radius: 4px;*/}
+									{/*									color: #4C4C4C;*/}
+									{/*									cursor: pointer;*/}
+									{/*									margin-right: 15px;*/}
+									{/*									display: block;*/}
+									{/*									float:left;*/}
+									{/*								}*/}
+									{/*								.shaiItems.active {*/}
+									{/*										background-color: #4CACFF!important;*/}
+									{/*										color: #fff!important;*/}
+									{/*								}*/}
+									{/*						`}*/}
+									{/*		</style>*/}
+									{/*	}*/}
+									{/*	<div className="fl pr shaiAllItem mt1">*/}
+									{/*		<li className={this.state.diff===0?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(0)}>全部难度</li>*/}
+									{/*		<li className={this.state.diff===1?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(1)}>初级</li>*/}
+									{/*		<li className={this.state.diff===2?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(2)}>中级</li>*/}
+									{/*		<li className={this.state.diff===3?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(3)}>中高级</li>*/}
+									{/*		<li className={this.state.diff===4?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(4)}>高级</li>*/}
+									{/*	</div>*/}
+
+									{/*</div>*/}
 
+
+
+
+
+								</div>
 							</div>
 						</div>
-						{/*课程*/}
-						{
-							kc===0?
-								""
-								:
-								<div className="mt30 sortinxdirection">
-									<div className="w60  tophomsembolds">
-										课程：
-									</div>
-									<div className="sortinxdirection minleng40">
-
-										{this.props.disciplinesdata&&this.props.disciplinesdata.map((objectn, index) => {
-											return (
-												titlestting==="全部"?
-													objectn.sub_disciplines&&objectn.sub_disciplines.map((object, indexs) => {
-														return (
-															<div className={index===0&&indexs===0&&titlesttings===object.name?"titlesttingcss xiaoshou":index===0&&indexs===0&&titlesttings!==object.name?"titlesttingcssmy xiaoshou"
-
-																:titlesttings===object.name?" titlesttingcss xiaoshou":"titlesttingcssmy  xiaoshou"} onClick={()=>this.settitlesttings(object.name,object.id)}>
-																{object.name}
-															</div>
-														)
-													})
-													:
-													objectn.name===titlestting?
-														objectn.sub_disciplines&&objectn.sub_disciplines.map((object, indexs) => {
-															return (
-																<div className={index===0&&indexs===0&&titlesttings===object.name?"titlesttingcss xiaoshou":index===0&&indexs===0&&titlesttings!==object.name?"titlesttingcssmy xiaoshou"
-
-																	:titlesttings===object.name?" titlesttingcss xiaoshou":"titlesttingcssmy  xiaoshou"} onClick={()=>this.settitlesttings(object.name,object.id)}>
-																	{object.name}
-																</div>
-															)
-														})
-														: ""
-											)
-										})}
 
-									</div>
 
 
-								</div>
-						}
-						{/*知识点*/}
-						{
-							zsd===0?
-								""
-								:<div className="mt30 sortinxdirection">
-									<div className="w60  tophomsembolds">
-										知识点：
-									</div>
 
 
-									<div className="sortinxdirection minleng40">
-
-										{this.props.disciplinesdata&&this.props.disciplinesdata.map((objecta, index) => {
-											return (
-												titlestting==="全部"&&titlesttings===null?
-													objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
-														return (
-															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>
-																)
-															})
-														)
-													})
-													: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>
-																	)
-																}):""
-														)
-													})
-													: titlestting!=="全部"&&titlesttings!==null?
-														titlestting===objecta.name?
-															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>
-																			)
-																		}):""
-																)
-															})
-															:""
-														: titlestting!=="全部"&&titlesttings===null?
-															titlestting===objecta.name?
-																objecta.sub_disciplines&&objecta.sub_disciplines.map((objectb, indexs) => {
-																	return (
-																		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>
-																			)
-																		})
-																	)
-																})
-																:""
-															:""
-											)
-										})}
 
-									</div>
 
 
-								</div>
-						}
 
+						{/*课程尾巴*/}
 					</div>
 				</div>
 			</div>
diff --git a/public/react/src/modules/testpaper/component/Paperlibraryseeid_item.js b/public/react/src/modules/testpaper/component/Paperlibraryseeid_item.js
index 35f395c0f..e4615caa1 100644
--- a/public/react/src/modules/testpaper/component/Paperlibraryseeid_item.js
+++ b/public/react/src/modules/testpaper/component/Paperlibraryseeid_item.js
@@ -69,7 +69,8 @@ class Paperreview_item extends Component {
 
 	}
 	onDragEnd = (result) => {
-
+		console.log("单选题");
+		console.log(result);
 		const ids = this.props.single_questions.questions[result.source.index].id;
 		const positions = this.props.single_questions.questions[result.destination.index].position;
 
@@ -89,7 +90,8 @@ class Paperreview_item extends Component {
 	}
 
 	onDragEnds = (result) => {
-
+		console.log("多选题");
+		console.log(result);
 		const ids = this.props.multiple_questions.questions[result.source.index].id;
 		const positions = this.props.multiple_questions.questions[result.destination.index].position;
 		const url = `/examination_items/${ids}/adjust_position.json`;
@@ -111,6 +113,8 @@ class Paperreview_item extends Component {
 
 
 	onDragEndss = (result) => {
+		console.log("判断题");
+		console.log(result);
 		const ids = this.props.judgement_questions.questions[result.source.index].id;
 		const positions = this.props.judgement_questions.questions[result.destination.index].position;
 		const url = `/examination_items/${ids}/adjust_position.json`;
@@ -131,9 +135,11 @@ class Paperreview_item extends Component {
 	}
 
 	onDragEndsss = (result) => {
+		console.log("编程题");
+		console.log(result);
 
-		const ids = this.props.judgement_questions.questions[result.source.index].id;
-		const positions = this.props.judgement_questions.questions[result.destination.index].position;
+		const ids = this.props.program_questions.questions[result.source.index].id;
+		const positions = this.props.program_questions.questions[result.destination.index].position;
 		const url = `/examination_items/${ids}/adjust_position.json`;
 		var data = {
 			position: positions
diff --git a/public/react/src/modules/testpaper/component/Paperlibraryseeid_itemss.js b/public/react/src/modules/testpaper/component/Paperlibraryseeid_itemss.js
index 7b63cb181..25f588977 100644
--- a/public/react/src/modules/testpaper/component/Paperlibraryseeid_itemss.js
+++ b/public/react/src/modules/testpaper/component/Paperlibraryseeid_itemss.js
@@ -140,8 +140,8 @@ class Paperlibraryseeid_itemss extends Component {
 
 	onDragEndsss = (result) => {
 
-		const ids = this.props.judgement_questions.questions[result.source.index].id;
-		const positions = this.props.judgement_questions.questions[result.destination.index].position;
+		const ids = this.props.program_questions.questions[result.source.index].id;
+		const positions = this.props.program_questions.questions[result.destination.index].position;
 		const url = `/examination_items/${ids}/adjust_position.json`;
 		var data = {
 			position: positions
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 5884eb4ef..0e4ea3073 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -1039,47 +1039,18 @@ submittojoinclass=(value)=>{
 												`
 											}
 										</style>
-										{/*<li className={`pr `}>*/}
-										{/*	<Popover   placement="bottom"  content={contents} trigger="click" >*/}
-										{/*		<div className=" sortinxdirection mr10">*/}
-										{/*			<div style={{*/}
-										{/*				color:"#fff"*/}
-										{/*			}}>*/}
-										{/*				题库*/}
-										{/*			</div>*/}
-										{/*		</div>*/}
-										{/*	</Popover>*/}
-										{/*</li>*/}
-
-
-
-
-
-										{/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
-										{/*<li className={`${coursestype === true ? 'pr active' : 'pr'}`}>*/}
-										{/*	/!*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*!/*/}
-										{/*	<Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>*/}
-										{/*</li>*/}
-
-										{/*<li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>*/}
-										{/*	<Link to="/shixuns">实训项目</Link>*/}
-										{/*	<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">*/}
-										{/*	</img>*/}
-										{/*</li>*/}
-
+										<li className={`pr `}>
+											<Popover   placement="bottom"  content={contents} trigger="click" >
+												<div className=" sortinxdirection mr10">
+													<div style={{
+														color:"#fff"
+													}}>
+														题库
+													</div>
+												</div>
+											</Popover>
+										</li>
 
-										{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
-										{/*<li className="">*/}
-										{/*	<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>*/}
-										{/*	<img className="roundedRectangles"*/}
-										{/*			 src={require('./roundedRectangle.png')}*/}
-										{/*	/>*/}
-										{/*</li>*/}
-										{/*<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>*/}
-										{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
-										{/*<Link to={'/crowdsourcing'}>众包创新</Link>*/}
-										{/*</li>*/}
-										{/*<li className={`${activeForums === true ? 'active' : ''}`}>	<Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>*/}
 										<li
 											style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth === null ? 'none' : 'block'}}
 										><a href={this.props.Headertop === undefined ? "" : this.props.Headertop.auth}>工程认证</a></li>
@@ -1104,65 +1075,6 @@ submittojoinclass=(value)=>{
 										</li>
 									</ul>
 								</div>
-								// 	:mygetHelmetapi2===undefined||mygetHelmetapi2.navbar===null||mygetHelmetapi2.navbar===undefined||mygetHelmetapi2.navbar.length===0?
-								// <div className="head-nav pr" id={"head-navpre2"}>
-								//
-								// 	<ul id="header-nav">
-								// 		{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
-								//
-								// 		{/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
-								// 		<li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
-								// 			<Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>
-								// 		</li>
-								//
-								// 		{/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
-								// 		<li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
-								// 			{/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/}
-								// 			<Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>
-								// 		</li>
-								//
-								// 		<li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
-								// 			<Link to="/shixuns">实训项目</Link>
-								// 			{/*<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">*/}
-								// 			{/*</img>*/}
-								// 		</li>
-								//
-								// 		<li className="fl edu-menu-panel  careershover "
-								// 				style={{display: this.props.Headertop === undefined ?'none'  : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
-								// 			<a>职业路径</a>
-								// 			<div
-								// 				style={{display: this.props.Headertop === undefined ?'none'  : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
-								// 				<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>
-								// 					{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
-								// 						return(
-								// 							<li key={key}><i className="iconfont icon-java left careersiconfont"
-								// 															 style={{color: '#000 important'}}
-								// 							></i><a style={{width: '83%'}}
-								// 											href={item.url}>{item.name}</a></li>
-								// 						)
-								// 					})
-								// 					}
-								// 				</ul>
-								// 			</div>
-								// 		</li>
-								//
-								// 		{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
-								// 		<li className="">
-								// 			<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
-								// 			{/*<img className="roundedRectangles"*/}
-								// 			{/*		 src={require('./roundedRectangle.png')}*/}
-								// 			{/*/>*/}
-								// 		</li>
-								// 		<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
-								// 		{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
-								// 		{/*<Link to={'/crowdsourcing'}>众包创新</Link>*/}
-								// 		{/*</li>*/}
-								// 		<li className={`${activeForums === true ? 'active' : ''}`}>	<Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>
-								// 		<li
-								// 			style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.auth===null? 'none' : 'block'}}
-								// 		><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
-								// 	</ul>
-								// </div>
 								:
 								<div className="head-nav pr" id={"head-navpre3"}>