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

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

Browse Source
topic_bank
hjm 5 years ago
parent 9cf00437fb 8b56c25360
commit 0bb0aa5121
4 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File

3
public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js
Unescape View File

@ -67,7 +67,7 @@ class Groupjobbandetails extends Component {
<div className=" clearfix edu-back-white " ref='targetElementTrainingjobsetting' style={{margin: "auto", minWidth:"1200px"}}>
<div className="yslquestionbank1">
{
datas&&(datas.description===null?
ddatas.description===null?
<NoneData></NoneData>
:datas.description==="null"?
<NoneData></NoneData>
@ -77,7 +77,6 @@ class Groupjobbandetails extends Component {
:
<MarkdownToHtml content={datas.description} selector="work_content" className="mb10 yslquesHeigth"></MarkdownToHtml>
// <div id="MakedownHTML"className="markdown-body yslquesHeigth yslquesmarkdowntext" dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
)
}
{/*<div id="MakedownHTML"className="markdown-body yslquesHeigth yslquesmarkdowntext" dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>*/}
{/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/}

16
public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
Unescape View File

@ -64,7 +64,7 @@ class Groupjobquesanswer extends Component {
<div className=" clearfix edu-back-white " ref='targetElementTrainingjobsetting' style={{margin: "auto", minWidth:"1200px"}}>
<div className="yslquestionbank1">
{
datas&&(datas.reference_answer===null?
datas.reference_answer===null?
""
:datas.reference_answer==="null"?
"" :
@ -72,25 +72,31 @@ class Groupjobquesanswer extends Component {
""
:
<MarkdownToHtml content={datas.reference_answer} selector="work_content" className="mb10 yslquesHeigth"></MarkdownToHtml>
)
}
{datas.reference_attachments === undefined ?
(datas.reference_answer===undefined || datas.reference_answer===null?
(datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""?
<NoneData></NoneData>
:
""
)
:
datas.reference_attachments === "" ?
(datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""?
<NoneData></NoneData>
:
""
)
:
datas.reference_attachments === null ?
(datas.reference_answer===undefined || datas.reference_answer===null?
(datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""?
<NoneData></NoneData>
:
""
)
:
datas.reference_attachments.length === 0 ?
(datas.reference_answer===undefined || datas.reference_answer===null?
(datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""?
<NoneData></NoneData>
:
""

22
public/react/src/modules/courses/questionbank/Generaljobanswer.js
Unescape View File

@ -57,7 +57,10 @@ class Generaljobanswer extends Component {
render() {
let{datas}=this.props
let{datas}=this.props;
console.log("Generaljobanswer");
console.log(datas.reference_attachments);
console.log(datas.reference_answer);
return (
<div className=" clearfix edu-back-white " ref='targetElementTrainingjobsetting' style={{margin: "auto", minWidth:"1200px"}}>
<div className="yslquestionbank1">
@ -82,7 +85,7 @@ class Generaljobanswer extends Component {
{/*</div>*/}
{
datas&&(datas.reference_answer===null?
datas.reference_answer===null?
""
:datas.reference_answer==="null"?
"" :
@ -90,25 +93,32 @@ class Generaljobanswer extends Component {
""
:
<MarkdownToHtml content={datas.reference_answer} selector="work_content" className="mb10 yslquesHeigth "></MarkdownToHtml>
)
}
{datas.reference_attachments === undefined ?
(datas.reference_answer===undefined || datas.reference_answer===null?
(datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""?
<NoneData></NoneData>
:
""
)
:
datas.reference_attachments === "" ?
(datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""?
<NoneData></NoneData>
:
""
)
:
datas.reference_attachments === null ?
(datas.reference_answer===undefined || datas.reference_answer===null?
(datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""?
<NoneData></NoneData>
:
""
)
:
datas.reference_attachments.length === 0 ?
(datas.reference_answer===undefined || datas.reference_answer===null?
(datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""?
<NoneData></NoneData>
:
""

27
public/react/src/modules/user/usersInfo/InfosTopics.js
Unescape View File

@ -73,11 +73,21 @@ class InfosTopics extends Component{
this.setState({
isSpin:true
})
let user_id=this.props.match.params&&this.props.match.params.username;
let types=this.props.match.params.topicstype;
let user_id="";
if(types==="publicly"){
user_id=this.props.current_user&&this.props.current_user.login;
}else{
user_id=this.props.match.params&&this.props.match.params.username;
}
if(user_id!=undefined){
console.log(user_id)
let {per_page}=this.state;
let url=`/users/${user_id}/question_banks.json`;
axios.get(url,{params:{
axios.get(encodeURI(url),{params:{
type,
object_type:category,
course_list_id,
@ -396,6 +406,13 @@ class InfosTopics extends Component{
.marright0{
margin-right: 0px !important;
}
.gongkais{
min-width: 50px;
height: 22px !important;
line-height: 22px !important;
color: #fff !important;
}
`
}
</style>
@ -404,7 +421,7 @@ class InfosTopics extends Component{
<div className="clearfix topicsbox">
{types==="publicly"?<div className={"topcschild"}>
<a className={types==="personal"?"topicstopfont fr ":"topicstopfont fr topcsactive"}
href={`/users/${username}/topics/personal`}>我的题库</a>
href={`/users/${this.props.current_user&&this.props.current_user.login}/topics/personal`}>我的题库</a>
<div className={types==="publicly"?"topicstopfont fl ":"topicstopfont fl topcsactive"}
>公共题库</div>
</div>:<div className={"topcschild"}>
@ -455,7 +472,7 @@ class InfosTopics extends Component{
</div>
{isshowprofes===false?<div className="clearfix font-12 mt20">
{isshowprofes===false?data&&data.count===undefined?"":data&&data.count===0?"":<div className="clearfix font-12 mt20">
<p className="font-12 ml5 fl">
<span className="fl color-grey-9 mr20">共 <span className={"color-orange"}>{data&&data.count===undefined?0:data&&data.count}</span> 个</span>
<span className="fr color-grey-9">已选择 <span className={"color-orange"}>{checkBoxValues.length}</span> 个 (不支持跨页勾选)</span>
@ -513,7 +530,7 @@ class InfosTopics extends Component{
{item.name}
</a>
{item.is_public===true?types==="publicly"?"":<span className="edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle mt3">公开</span>:""}
{item.is_public===true?types==="publicly"?"":<span className="edu-filter-btn edu-filter-btn-4CACFF ml15 fl gongkais mt3">公开</span>:""}

Write Preview
Loading…
Cancel
Save