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

fix

Browse Source
dev_aliyun2
harry 5 years ago
parent 769584ca24
commit 168994cfb3
4 changed files with 455 additions and 118 deletions
Show Stats Download Patch File Download Diff File

370
public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
Unescape View File

@ -644,7 +644,377 @@ class ExerciseReviewAndAnswer extends Component {
// console.log(data&&data.exercise.user_name) // console.log(data&&data.exercise.user_name)
document.title = courseName && courseName; document.title = courseName && courseName;
return (<div className="newMain" style={{ paddingTop: "0px" }}>
<Spin size="large" spinning={isSpin}>
<style>{`
.inputNumber30{
height:30px;
width:115px;
}
.inputNumber30 .ant-input-number-input-wrap{
line-height: 28px;
}
.inputNumber30 .ant-input-number-input-wrap .ant-input-number-input{
height: 28px;
}
.setRadioStyle{
width:100%;
cursor:pointer;
}
.setRadioStyle > span:last-child{
flex:1;
display:flex;
}
.setRadioStyle .ant-radio,.setRadioStyle .ant-checkbox{
height:16px;
margin-top:5px;
}
.standardAnswer.editormd-html-preview,.answerStyle.editormd-html-preview{
width:100%!important
}
`}</style>
{/*<p style={{height:"60px"}}></p>*/}
<Modals
modalsType={Modalstype}
modalsTopval={Modalstopval}
modalsBottomval={modalsBottomval}
modalCancel={ModalCancel}
modalSave={ModalSave}
loadtype={Loadtype}
/>
<div className="educontent mt10 mb50">
<p className="clearfix mb20">
<WordsBtn style="grey" className="fl" to={current_user && current_user.first_category_url}>{courseName}</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" className="fl" to={`/classrooms/${coursesId}/exercises/${data && data.left_banner_id}`}>{data && data.left_banner_name}</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" to={`/classrooms/${coursesId}/exercises/${eId}/student_exercise_list?tab=0`} className="fl mr3">{data && data.left_banner_name}详情</WordsBtn>&gt;
<span className="ml3">{exercise_answer_user && exercise_answer_user.user_name}{data && data.exercise.user_name}</span>
</p>
<p className="clearfix">
<span className="color-grey-3 font-24 fl lineh-40" >{exercise && exercise.exercise_name}</span>
<span className="fl mt8">
<CoursesListType typelist={[`${statudmap[exercise && exercise.exercise_status]}`]} typesylename={""} />
</span>
{
(isAdmin || (isStudent && exercise && user_exercise_status == 1)) ?
<WordsBtn className="fr font-16 lineh-40" style="grey" onClick={this.returnBtn}>返回</WordsBtn>
:
time && time != 0 ?
<div className="fr">
<Countdown value={this.state.Datetime} onFinish={this.autoCommitExercise} />
</div>
: ""
}
{/*<div className="fr remainingTime">*/}
{/* <li>{ hour >= 10 ? hour : '0'+hour}</li>*/}
{/* <span>:</span>*/}
{/* <li>{ minute >= 10 ? minute : '0'+minute}</li>*/}
{/* <span>:</span>*/}
{/* <li>{ second >= 10 ? second : '0'+second}</li>*/}
{/*</div>*/}
{
isAdmin && <WordsBtn className="fr font-16 lineh-40 mr30" style="blue" onClick={this.RepeatExercise}>打回重做</WordsBtn>
}
</p>
{
exercise && exercise.exercise_description &&
<p className="color-grey-3 edu-back-white padding15 mt30">{exercise.exercise_description}</p>
}
<p className="padding20-30 clearfix">
{
exercise_types && exercise_types.q_singles > 0 &&
<span className="color-grey-9 mr15">单选题 {exercise_types.q_singles} 题,共 {exercise_types && exercise_types.q_singles_scores} 分</span>
}
{
exercise_types && exercise_types.q_doubles > 0 &&
<span className="color-grey-9 mr15">多选题 {exercise_types.q_doubles} 题,共 {exercise_types && exercise_types.q_doubles_scores} 分</span>
}
{
exercise_types && exercise_types.q_judges > 0 &&
<span className="color-grey-9 mr15">判断题 {exercise_types.q_judges} 题,共 {exercise_types && exercise_types.q_judges_scores} 分</span>
}
{
exercise_types && exercise_types.q_nulls > 0 &&
<span className="color-grey-9 mr15">填空题 {exercise_types.q_nulls} 题,共 {exercise_types && exercise_types.q_nulls_scores} 分</span>
}
{
exercise_types && exercise_types.q_mains > 0 &&
<span className="color-grey-9 mr15">简答题 {exercise_types.q_mains} 题,共 {exercise_types && exercise_types.q_mains_scores} 分</span>
}
{
exercise_types && exercise_types.q_shixuns > 0 &&
<span className="color-grey-9 mr15">实训题 {exercise_types.q_shixuns} 题,共 {exercise_types && exercise_types.q_shixuns_scores} 分</span>
}
<span className="color-grey-3 fr">共<span className="color-orange-tip"> {exercise_types && exercise_types.q_scores} </span>分</span>
<span className="color-grey-3 fr">合计<span className="color-blue"> {exercise_types && exercise_types.q_counts} </span>题：</span>
</p>
<div className="edu-back-white">
<div className={questionPanelFixed == true ? "questionsfixed padding30" : "questionsNo padding30"} style={{ borderBottom: "none" }}>
<span className="clearfix font-16">
{
exercise_start_at && <span className="fl color-grey-9">开始答题时间：{exercise_start_at && moment(exercise_start_at).format(format)}</span>
}
{
(isAdmin || (isStudent && exercise && exercise.exercise_status == 3)) && exerciseTotalScore &&
<span className="color-grey-9 fr">总分：<span className="color-orange-tip"> {exerciseTotalScore}</span> 分</span>
}
</span>
{
// 老师身份 || 学生身份且试卷已经截止
(isAdmin || (isStudent && exercise && exercise.exercise_status == 3)) &&
<div className="mt10">
{
exercise_scores && exercise_scores.objective_scores && exercise_scores.objective_scores.length > 0 &&
<div>
<p className="clearfix">
<span className="font-16 mr40">客观题</span>
<span className="mr40 answerTure">正确</span>
<span className="mr40 answerFalse">错误</span>
<span className="mr40 answerHalf">部分得分</span>
</p>
<ul className="clearfix leaderMainNav mb20">
{
exercise_scores.objective_scores.map((item, key) => {
return ( return (
<a className={item.answer_status == 1 ? "acted" : item.answer_status == 2 ? "half" : ""} onClick={() => this.scrollToAnchor(`${item.ques_position}`)}>{item.ques_position}</a>
)
})
}
</ul>
</div>
}
{
exercise_scores && exercise_scores.subjective_scores.length > 0 &&
<div>
<p className="clearfix">
<span className="font-16 mr40">主观题</span>
<span className="mr40 answered">已评</span>
<span className="unanswer">未评</span>
</p>
<ul className="clearfix leaderNav">
{
exercise_scores.subjective_scores.map((item, key) => {
return (
<a className={item.answer_status == 0 ? "" : "acted"} onClick={() => this.scrollToAnchor(`${item.ques_position}`)}>{item.ques_position}</a>
)
})
}
</ul>
</div>
}
</div>
}
{
//学生身份 且试卷还未截止
isStudent && exercise && exercise.exercise_status == 2 ?
<div className="mt20">
<p className="clearfix">
<span className="mr40 answered ml20">已答</span>
<span className="unanswer">未答</span>
</p>
<ul className="clearfix leaderNav">
{
question_status && question_status.map((item, key) => {
return (
<a className={item.ques_status == 1 ? "acted" : ""} onClick={() => this.scrollToAnchor(`${item.ques_number}`)}>{item.ques_number}</a>
)
})
}
</ul>
</div> : ""
}
</div>
{/* 试卷题目 */}
<div>
{
exercise_questions && exercise_questions.map((item, key) => {
let list = ajustSore && ajustSore.filter(obj => obj.id === item.question_id);
return (
<div className="bor-top-greyE pt30 pb30" id={"Anchor_" + parseInt(key + 1)}>
<p className="clearfix font-16 pl30 pr30">
<span className="color-blue mr5">{item.q_position}、{type[item.question_type]}</span><span className="color-grey-9 mr5">({item.question_score}分)</span>
<span className="fr">
{
// 填空(一直都有调分)，和简答题调分：老师身份 已经评分的才能出现调分按钮
isAdmin && ((parseInt(item.answer_status) != 0 && item.question_type == 4) || item.question_type == 3 || item.question_type == 1) ?
<WordsBtn style="blue" className="ml20 font-16 fl" onClick={() => this.showSetScore(key, item.setScore, item.q_position, item.question_type, item.question_id)}>调分</WordsBtn> : ""
}
{
// 简答题，未评分的显示未批
isAdmin && parseInt(item.answer_status) == 0 && item.question_type == 4 ?
<span className="color-red fl ml20">未批</span> : ""
}
{
// 客观题：老师||学生（试卷已截止且答案公开）显示正确答案
item.question_type < 3 && item.standard_answer_show ?
<span className="font-16 fl ml20">
正确答案：{item.standard_answer_show}
</span> : ""
}
{
//(老师身份且除实训题外) || (学生身份且试卷已经截止)就显示用户当前题目所得分数
(isAdmin || (isStudent && exercise.exercise_status == 3)) && item.question_type != 5 && item.user_score ?
<span className="font-16 ml20 fl">
<span><span className={parseInt(item.answer_status) == 0 ? "color-red" : parseInt(item.answer_status) == 1 ? "color-green" : "color-orange-tip"}>{item.user_score}</span> 分</span>
</span> : ""
}
{
//实训题 ，答题
item.question_type == 5 &&
<a href={"/shixuns/" + item.shixun_identifier + "/challenges"} target="_blank" class="font-16 color-blue fl" target={"_blank"}>实训详情</a>
}
</span>
</p>
<li className="break_word mt15 mb15 pl30 pr30">
{/* <p className="standardAnswer markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML1(item.question_type == 5 ? item.shixun_name : item.question_title).replace(/▁/g,"▁▁▁")}}></p> */}
<MarkdownToHtml content={(item.question_type == 5 ? item.shixun_name : item.question_title)} selector={'answer_' + key}
className="standardAnswer"
></MarkdownToHtml>
</li>
{
// 选择题和判断题共用
(item.question_type == 0 || item.question_type == 2) &&
<Single
{...this.props}
{...this.state}
exercise={exercise}
questionType={item}
user_exercise_status={user_exercise_status}
changeOption={(index, ids) => this.changeOption(index, ids)}
changeQuestionStatus={(No, flag) => this.changeQuestionStatus(No, flag)}
index={key}
></Single>
}
{
// 多选题
item.question_type == 1 &&
<Multiple
{...this.props}
{...this.state}
exercise={exercise}
questionType={item}
user_exercise_status={user_exercise_status}
changeOption={(index, ids) => this.changeOption(index, ids)}
changeQuestionStatus={(No, flag) => this.changeQuestionStatus(No, flag)}
index={key}
></Multiple>
}
{
// 填空题
item.question_type == 3 &&
<FillEmpty
{...this.props}
{...this.state}
exercise={exercise}
questionType={item}
user_exercise_status={user_exercise_status}
changeQuestionStatus={(No, flag) => this.changeQuestionStatus(No, flag)}
index={key}
></FillEmpty>
}
{
// 简答题
item.question_type == 4 &&
<SimpleAnswer
{...this.props}
{...this.state}
exercise={exercise}
questionType={item}
user_exercise_status={user_exercise_status}
changeQuestionStatus={(No, flag) => this.changeQuestionStatus(No, flag)}
changeA_flag={(index, status) => this.changeA_flag(index, status)}
index={key}
></SimpleAnswer>
}
{
// 实训题
item.question_type == 5 &&
<ShixunAnswer
{...this.props}
{...this.state}
exercise={exercise}
questionType={item}
user_exercise_status={user_exercise_status}
id={this.state.Id}
index={key}
></ShixunAnswer>
}
{
//调分理由部分
item.question_comments && item.question_comments.comment && (item.question_type == 3 || item.question_type == 4 || item.question_type == 1) &&
<div className="ml30 mr30 bor-top-greyE pt30 mt20 clearfix df">
<img src={getImageUrl(`images/${item.question_comments.user_picture}`)} width="48" height="48" className="radius mr10" />
<div className="flex1">
<li className="lineh-20 mb7">
<span className="color-grey-3 mr20">{item.question_comments.user_name}</span>
<span className="color-grey-9 mr20">{moment(item.question_comments.updated_at).format(format)}</span>
</li>
<li className="break_word lineh-20">{item.question_comments.comment}</li>
</div>
</div>
}
{
// 调分输入部分
isAdmin && ((item.setScore && item.question_type == 3) || (item.setScore && item.question_type == 1) || ((item.setScore || parseInt(item.answer_status) == 0) && item.question_type == 4)) ?
<div className="ml30 mr30 bor-top-greyE pt20 mt20" id={`${"Anchor_" + item.q_position + "_" + item.question_type}`}>
<div className="edu-txt-right">
<span><span className="color-red">*</span>调分：</span>
<li className="fr">
<p>
<InputNumber
placeholder="请填写分数"
min={0}
// max={item.question_score}
value={list && list.length > 0 && list[0].inputSore}
step={0.1}
precision={1}
className={list && list.length > 0 && list[0].setTip != "" ? "edu-txt-center winput-115-40 fl mt3 noticeTip inputNumber30" : "edu-txt-center winput-115-40 fl mt3 inputNumber30"}
onChange={(value) => this.inputScore(value, item.question_id)}
id={`${"input_" + item.q_position + "_" + item.question_type}`}
></InputNumber>
<span className="ml5">分</span>
{
parseInt(item.answer_status) == 0 && item.question_type == 4 ? <span className="color-red ml10 font-16">未评分</span> : ''
}
<ActionBtn style="blue" className="middle ml20" onClick={() => this.setAction(key, item.question_id, item.question_score, item.user_score)}>确认</ActionBtn>
</p>
{
list && list.length > 0 && list[0].setTip != "" ? <p className="color-red edu-txt-left">{list[0].setTip}</p> : ""
}
</li>
</div>
<Textarea className="winput-100-150 mt20" value={list && list.length > 0 && list[0].desc} style={{ height: "180px" }} maxLength="100" onChange={(e) => this.changeScoreReasons(e, item.question_id)} placeholder="请您输入评语，最大限制100个字符"></Textarea>
</div> : ""
}
</div>
)
})
}
</div>
</div>
{
isStudent && user_exercise_status == 0 ?
<p className="edu-txt-right mt20 clearfix">
<a className="defalutSubmitbtn fr" onClick={this.commitExercise}>交卷</a>
<a className="defalutCancelbtn fr mr20" onClick={this.saveExercise}>保存</a>
{
exercise && time != null ?
<span className="color-grey-9 font-12 mr20 fr lineh-40">保存或者离开页面后，系统将持续计时，到达时长系统将自动交卷</span>
: ""
}
</p> : ""
}
</div>
</Spin>
</div>
) )
} }
} }

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

