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

Merge branch 'dev_chen' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_chen

Browse Source
dev_chen
cxt 6 years ago
parent 67a4d0491b d03421c100
commit f3a00b59bc
11 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/AppConfig.js
Unescape View File

@ -46,7 +46,7 @@ debugType = "admin";
// 老师
// debugType="teacher";
// 学生
//debugType="student";
debugType="student";

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

@ -617,6 +617,23 @@ class ExerciseReviewAndAnswer extends Component{
}
}
ProgrammingDetails=(item)=>{
if(item.hack_identifier){
let url= `/problems/${item.hack_identifier}/start.json`;
var newOpenWindow=window.open('about:blank'); // 在ajax外部先打开空白新窗口
axios.get(url).then((result)=>{
if(result.data.status===0){
newOpenWindow.location=`/myproblems/${result.data.identifier}`;
}
}).catch((error)=>{
console.log(error);
})
}
}
render(){
let coursesId=this.props.match.params.coursesId;
let eId=this.props.match.params.Id;
@ -692,7 +709,8 @@ class ExerciseReviewAndAnswer extends Component{
width:100%!important
}
.ql-editor{
padding:0px !important
padding:0px !important;
overflow: unset !important;
}
`}</style>
{url?
@ -917,7 +935,12 @@ class ExerciseReviewAndAnswer extends Component{
{
//实训题 ，答题
item.question_type == 5 &&
<a href={"/shixuns/"+item.shixun_identifier+"/challenges"} target="_blank" class="font-16 color-blue fl" target={"_blank"}>实训详情</a>
<a href={"/shixuns/"+item.shixun_identifier+"/challenges"} target="_blank" class="font-16 color-blue fl">实训详情</a>
}
{
//实训题 ，答题
item.question_type == 6 &&
<a onClick={()=>this.ProgrammingDetails(item)} class="font-16 color-blue fl">进入答题</a>
}
</span>
</p>

3
public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
Unescape View File

@ -288,6 +288,7 @@ class Exercisestatisticalresult extends Component {
}
.ql-editor{
padding:0px !important;
overflow: unset !important;
}
`}
</style>
@ -302,7 +303,7 @@ class Exercisestatisticalresult extends Component {
{/*Q{item.ques_position}：*/}
{/* <div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML1(item.ques_title).replace(/▁/g,"▁▁▁")}}></div> */}
{this.state&&this.state.data.is_md===false&&item.ques_type!=6?<QuillForEditor
style={{ display: 'inline-block', width:'100%' , margin: '1px',padding:'0px'}}
style={{ display: 'inline-block', width:'100%' , margin: '1px',padding:'0px',overflow: 'unset !important'}}
readOnly={true}
value={item.ques_title?JSON.parse(item.ques_title):""}
// showUploadImage={this.handleShowUploadImage}

3
public/react/src/modules/courses/exercise/Exercisetablesmubu.js
Unescape View File

@ -67,7 +67,7 @@ class Exercisetablesmubus extends Component {
const _content = <span style={{color:text.type===true? "#29BD8B":'#333333', width: '100%'}}>
{text.value>0&&text.value!="有效填写量"&&text.value!="wrong"||!text.value&&text.value!="有效填写量"&&text.value!="wrong"?text.value:text.value!="有效填写量"&&text.value!="wrong" &&
this.props&&this.props.data.is_md===false?<QuillForEditor
style={{ display: 'inline-block', width:'100%' , margin: '1px',padding:'0px'}}
style={{ display: 'inline-block', width:'100%' , margin: '1px',padding:'0px',overflow: 'unset !important'}}
readOnly={true}
value={this.setdata(text.value)}
// showUploadImage={this.handleShowUploadImage}
@ -141,6 +141,7 @@ class Exercisetablesmubus extends Component {
}
.ql-editor{
padding:0px !important;
overflow: unset !important;
}
`}
</style>

2
public/react/src/modules/courses/exercise/new/JudgeDisplay.js
Unescape View File

@ -77,7 +77,7 @@ class JudgeDisplay extends Component{
className=""
></MarkdownToHtml>:<QuillForEditor
readOnly={true}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
value={this.setdata(item.choice_text)}
// showUploadImage={this.handleShowUploadImage}
/>}

2
public/react/src/modules/courses/exercise/new/MainDisplay.js
Unescape View File

@ -61,7 +61,7 @@ class MainDisplay extends Component{
className=""
></MarkdownToHtml>:<QuillForEditor
readOnly={true}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
value={this.setdata(standard_answer[0])}
// showUploadImage={this.handleShowUploadImage}
/>}

2
public/react/src/modules/courses/exercise/new/NullDisplay.js
Unescape View File

@ -99,7 +99,7 @@ class NullDisplay extends Component{
content={item} selector={'null_' + (index + 1) + (_index + 1) + (itemIndex + 1)}
></MarkdownToHtml>:<QuillForEditor
readOnly={true}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
value={this.setdata(item)}
// showUploadImage={this.handleShowUploadImage}
/>

3
public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js
Unescape View File

@ -53,6 +53,7 @@ class QestionDisplayHeader extends Component{
}
.ql-editor{
padding:0px !important;
overflow: unset !important;
}
`}</style>
<div className="font-16 fl">
@ -94,7 +95,7 @@ class QestionDisplayHeader extends Component{
!this.props.exercise||this.props.exercise&&this.props.exercise.is_md||this.props.question_type===6?<MarkdownToHtml content={question_title} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
></MarkdownToHtml>:<QuillForEditor
style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px'}}
style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px',overflow: 'unset !important'}}
readOnly={true}
value={this.setdata(question_title)}
// showUploadImage={this.handleShowUploadImage}

2
public/react/src/modules/courses/exercise/new/ShixunDisplay.js
Unescape View File

@ -124,7 +124,7 @@ class ShixunDisplay extends Component{
>
</div>:<QuillForEditor
readOnly={true}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
value={this.setdata(question_title)}
// showUploadImage={this.handleShowUploadImage}
/>}

10
public/react/src/modules/courses/exercise/new/ShixunProgramming.js
Unescape View File

@ -49,18 +49,18 @@ class ShixunProgramming extends Component{
`}</style>
<QestionDisplayHeader {...this.props} question_title={question_title}
topRight={
></QestionDisplayHeader>
{/* topRight={
<a target="_blank" href={`/problems/${hack_identifier}/edit`} className="mr30"
style={{color: '#4CACFF'}}
>实训详情</a>
}
></QestionDisplayHeader>
}*/}
{description&&
!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={description} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
></MarkdownToHtml>:<QuillForEditor
style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px'}}
style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px',overflow: 'unset !important'}}
readOnly={true}
value={this.setdata(description)}
// showUploadImage={this.handleShowUploadImage}

5
public/react/src/modules/courses/exercise/new/SingleDisplay.js
Unescape View File

@ -72,6 +72,7 @@ class SingleDisplay extends Component{
}
.ql-editor{
padding:0px !important;
overflow: unset !important;
}
`}</style>
@ -95,7 +96,7 @@ class SingleDisplay extends Component{
></MarkdownToHtml>:<QuillForEditor
readOnly={true}
style={{ float: 'left', display: 'inline-block',padding:'0px',margin: '2px 0px 0px'}}
style={{ float: 'left', display: 'inline-block',padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
value={this.setdata(item.choice_text)}
// showUploadImage={this.handleShowUploadImage}
/>}
@ -113,7 +114,7 @@ class SingleDisplay extends Component{
></MarkdownToHtml>:<QuillForEditor
readOnly={true}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}
style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px',overflow: 'unset !important'}}
value={this.setdata(item.choice_text)}
// showUploadImage={this.handleShowUploadImage}
/>}

Write Preview
Loading…
Cancel
Save