题库

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

@@ -17,7 +17,10 @@ const tagArrays = [
 	'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
 	'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
+<<<<<<< HEAD
 
+=======
+>>>>>>> d0ddf91... 题库
 class Listjihe extends Component {
 	constructor(props) {
 		super(props);
@@ -97,6 +100,7 @@ class Listjihe extends Component {
 												MULTIPLEkey = MULTIPLEkey + tagArrays[i];
 											}
 
+<<<<<<< HEAD
 										}
 									}
 								}
@@ -111,11 +115,45 @@ class Listjihe extends Component {
 											rightkey = i;
 											break;
 										}
+=======
+		// 编程答案
+		var rightkey=null
+
+		if(items){
+			if(items.item_type){
+				if(items.item_type==="PROGRAM"){
+
+				}else{
+					if(items.item_type==="JUDGMENT") {
+
+
+						if(items.choices){
+							if(items.choices.length>0){
+								var arr= items.choices;
+								for(let data of arr) {
+									if(data.is_answer===true){
+										rightkey=data.choice_text;
+										break;
+>>>>>>> d0ddf91... 题库
+									}
+								}
+							}
 						}
+					}else {
+						if (items.choices) {
+							if (items.choices.length > 0) {
+								var arr = items.choices;
+								for (var i = 0; i < arr.length; i++) {
+									if (arr[i].is_answer === true) {
+										rightkey = i;
+										break;
 									}
 								}
 							}
 						}
+
+
+					}
 				}
 			}
 
@@ -196,6 +234,7 @@ class Listjihe extends Component {
 				</div>
 				{/*内容*/}
 				<div className="w100s sortinxdirection ">
+<<<<<<< HEAD
 					{items.item_type === "JUDGMENT" ?
 						<p className="w100s listjihetixingstitsp sortinxdirection ">
 							{
@@ -211,6 +250,23 @@ class Listjihe extends Component {
 							}
 						</p> :
 						items.item_type === "PROGRAM" ?
+=======
+					{items.item_type==="JUDGMENT"?
+         <p className="w100s listjihetixingstits sortinxdirection ">
+					 {
+						 items === undefined ||items === null? "" : items.choices.map((object, index) => {
+							 return (
+								 <p className={index===1? "sortinxdirection  ml10":"sortinxdirection  " }  >
+									 <Radio disabled={false}>
+										 {object.choice_text}
+									 </Radio>
+								 </p>
+							 )
+						 })
+					 }
+				</p>:
+						items.item_type==="PROGRAM"?
+>>>>>>> d0ddf91... 题库
 							<p className="w100s listjihetixingstitssy sortinxdirection ">
 								<p className={"sortinxdirection  mt15"}>
 									{
@@ -401,6 +457,7 @@ class Listjihe extends Component {
 						<div className="w100s questiontypeheng mt23">
 
 						</div>
+<<<<<<< HEAD
 						<div className=" sortinxdirection mt15 yldxtit">
 
 							{
@@ -423,6 +480,21 @@ class Listjihe extends Component {
 											dangerouslySetInnerHTML={{ __html: markdownToHTML("答案：" + rightkey).replace(/▁/g, "▁▁▁") }}
 										>
 										</p>
+=======
+						<div className=" sortinxdirection mt15 yldxtit" >
+
+							{
+								items.item_type==="SINGLE" || items.item_type==="MULTIPLE"?
+									<p className=" testfondex yldxtit"
+										 style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML("答案："+tagArrays[rightkey]).replace(/▁/g, "▁▁▁")}}
+									>
+									</p>
+									:
+									<p className=" testfondex yldxtit"
+										 style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML("答案："+rightkey).replace(/▁/g, "▁▁▁")}}
+									>
+									</p>
+>>>>>>> d0ddf91... 题库
 							}
 
 						</div>

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

@@ -992,15 +992,9 @@ class NewHeader extends Component {
 
 
 
-<<<<<<< HEAD
         <style>
           {
             `
-=======
-				<style>
-					{
-						`
->>>>>>> e49ad4f... 调整
           .posi - searchs{
         opacity: 1;
             position: absolute;
@@ -1113,7 +1107,7 @@ class NewHeader extends Component {
                 </ul>
               </div>
         }
-    {/*href="https://www.educoder.net/login"*/ }
+        {/*href="https://www.educoder.net/login"*/}
         <div className="fr head-right">
           {/*{ loadHeader()}*/}
           {showSearchOpentype === true ? "" : this.props.user && this.props.user.main_site === true ? <a id="search-open" className="fl mr30 headIcon" onClick={(e) => this.showSearchOpen(e)}>