From e1ec8b9fdd7f768ba436c85f1a28e221c8d71096 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 6 Mar 2020 21:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=A2=98=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/question/Question.js |  1 +
 .../modules/question/component/Contentpart.js |  2 +-
 .../modules/question/component/Listjihe.js    | 31 +++++++++++++++---
 .../question/questioncss/questioncom.css      | 32 ++++++++++++++++---
 public/react/src/modules/tpm/NewHeader.js     |  3 +-
 5 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/question/Question.js b/public/react/src/modules/question/Question.js
index 4eb69c7dc..9721af3eb 100644
--- a/public/react/src/modules/question/Question.js
+++ b/public/react/src/modules/question/Question.js
@@ -978,6 +978,7 @@ class Question extends Component {
 						 position: relative;
 							z-index: 9999999 ;
 						}
+						
 						`
 							}
 						</style>
diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js
index fa187b147..f62b4e9dd 100644
--- a/public/react/src/modules/question/component/Contentpart.js
+++ b/public/react/src/modules/question/component/Contentpart.js
@@ -363,7 +363,7 @@ class Contentpart extends Component {
                   .xaxisreverseorder .ant-popover-inner-content {
                    padding:0px !important;
                    }
-   
+									 
 									`
 								}
 							</style>
diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js
index 28a01f1ff..b85892bf4 100644
--- a/public/react/src/modules/question/component/Listjihe.js
+++ b/public/react/src/modules/question/component/Listjihe.js
@@ -19,6 +19,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) {
@@ -245,10 +267,10 @@ 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"}>
+					 className={chakanjiexiboolindex === keindex ? "w100s borderwds283 pd20 mb20 listjihecolors" : "borderwds pd20 mb20 listjihecolors"}>
 				{/*顶部*/}
 				{
 					mydisplay===true?
@@ -313,6 +335,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"
 					}} >
@@ -323,10 +346,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 === "" ?
diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index f0e620cb4..26eb60942 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -370,10 +370,10 @@
 }
 
 .listjihetixingstitsy {
-  color: #333333;
-  font-size: 14px;
-  line-height: 20px !important;
-  height: 25px !important;
+    color: #333333;
+    font-size: 14px;
+    line-height: 25px !important;
+    height: 25px !important;
 }
 
 .listjihetixingstits {
@@ -1129,3 +1129,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;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 7c701fd25..5c8b52d79 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -1111,7 +1111,8 @@ class NewHeader extends Component {
                 {/* p 老师  l 学生 */}
 								{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>:""}
+                {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>