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

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

Browse Source
dev_hjm
cxt 6 years ago
parent 15ff987a12 781cdc129d
commit 2808d7d65a
3 changed files with 85 additions and 87 deletions
Show Stats Download Patch File Download Diff File

7
db/migrate/20190805010545_modify_ke_contents_for_markdown.rb
Unescape View File

@ -14,13 +14,6 @@ class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2]
# m.update_column(:content, content) # m.update_column(:content, content)
# end # end
# #
# # 试卷的描述
# Exercise.find_each do |e|
# exercise_description = ke_transform_to_md e.exercise_description
# puts("#exercise_description: #{exercise_description}")
# e.update_column(:exercise_description, exercise_description)
# end
#
# # 试卷的标题 # # 试卷的标题
# ExerciseQuestion.find_each do |eq| # ExerciseQuestion.find_each do |eq|
# question_title = ke_transform_to_md eq.question_title # question_title = ke_transform_to_md eq.question_title

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

@ -124,7 +124,7 @@ class Exercisestatisticalresult extends Component {
} }
`} `}
</style> </style>
<div className={"educontent mb20" } > <div className={"educontent mb30" } >
{data&&data.course_groups.length===0?"":<div className="stud-class-set"> {data&&data.course_groups.length===0?"":<div className="stud-class-set">
<div className="clearfix edu-back-white"> <div className="clearfix edu-back-white">
@ -154,7 +154,7 @@ class Exercisestatisticalresult extends Component {
</div>} </div>}
<div className="stud-class-set"> <div className="stud-class-set">
<div className="clearfix edu-back-white poll_list"> <div className="clearfix edu-back-white exerciseTable ">
<Exercisestatisticalresulttabel <Exercisestatisticalresulttabel
data={data} data={data}
/> />
@ -198,16 +198,73 @@ class Exercisestatisticalresult extends Component {
.padtop24{ .padtop24{
padding-top: 24px; padding-top: 24px;
} }
.exerciseTable .shixunreporttitle{
padding:0px!important;
}
.exerciseTable .ant-table-thead > tr > th,.exerciseTable .ant-table-tbody > tr > td{
padding:16px 20px!important;
}
.exerciseTable .editormd-html-preview{
width:100%!important;
}
`} `}
</style> </style>
{/* 从子组件将样式提出来，不然会循环多次 */}
<style>{`
// .ant-table-thead > tr > th{
// text-align: center;
// }
.tasknamebox{
width: 50px;
height: 24px;
border: 1px solid rgba(221,23,23,1);
border-radius: 12px;
color: rgba(221,23,23,1);
display: inline-block;
line-height: 24px;
text-align: center;
}
.tasknameboxs{
color: #666666 !important;
background:rgba(237,237,237,1) !important;
}
.ant-table-tbody > tr > td{
font-size:14px;
}
.task-hide{
max-width: 345px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
// .ant-table-tbody > tr{
// height:64px;
// text-align: center;
// }
.ant-progress-success-bg, .ant-progress-bg{
background-color: #29BD8B !important;
}
.ant-table-thead > tr > th:nth-child(1){
text-align: left;
}
.ant-table-tbody > tr > td:nth-child(1){
text-align: left;
}
.Exermubu .ant-table-tbody > tr:nth-last-child(1) > td{
border:1px solid transparent;
}
.Exermubu .editormd-html-preview, .Exermubu .editormd-preview-container {
background: transparent;
}
`}
</style>
{data&&data.commit_results.map((item,key)=>{ {data&&data.commit_results.map((item,key)=>{
return( return(
<div className="stud-class-set mb20" key={key}> <div className="stud-class-set mb20 exerciseTable" key={key}>
<div className="clearfix edu-back-white poll_list" style={{padding: '20px'}}> <div className="clearfix edu-back-white poll_list" style={{padding: '20px'}}>
<div className="font-16 shixunreporttitle fl" > <div className="font-16 shixunreporttitle fl" style={{width:"1050px"}}>
<span className="CACFF">{item.ques_position+"."}{item.ques_type===0?"单选":item.ques_type===1?"多选":item.ques_type===2?"判断":item.ques_type===3?"填空":item.ques_type===4?"主观":item.ques_type===5?"实训":""}题</span> <span className="CACFF">{item.ques_position+"."}{item.ques_type===0?"单选":item.ques_type===1?"多选":item.ques_type===2?"判断":item.ques_type===3?"填空":item.ques_type===4?"主观":item.ques_type===5?"实训":""}题</span>
<div> <div>
{/*Q{item.ques_position}：*/} {/*Q{item.ques_position}：*/}
@ -224,14 +281,15 @@ class Exercisestatisticalresult extends Component {
item.ques_details.map((ite,k)=>{ item.ques_details.map((ite,k)=>{
return( return(
<div className={"mt20"}> <div>
<div className="clearfix edu-back-white poll_list" style={{padding: '0px 20px'}}> <div className="clearfix edu-back-white poll_list mb10" style={{padding: '0px 20px'}}>
<div className="font-16 shixunreporttitle fl padding20"> <div className="font-16 shixunreporttitle fl pt20 pb20">
<span>{ite.challenge_position}：{ite.challenge_name}</span> <span>{ite.challenge_position}：{ite.challenge_name}</span>
</div> </div>
<div className="fr shixunreporttitles padtop24">正确率<span style={{color:'#FF6800'}}>{ite.challenge_percent}%</span></div> <div className="fr shixunreporttitles">正确率<span style={{color:'#FF6800'}}> {ite.challenge_percent}%</span></div>
</div> </div>
<Exercisetablesmubu <Exercisetablesmubu
tableNum={`${key}${k}`}
data={ite.challenge_details} data={ite.challenge_details}
type={item.ques_type} type={item.ques_type}
effictive_counts={item.effictive_counts} effictive_counts={item.effictive_counts}
@ -241,7 +299,7 @@ class Exercisestatisticalresult extends Component {
) )
}): }):
<Exercisetablesmubu <Exercisetablesmubu
tableNum={key} tableNum={key}
data={item.ques_details} data={item.ques_details}
type={item.ques_type} type={item.ques_type}
effictive_counts={item.effictive_counts} effictive_counts={item.effictive_counts}
@ -252,24 +310,20 @@ class Exercisestatisticalresult extends Component {
})} })}
</div> </div>
{
data && data.questions_count > 10 &&
<div className="mb40 edu-txt-center padding20-30">
<Pagination
showQuickJumper
defaultCurrent={1}
pageSize={limit}
total={ data && data.questions_count }
current={page}
onChange={this.PaginationCourse}
/>
</div>
}
<div className="mb40 edu-txt-center padding20-30"
style={
{
display: data&&data===undefined?1:data&&data.questions_count.length< 10 ? 'none' : 'block'
}
}>
<Pagination
showQuickJumper
defaultCurrent={1}
pageSize={limit}
total={data&&data.questions_count}
current={page}
onChange={this.PaginationCourse}
/>
</div>
</div> </div>

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

@ -110,56 +110,7 @@ class Exercisetablesmubus extends Component {
return ( return (
<div> <div>
<style>{`
// .ant-table-thead > tr > th{
// text-align: center;
// }
.tasknamebox{
width: 50px;
height: 24px;
border: 1px solid rgba(221,23,23,1);
border-radius: 12px;
color: rgba(221,23,23,1);
display: inline-block;
line-height: 24px;
text-align: center;
}
.tasknameboxs{
color: #666666 !important;
background:rgba(237,237,237,1) !important;
}
.ant-table-tbody > tr > td{
font-size:14px;
}
.task-hide{
max-width: 345px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
// .ant-table-tbody > tr{
// height:64px;
// text-align: center;
// }
.ant-progress-success-bg, .ant-progress-bg{
background-color: #29BD8B !important;
}
.ant-table-thead > tr > th:nth-child(1){
text-align: left;
}
.ant-table-tbody > tr > td:nth-child(1){
text-align: left;
}
.Exermubu .ant-table-tbody > tr:nth-last-child(1) > td{
border:1px solid transparent;
}
.Exermubu .editormd-html-preview, .Exermubu .editormd-preview-container {
background: transparent;
}
`}
</style>
{datas===undefined?"":<Table {datas===undefined?"":<Table
className={"Exermubu"} className={"Exermubu"}
dataSource={datas} dataSource={datas}

Write Preview
Loading…
Cancel
Save