@ -192,11 +192,7 @@ class PollInfo extends Component {
//提交主观题 //提交主观题
commitText = (key, q_id) => { commitText = (key, q_id) => {
const text = Object.assign({}, this.state.inputArray[key]).text; const text = Object.assign({}, this.state.inputArray[key]).text;
let url='/poll_questions/'+q_id+'/poll_votes.json?';
let url = '/poll_questions/' + q_id + '/poll_votes.json?'; let url = '/poll_questions/' + q_id + '/poll_votes.json?';
const ans = Object.assign({}, this.state.question_answered[key]); const ans = Object.assign({}, this.state.question_answered[key]);
ans.ques_status = text ? 1 : 0; ans.ques_status = text ? 1 : 0;
const questionAnswered = this.state.question_answered; const questionAnswered = this.state.question_answered;

20
public/react/src/modules/developer/components/controlSetting/index.js
Unescape View File

@ -92,10 +92,6 @@ const ControlSetting = (props) => {
const handleDebuggerCode = (values) => { const handleDebuggerCode = (values) => {
// 改变状态值 // 改变状态值
changeLoadingState(true); changeLoadingState(true);
// 调用代码保存接口, 成功后再调用调试接口
// updateCode(identifier, values, 'debug');
// 调用调试接口
// debuggerCode(identifier, values);
onDebuggerCode(values); onDebuggerCode(values);
} }
// icon-shangjiantou // icon-shangjiantou
@ -133,17 +129,9 @@ const ControlSetting = (props) => {
<Button <Button
type="link" type="link"
style={{ color: '#fff' }} style={{ color: '#fff' }}
<<<<<<< HEAD
// onClick={handleShowControl}
> >
控制台 控制台
{/* <Icon type={ showTextResult ? "down" : "up" } /> */}
</Button> </Button>
=======
>
控制台
</Button>
>>>>>>> 1b23635... fix 提交代码与编辑代码不一致情况
<p> <p>
<Button ghost <Button ghost
loading={loading} loading={loading}
@ -156,10 +144,6 @@ const ControlSetting = (props) => {
type="primary" type="primary"
onClick={handleSubmit} onClick={handleSubmit}
> >
<<<<<<< HEAD
{/* {props.identifier ? '更新' : '提交'} */}
=======
>>>>>>> 1b23635... fix 提交代码与编辑代码不一致情况
提交 提交
</Button> </Button>
</p> </p>
@ -171,11 +155,7 @@ const ControlSetting = (props) => {
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
const { commonReducer, ojForUserReducer } = state; const { commonReducer, ojForUserReducer } = state;
const { loading, excuteState, submitLoading, showOrHideControl } = commonReducer; const { loading, excuteState, submitLoading, showOrHideControl } = commonReducer;
<<<<<<< HEAD
const { commitTestRecordDetail, hack, userCode } = ojForUserReducer;
=======
const { commitTestRecordDetail, hack, editor_code } = ojForUserReducer; const { commitTestRecordDetail, hack, editor_code } = ojForUserReducer;
>>>>>>> 1b23635... fix 提交代码与编辑代码不一致情况
return { return {
hack, hack,
editor_code, editor_code,

9
public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
Unescape View File

@ -162,18 +162,9 @@ const AddTestDemo = (props) => {
</FormItem> </FormItem>
<FormItem <FormItem
label={<span className={'label_text'}>输出</span>} label={<span className={'label_text'}>输出</span>}
<<<<<<< HEAD
<<<<<<< HEAD
validateStatus={testCaseValidate.output.validateStatus} validateStatus={testCaseValidate.output.validateStatus}
help={testCaseValidate.output.errMsg} help={testCaseValidate.output.errMsg}
colon={false} colon={false}
=======
=======
validateStatus={testCaseValidate.output.validateStatus}
help={testCaseValidate.output.errMsg}
>>>>>>> 91fc391... 调整
colon={ false }
>>>>>>> 8f5b1de... 题库地址
> >
<TextArea <TextArea
rows={5} rows={5}

Write Preview
Loading…
Cancel
Save