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 ; } + ` } 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; } - + ` } 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 (
+ className={chakanjiexiboolindex === keindex ? "w100s borderwds283 pd20 mb20 listjihecolors" : "borderwds pd20 mb20 listjihecolors"}> {/*顶部*/} { mydisplay===true? @@ -313,6 +335,7 @@ class Listjihe extends Component { }
+ {types && types[0].name}
@@ -323,10 +346,10 @@ class Listjihe extends Component { { items.item_type==="PROGRAM"? this.seturls(`/problems/${items.program_attr.identifier}/edit`)} > -
+
: -
+
{ 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?"":
  • 我的实训项目
  • } {pathstype===true?"":
  • {this.props.user&&this.props.user.main_site===false?"我的课程":"我的实践课程"}
  • } - {this.props.user&&this.props.user.main_site===true?
  • 我的开发项目
  • :""} + {this.props.user&&this.props.user.main_site===true?
  • 我的开发项目
  • :""} + { Periofters === true &&
  • 我的题库
  • } {/*
  • 我的众包
  • */}
  • 客户管理