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

Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_auth
杨树明 5 years ago
parent 54da53b28c 6f90a2f4c2
commit c8b8b62c74
5 changed files with 125 additions and 87 deletions
Show Stats Download Patch File Download Diff File

7
public/react/src/modules/courses/poll/PollDetailTabThird.js
Unescape View File

@ -20,6 +20,13 @@ class PollDetailTabThird extends Component{
let url=`/polls/${pollId}.json`; let url=`/polls/${pollId}.json`;
axios.get(url).then((result)=>{ axios.get(url).then((result)=>{
if(result.status==200){ if(result.status==200){
if (result.data.status === 401) {
//未登入
this.setState({
pollDetail: undefined
})
return
}
this.setState({ this.setState({
pollDetail:result.data pollDetail:result.data
}) })

173
public/react/src/modules/courses/poll/PollDetailTabThirdInfo.js
Unescape View File

@ -14,103 +14,116 @@ class PollDetailTabThirdInfo extends Component{
} }
render(){ render(){
let { pollDetail }=this.props; let { pollDetail }=this.props;
console.log("pollDetailpollDetail");
console.log(pollDetail);
return( return(
<div className="edu-back-white"> <div>
{ {
pollDetail && pollDetail.poll.polls_description && pollDetail !== undefined ?
<p style={{whiteSpace:"pre-wrap"}} className="color-grey-3 padding20-30">{ pollDetail.poll.polls_description }</p>
} <div className="edu-back-white">
<p className="padding20-30 clearfix edu-txt-left" style={{background:"#fafafa"}}> {
{ !pollDetail || !pollDetail.question_types || pollDetail.question_types.q_counts===0 ? "" : pollDetail !== pollDetail.poll.polls_description &&
<span className="color-grey-3"> <p style={{whiteSpace:"pre-wrap"}} className="color-grey-3 padding20-30">{ pollDetail.poll.polls_description }</p>
}
<p className="padding20-30 clearfix edu-txt-left" style={{background:"#fafafa"}}>
{ !pollDetail || !pollDetail.question_types || pollDetail.question_types.q_counts===0 ? "" :
<span className="color-grey-3">
{ {
pollDetail && pollDetail.question_types && pollDetail.question_types.q_counts > 0 && pollDetail && pollDetail.question_types && pollDetail.question_types.q_counts > 0 &&
<span>合计{pollDetail.question_types && pollDetail.question_types.q_counts}题：</span> <span>合计{pollDetail.question_types && pollDetail.question_types.q_counts}题：</span>
} }
{ {
pollDetail && pollDetail.question_types.q_singles > 0 && pollDetail && pollDetail.question_types.q_singles > 0 &&
<span className="mr15 color-grey-9">单选题{pollDetail.question_types.q_singles}题</span> <span className="mr15 color-grey-9">单选题{pollDetail.question_types.q_singles}题</span>
} }
{ {
pollDetail && pollDetail.question_types.q_doubles > 0 && pollDetail && pollDetail.question_types.q_doubles > 0 &&
<span className="mr15 color-grey-9">多选题{pollDetail.question_types.q_doubles}题</span> <span className="mr15 color-grey-9">多选题{pollDetail.question_types.q_doubles}题</span>
} }
{ {
pollDetail && pollDetail.question_types.q_mains > 0 && pollDetail && pollDetail.question_types.q_mains > 0 &&
<span className="color-grey-9">主观题{pollDetail.question_types.q_mains}题</span> <span className="color-grey-9">主观题{pollDetail.question_types.q_mains}题</span>
} }
</span> </span>
} }
</p> </p>
{ {
pollDetail && pollDetail.questions && pollDetail.questions.map((item,key)=>{ pollDetail && pollDetail.questions && pollDetail.questions.map((item,key)=>{
return( return(
<div className="previewList"> <div className="previewList">
<p className="pl30 pr30 pt30 pb15 font-16 clearfix"> <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
<span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span> <span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span>
{ item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> } { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> }
{ item.question.question_type == 2 && item.question.min_choices != undefined && item.question.min_choices != null && item.question.max_choices != undefined && item.question.max_choices != null ? { item.question.question_type == 2 && item.question.min_choices != undefined && item.question.min_choices != null && item.question.max_choices != undefined && item.question.max_choices != null ?
<span className="color-grey-9 font-14 fl mt2"> <span className="color-grey-9 font-14 fl mt2">
{ {
item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" : item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
"可选"+item.question.min_choices+"-"+item.question.max_choices+"项" "可选"+item.question.min_choices+"-"+item.question.max_choices+"项"
} }
</span>:"" </span>:""
} }
</p> </p>
<li className="pl30 pr30 pb15">{item.question.question_title}</li> <p className="pl30 pr30 pb15"><span className="font-14 flex1" style={{
{ "white-space": "pre-wrap",
// 单选题 "word-break": "break-all",
item.question.question_type==1 && "word-wrap": "break-word"
<Radio.Group className="answerList" disabled> }}>{item.question.question_title}</span></p>
{ {
item.question.answers.map((index,k)=>{ // 单选题
return( item.question.question_type==1 &&
<li className="df"> <Radio.Group className="answerList" disabled>
<Radio className="fl" value={index.answer_id}></Radio> {
<span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span> item.question.answers.map((index,k)=>{
{ return(
index.answer_text=="其他" ? <p className="textLine"></p>:"" <li className="df">
} <Radio className="fl" value={index.answer_id}></Radio>
<span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
{
index.answer_text=="其他" ? <p className="textLine"></p>:""
}
</li> </li>
) )
}) })
}
</Radio.Group>
}
{
// 多选题
item.question.question_type==2 &&
<Checkbox.Group className="answerList" disabled>
{
item.question.answers.map((index,k)=>{
return(
<li className="df" key={k}>
<Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox>
<span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
{
index.answer_text=="其他" ? <p className="textLine"></p>:""
}
</li>
)
})
}
</Checkbox.Group>
} }
</Radio.Group>
}
{
// 多选题
item.question.question_type==2 &&
<Checkbox.Group className="answerList" disabled>
{ {
item.question.answers.map((index,k)=>{ // 主观题
return( item.question.question_type == 3 &&
<li className="df" key={k}> <div className="pl30 pr30 pb20">
<Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox> <textarea placeholder="在此填入答案" readOnly className="winput-100-130"></textarea>
<span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span> </div>
{
index.answer_text=="其他" ? <p className="textLine"></p>:""
}
</li>
)
})
} }
</Checkbox.Group>
}
{
// 主观题
item.question.question_type == 3 &&
<div className="pl30 pr30 pb20">
<textarea placeholder="在此填入答案" readOnly className="winput-100-130"></textarea>
</div> </div>
} )
</div> })
) }
}) </div>
} : ""
</div> }
</div>
) )
} }
} }

6
public/react/src/modules/courses/poll/PollInfo.js
Unescape View File

@ -392,7 +392,11 @@ class PollInfo extends Component{
</span>:"" </span>:""
} }
</div> </div>
<li className="pl30 pr30 mb10 lineh-20">{item.question.question_title}</li> <p className="pl30 pr30 mb10 "><span className="font-14 flex1" style={{
"white-space": "pre-wrap",
"word-break": "break-all",
"word-wrap": "break-word"
}}>{item.question.question_title}</span></p>
{ {
//单选 //单选
item.question.question_type==1 && item.question.question_type==1 &&

13
public/react/src/modules/courses/poll/PollNew.js
Unescape View File

@ -616,11 +616,16 @@ class PollNew extends Component {
// let name="Anchor_"+index; // let name="Anchor_"+index;
console.log("scrollToAnchor"); console.log("scrollToAnchor");
console.log(index); console.log(index);
if (index) { try {
let anchorElement = document.getElementById(index); if (index) {
// if(anchorElement) { anchorElement.scrollIntoView(); } let anchorElement = document.getElementById(index);
$("html").animate({ scrollTop: $(anchorElement).offset().top - 150}) // if(anchorElement) { anchorElement.scrollIntoView(); }
$("html").animate({scrollTop: $(anchorElement).offset().top - 150})
}
} catch (e) {
} }
} }
//新增添加题目 有new //新增添加题目 有new
addMytopic = (index, pollid, Insertposition, Whether, id,inty) => { addMytopic = (index, pollid, Insertposition, Whether, id,inty) => {

11
public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
Unescape View File

@ -18,7 +18,8 @@ class PollBanksContent extends Component{
let url = `/exercise_banks/${bankId}.json` let url = `/exercise_banks/${bankId}.json`
axios.get(url).then((result)=>{ axios.get(url).then((result)=>{
if(result){ if(result){
let pollDetail = { if (result.status == 200) {
let pollDetail = {
poll:{ poll:{
id: result.data.poll && result.data.poll.id , id: result.data.poll && result.data.poll.id ,
polls_description: result.data.poll && result.data.poll.description, polls_description: result.data.poll && result.data.poll.description,
@ -48,9 +49,17 @@ class PollBanksContent extends Component{
authorize:result && result.data && result.data.authorize, authorize:result && result.data && result.data.authorize,
} }
this.props.initPublic(crumbData,menuData,result.data); this.props.initPublic(crumbData,menuData,result.data);
if (result.data.status === 401) {
//未登入
this.setState({
pollDetail: undefined
})
return
}
this.setState({ this.setState({
pollDetail pollDetail
}) })
}
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error); console.log(error);

Write Preview
Loading…
Cancel
Save