调整

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

@@ -305,7 +305,7 @@ class Headplugselections extends Component {
 										}
 										<div className="fl pr shaiAllItem mt1">
 											<li className={this.state.tixing===null?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing(null)}>全部</li>
-											<li className={this.state.tixing==="PROGRAM"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("PROGRAM")}>编程题</li>
+											{/*<li className={this.state.tixing==="PROGRAM"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("PROGRAM")}>编程题</li>*/}
 											<li className={this.state.tixing==="SINGLE"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("SINGLE")}>单选题</li>
 											<li className={this.state.tixing==="MULTIPLE"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("MULTIPLE")}>多选题</li>
 											<li className={this.state.tixing==="JUDGMENT"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("JUDGMENT")}>判断题</li>

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

@@ -1,3 +1,5 @@
+export default Itembankstops;
+
 import React, { Component } from "react";
 import { Link, NavLink } from 'react-router-dom';
 import { WordsBtn, ActionBtn, SnackbarHOC, getImageUrl } from 'educoder';
@@ -683,6 +685,7 @@ class Itembankstop extends Component {
 						`
 						 body{
             width: 100%!important;
+            overflow: hidden!important;
           }
 						.ant-form-item{
 						 margin-bottom: 0px !important;
@@ -733,20 +736,8 @@ class Itembankstop extends Component {
 									rules: [{ required: true, message: '请选择课程' }],
 								}
 							)(
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 								<Cascader style={{ width: '270px' }} options={options} onChange={this.handleFormzhishidian}
-=======
-						<div className="sortinxdirection">
-							<InputGroup >
-								<Cascader style={{width: '270px'}} value={this.state.rbkc} options={options} onChange={this.handleFormzhishidian}
->>>>>>> df308ab... 合并
-=======
-
-								<Cascader style={{width: '270px'}} options={options} onChange={this.handleFormzhishidian}
->>>>>>> 1036126... 合并
-									placeholder="请选择..." />
 
 							)}
 						</Form.Item>
@@ -759,14 +750,6 @@ class Itembankstop extends Component {
 								{getFieldDecorator("rbzsd"
 								)(
 									<div className="sortinxdirection">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-								<InputGroup >
->>>>>>> df308ab... 合并
-=======
->>>>>>> 1036126... 合并
 		<Select style={{ width: '270px' }} value={undefined} onChange={this.handleFormkechen}
 			placeholder="请选择...">
 			{knowledgepoints2 && knowledgepoints2.map((object, index) => {
@@ -775,16 +758,6 @@ class Itembankstop extends Component {
 				)
 			})}
 		</Select>
-=======
-								<Select style={{width: '270px'}} value={undefined} onChange={this.handleFormkechen}
-												placeholder="请选择...">
-									{knowledgepoints2 && knowledgepoints2.map((object, index) => {
-										return (
-											<Option key={object.id} value={object.id}>{object.name}</Option>
-										)
-									})}
-								</Select>
->>>>>>> f439a4a... 调整
 
 
 
@@ -835,25 +808,11 @@ class Itembankstop extends Component {
 			rules: [{ required: true, message: '请选择题型' }],
 		}
 	)(
-<<<<<<< HEAD
-<<<<<<< HEAD
 		<Select style={{ width: '270px' }} disabled={this.state.boolnews} onChange={this.handleFormtixing}
-=======
-							<InputGroup >
-								<Select style={{width: '270px'}} value={this.state.rbtx} onChange={this.handleFormtixing}
->>>>>>> df308ab... 合并
-=======
-								<Select style={{width: '270px'}}  onChange={this.handleFormtixing}
->>>>>>> 1036126... 合并
-			placeholder="请选择...">
 			<Option value="PROGRAM">编程题</Option>
 			<Option value="SINGLE">单选题</Option>
 			<Option value="MULTIPLE">多选题</Option>
 			<Option value="JUDGMENT">判断题</Option>
-<<<<<<< HEAD
-=======
-
->>>>>>> 1036126... 合并
 								</Select >
 						)}
 					</Form.Item >

public/react/src/modules/tpm/NewHeader.js

@@ -1112,8 +1112,8 @@ class NewHeader extends Component {
 								{shixuntype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
 								{pathstype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>{this.props.user&&this.props.user.main_site===false?"我的课程":"我的实践课程"}</Link></li>}
                 {this.props.user&&this.props.user.main_site===true?<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>:""}
-                {/*{ Periofters === true &&<li><Link to ={`/problemset`}>我的试题库</Link></li> }*/}
+                { Periofters === true &&<li><Link to ={`/problemset`}>我的试题库</Link></li> }
-								{/*{ Periofters === true &&<li><Link to ={`/paperlibrary`}>我的试卷库</Link></li> }*/}
+								{ Periofters === true &&<li><Link to ={`/paperlibrary`}>我的试卷库</Link></li> }
 								{/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
 								<li style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>
 									<a href={this.props.Headertop === undefined ? ''  : this.props.Headertop.customer_management_url}>客户管理</a>