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

public/react/src/modules/question/Question.js

@@ -982,6 +982,7 @@ class Question extends Component {
 						 position: relative;
 							z-index: 9999999 ;
 						}
+						
 						`
 							}
 						</style>

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

@@ -25,6 +25,28 @@ const tagArrays = [
 	'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
 	'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
+const questionType = [
+	{
+		type:'SINGLE',
+		color:'typeGreen',
+		name:'单选题'
+	},	
+	{
+		type:'MULTIPLE',
+		color:'typeBlue',
+		name:'多选题'
+	},
+	{
+		type:'JUDGMENT',
+		color:'typeRed',
+		name:'判断题'
+	},
+	{
+		type:'PROGRAM',
+		color:'typeYellow',
+		name:'编程题'
+	}
+]
 //Paperreview_single.js Paperlibraryseeid_items.js
 class Listjihe extends Component {
 	constructor(props) {
@@ -233,7 +255,7 @@ class Listjihe extends Component {
 		}catch (e) {
 
 		}
-
+		const types = questionType.filter(item=>item.type === items.item_type);
 		return (
 			<div key={keindex}
 					 className={chakanjiexiboolindex === keindex ? "w100s borderwds283 pd20 mb20 listjihecolors" : "borderwds pd20 mb20 listjihecolors"}>
@@ -301,6 +323,7 @@ class Listjihe extends Component {
 					}
 				</style>
 				<div className="w100s sortinxdirection">
+					<span className={`typesBtn ${types && types[0].color}`}>{types && types[0].name}</span>
 					<div className="listjihetixingstitsy" style={{
 						fontWeight:"bold"
 					}} >
@@ -311,10 +334,10 @@ class Listjihe extends Component {
 					{
 						items.item_type==="PROGRAM"?
 							<a onClick={()=>this.seturls(`/problems/${items.program_attr.identifier}/edit`)} >
-							<div className="ml10 w100s  "  style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
+							<div className="ml10 w100s flex1 mt2"  style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
 							</a>
 						:
-							<div className="ml10 w100s  markdown-body" style={{wordBreak: "break-word",fontWeight:"bold"}}>
+							<div className="ml10 w100s flex1 markdown-body mt3" style={{wordBreak: "break-word",fontWeight:"bold"}}>
 
 								{	items===undefined||items===null||items===""?"":
 									items.name === undefined || items.name === null || items.name === "" ?

public/react/src/modules/question/questioncss/questioncom.css

@@ -329,7 +329,7 @@
 .listjihetixingstitsy {
     color: #333333;
     font-size: 14px;
-    line-height: 20px !important;
+    line-height: 25px !important;
     height: 25px !important;
 }
 
@@ -1118,3 +1118,27 @@
 .text-indents50{
     text-indent: 50px
 }
+.typesBtn{
+    padding:0px 10px;
+    height:24px;
+    line-height:24px;
+    border-radius:2px;
+    margin-right:10px;
+    font-size: 13px;
+}
+.typeGreen{
+    color:#15DB7A;
+    border:1px solid #15DB7A;
+} 
+.typeBlue{
+    color:#0CB9F1;
+    border:1px solid #0CB9F1;
+}
+.typeRed{
+    color:#FF5555;
+    border:1px solid #FF5555;
+} 
+.typeYellow{
+    color:#FFB538;
+    border:1px solid #FFB538;
+}

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

@@ -1268,6 +1268,7 @@ submittojoinclass=(value)=>{
 								{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> }
 								{/*<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>