m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

合并

Browse Source
dev_aliyun2
杨树明 5 years ago committed by harry
parent d7954eccb9
commit 12b02d9791
2 changed files with 323 additions and 421 deletions
Show Stats Download Patch File Download Diff File

15
public/react/src/modules/question/component/Itembankstop.js
Unescape View File

@ -716,8 +716,14 @@ class Itembankstop extends Component {
rules: [{required: true, message: '请选择课程'}], rules: [{required: true, message: '请选择课程'}],
} }
)( )(
<<<<<<< HEAD
<Cascader style={{width: '270px'}} options={options} onChange={this.handleFormzhishidian} <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... 合并
placeholder="请选择..."/> placeholder="请选择..."/>
)} )}
@ -729,6 +735,10 @@ class Itembankstop extends Component {
{getFieldDecorator("rbzsd" {getFieldDecorator("rbzsd"
)( )(
<div className="sortinxdirection"> <div className="sortinxdirection">
<<<<<<< HEAD
=======
<InputGroup >
>>>>>>> df308ab... 合并
<Select style={{width: '270px'}} value={undefined} onChange={this.handleFormkechen} <Select style={{width: '270px'}} value={undefined} onChange={this.handleFormkechen}
placeholder="请选择..."> placeholder="请选择...">
{knowledgepoints2 && knowledgepoints2.map((object, index) => { {knowledgepoints2 && knowledgepoints2.map((object, index) => {
@ -782,7 +792,12 @@ class Itembankstop extends Component {
rules: [{required: true, message: '请选择题型'}], rules: [{required: true, message: '请选择题型'}],
} }
)( )(
<<<<<<< HEAD
<Select style={{width: '270px'}} disabled={this.state.boolnews} onChange={this.handleFormtixing} <Select style={{width: '270px'}} disabled={this.state.boolnews} onChange={this.handleFormtixing}
=======
<InputGroup >
<Select style={{width: '270px'}} value={this.state.rbtx} onChange={this.handleFormtixing}
>>>>>>> df308ab... 合并
placeholder="请选择..."> placeholder="请选择...">
<Option value="PROGRAM">编程题</Option> <Option value="PROGRAM">编程题</Option>
<Option value="SINGLE">单选题</Option> <Option value="SINGLE">单选题</Option>

181
public/react/src/modules/question/component/Listjihe.js
Unescape View File

@ -17,10 +17,6 @@ const tagArrays = [
'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
] ]
<<<<<<< HEAD
=======
>>>>>>> d0ddf91... 题库
class Listjihe extends Component { class Listjihe extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
@ -39,18 +35,9 @@ class Listjihe extends Component {
//选用 //选用
Selectingpracticaltraining = (id) => { Selectingpracticaltraining = (id) => {
let data = {} let data = {
if (this.props.exam_id === undefined) {
data = {
item_ids: [id] item_ids: [id]
} }
} else {
data = {
item_ids: [id],
exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
}
}
this.props.getitem_baskets(data); this.props.getitem_baskets(data);
} }
//撤销 //撤销
@ -100,46 +87,29 @@ class Listjihe extends Component {
MULTIPLEkey = MULTIPLEkey + tagArrays[i]; MULTIPLEkey = MULTIPLEkey + tagArrays[i];
} }
<<<<<<< HEAD
}
}
}
}
} 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;
}
=======
// 编程答案 // 编程答案
var rightkey=null var rightkey = null
if(items){ if (items) {
if(items.item_type){ if (items.item_type) {
if(items.item_type==="PROGRAM"){ if (items.item_type === "PROGRAM") {
}else{ } else {
if(items.item_type==="JUDGMENT") { if (items.item_type === "JUDGMENT") {
if(items.choices){ if (items.choices) {
if(items.choices.length>0){ if (items.choices.length > 0) {
var arr= items.choices; var arr = items.choices;
for(let data of arr) { for (let data of arr) {
if(data.is_answer===true){ if (data.is_answer === true) {
rightkey=data.choice_text; rightkey = data.choice_text;
break; break;
>>>>>>> d0ddf91... 题库
} }
} }
} }
} }
}else { } else {
if (items.choices) { if (items.choices) {
if (items.choices.length > 0) { if (items.choices.length > 0) {
var arr = items.choices; var arr = items.choices;
@ -234,14 +204,13 @@ class Listjihe extends Component {
</div> </div>
{/*内容*/} {/*内容*/}
<div className="w100s sortinxdirection "> <div className="w100s sortinxdirection ">
<<<<<<< HEAD
{items.item_type === "JUDGMENT" ? {items.item_type === "JUDGMENT" ?
<p className="w100s listjihetixingstitsp sortinxdirection "> <p className="w100s listjihetixingstits sortinxdirection ">
{ {
items === undefined || items === null ? "" : items.choices.map((object, index) => { items === undefined || items === null ? "" : items.choices.map((object, index) => {
return ( return (
<p className={index === 1 ? "sortinxdirection ml10" : "sortinxdirection "}> <p className={index === 1 ? "sortinxdirection ml10" : "sortinxdirection "} >
<Radio disabled={true} > <Radio disabled={false}>
{object.choice_text} {object.choice_text}
</Radio> </Radio>
</p> </p>
@ -250,73 +219,19 @@ class Listjihe extends Component {
} }
</p> : </p> :
items.item_type === "PROGRAM" ? 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="w100s listjihetixingstitssy sortinxdirection ">
<p className={"sortinxdirection mt15"}> <p className={"sortinxdirection mt15"} >
{ <p style={{ wordBreak: "break-word" }} dangerouslySetInnerHTML={{ __html: markdownToHTML(items.program_attr.description).replace(/▁/g, "▁▁▁") }}></p>
items && items.program_attr && items.program_attr.description ?
<p className="programquill" style={{ wordBreak: "break-word" }}
>
<QuillForEditor
readOnly={true}
value={itemsnamesy}
/>
</p>
: ""
}
</p> </p>
</p> </p>
: :
<p className="w100s listjihetixingstitsp verticallayout "> <p className="w100s listjihetixingstits verticallayout ">
{ {
items === undefined || items === null ? "" : items.choices.map((object, index) => { items === undefined || items === null ? "" : items.choices.map((object, index) => {
var string = ""
try {
string = JSON.parse(object.choice_text);
} catch (e) {
string = object.choice_text;
}
return ( return (
<p className={index === 0 ? "sortinxdirection " : "sortinxdirection mt15 "}> <p className={index === 0 ? "sortinxdirection" : "sortinxdirection mt15"} >
<p className="lh20s">{tagArray[index]}</p> {tagArray[index]}
<p className="programquill" style={{ wordBreak: "break-word" }}> <p style={{ wordBreak: "break-word" }} dangerouslySetInnerHTML={{ __html: markdownToHTML(object.choice_text).replace(/▁/g, "▁▁▁") }}></p>
{object ?
object.choice_text === undefined || object.choice_text === null || object.choice_text === "" ?
""
:
object.choice_text.length > 0 ?
<QuillForEditor
readOnly={true}
value={string}
/>
: ""
:
""
}
</p>
</p> </p>
) )
}) })
@ -349,6 +264,11 @@ class Listjihe extends Component {
<p className="updatetimes lh30 ml45">编程语言：{items.program_attr.language}</p> <p className="updatetimes lh30 ml45">编程语言：{items.program_attr.language}</p>
: "" : ""
} }
{
items.item_type === "PROGRAM" ?
<p className="updatetimes lh30 ml45">编程语言：{items.program_attr.language}</p>
: ""
}
{ {
items.item_type === "PROGRAM" ? items.item_type === "PROGRAM" ?
items.program_attr.status === 0 ? items.program_attr.status === 0 ?
@ -366,13 +286,10 @@ class Listjihe extends Component {
: :
items.item_type === "PROGRAM" ? items.item_type === "PROGRAM" ?
items.program_attr.status === 0 ? items.program_attr.status === 0 ?
<Tooltip placement="top" title={"编程题未发布，不能选用！"}> <p className="selectionys jinzhixiaoshou" >
<p className="selectionys jinzhixiaoshou">
<i className="iconfont icon-tianjiadaohang font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i> <i className="iconfont icon-tianjiadaohang font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i>
<span className="mr15 lh30">选用</span> <span className="mr15 lh30">选用</span>
</p> </p>
</Tooltip>
: :
<p className="selection xiaoshou" onClick={() => this.Selectingpracticaltraining(items.id)}> <p className="selection xiaoshou" onClick={() => this.Selectingpracticaltraining(items.id)}>
<i className="iconfont icon-tianjiadaohang font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i> <i className="iconfont icon-tianjiadaohang font-12 lg ml7 lh30 icontianjiadaohangcolor mr5"></i>
@ -419,22 +336,17 @@ class Listjihe extends Component {
items.program_attr.status === 0 ? items.program_attr.status === 0 ?
"" ""
: :
items.apply === false ?
<p className="viewparsings xiaoshou mr25" onClick={() => this.props.showmodels(items.id)}> <p className="viewparsings xiaoshou mr25" onClick={() => this.props.showmodels(items.id)}>
<i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i> <i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
<span>公开</span> <span>公开</span>
</p> </p>
: :
""
: items.apply === false ?
<p className="viewparsings xiaoshou mr25" onClick={() => this.props.showmodels(items.id)}> <p className="viewparsings xiaoshou mr25" onClick={() => this.props.showmodels(items.id)}>
<i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i> <i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
<span>公开</span> <span>公开</span>
</p> </p>
: :
"" ""
:
""
} }
</div> </div>
@ -457,44 +369,19 @@ class Listjihe extends Component {
<div className="w100s questiontypeheng mt23"> <div className="w100s questiontypeheng mt23">
</div> </div>
<<<<<<< HEAD
<div className=" sortinxdirection mt15 yldxtit">
{
items.item_type === "SINGLE" ?
<p className=" testfondex yldxtit"
style={{ wordBreak: "break-word" }}
dangerouslySetInnerHTML={{ __html: markdownToHTML("答案：" + tagArrays[rightkey]).replace(/▁/g, "▁▁▁") }}
>
</p>
: items.item_type === "MULTIPLE" ?
<p className=" testfondex yldxtit"
style={{ wordBreak: "break-word" }}
dangerouslySetInnerHTML={{ __html: markdownToHTML("答案：" + MULTIPLEkey).replace(/▁/g, "▁▁▁") }}
>
</p>
:
<p className=" testfondex yldxtit"
style={{ wordBreak: "break-word" }}
dangerouslySetInnerHTML={{ __html: markdownToHTML("答案：" + rightkey).replace(/▁/g, "▁▁▁") }}
>
</p>
=======
<div className=" sortinxdirection mt15 yldxtit" > <div className=" sortinxdirection mt15 yldxtit" >
{ {
items.item_type==="SINGLE" || items.item_type==="MULTIPLE"? items.item_type === "SINGLE" || items.item_type === "MULTIPLE" ?
<p className=" testfondex yldxtit" <p className=" testfondex yldxtit"
style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML("答案："+tagArrays[rightkey]).replace(/▁/g, "▁▁▁")}} style={{ wordBreak: "break-word" }} dangerouslySetInnerHTML={{ __html: markdownToHTML("答案：" + tagArrays[rightkey]).replace(/▁/g, "▁▁▁") }}
> >
</p> </p>
: :
<p className=" testfondex yldxtit" <p className=" testfondex yldxtit"
style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML("答案："+rightkey).replace(/▁/g, "▁▁▁")}} style={{ wordBreak: "break-word" }} dangerouslySetInnerHTML={{ __html: markdownToHTML("答案：" + rightkey).replace(/▁/g, "▁▁▁") }}
> >
</p> </p>
>>>>>>> d0ddf91... 题库
} }
</div> </div>
@ -529,6 +416,6 @@ class Listjihe extends Component {
} }
} }
export default Listjihe; export default Listjihe;

Write Preview
Loading…
Cancel
Save