diff --git a/db/migrate/20190805010545_modify_ke_contents_for_markdown.rb b/db/migrate/20190805010545_modify_ke_contents_for_markdown.rb index 67b57b215..4b66add63 100644 --- a/db/migrate/20190805010545_modify_ke_contents_for_markdown.rb +++ b/db/migrate/20190805010545_modify_ke_contents_for_markdown.rb @@ -14,13 +14,6 @@ class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2] # m.update_column(:content, content) # 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| # question_title = ke_transform_to_md eq.question_title diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js index 34f32b234..85ea6c902 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js @@ -124,7 +124,7 @@ class Exercisestatisticalresult extends Component { } `} -
+
{data&&data.course_groups.length===0?"":
@@ -154,7 +154,7 @@ class Exercisestatisticalresult extends Component {
}
-
+
@@ -198,16 +198,73 @@ class Exercisestatisticalresult extends Component { .padtop24{ 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; + } `} - + {/* 从子组件将样式提出来,不然会循环多次 */} + {data&&data.commit_results.map((item,key)=>{ - return( -
+
-
+
{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?"实训":""}题
{/*Q{item.ques_position}:*/} @@ -224,14 +281,15 @@ class Exercisestatisticalresult extends Component { item.ques_details.map((ite,k)=>{ return( -
-
-
+
+
+
{ite.challenge_position}:{ite.challenge_name}
-
正确率{ite.challenge_percent}%
+
正确率 {ite.challenge_percent}%
- -
- - - -
+ { + data && data.questions_count > 10 && +
+ +
+ } +
diff --git a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js index 6037254fe..d2d6103b8 100644 --- a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js +++ b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js @@ -110,56 +110,7 @@ class Exercisetablesmubus extends Component { return (
- + {datas===undefined?"":