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

app/views/admins/user_statistics/shared/_list.html.erb

@@ -3,8 +3,8 @@
   <tr>
     <th width="14%" class="text-left">姓名</th>
     <th width="22%" class="text-left">单位部门</th>
-    <th width="10%"><%= sort_tag('学习关卡数', name: 'study_challenge_count', path: admins_user_statistics_path) %></th>
-    <th width="10%"><%= sort_tag('完成关卡数', name: 'finish_challenge_count', path: admins_user_statistics_path) %></th>
+    <th width="10%">学习关卡数<%#= sort_tag('学习关卡数', name: 'study_challenge_count', path: admins_user_statistics_path) %></th>
+    <th width="10%">完成关卡数<%#= sort_tag('完成关卡数', name: 'finish_challenge_count', path: admins_user_statistics_path) %></th>
     <th width="10%"><%= sort_tag('学习实训数', name: 'study_shixun_count', path: admins_user_statistics_path) %></th>
     <th width="10%"><%= sort_tag('完成实训数', name: 'finish_shixun_count', path: admins_user_statistics_path) %></th>
     <th width="10%">评测次数</th>

public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js

@@ -176,12 +176,12 @@ class OfficialAcademicTranscript extends Component {
 						<span style={{cursor: "default"}}>
 							{record.view_answer === true ? <Tooltip placement="bottom" title={
 							<pre>
-								学生在完成任务评测之前查是否看了参考答案
+								学生在完成任务评测之前是否查看了参考答案
 				</pre>
 								}><span style={{cursor: "default"}}>已查看</span> </Tooltip>
 								: <Tooltip placement="bottom" title={
 							<pre>
-				学生在完成任务评测之前查是否看了参考答案
+				        学生在完成任务评测之前是否查看了参考答案
 			      	</pre>
 								}><span style={{cursor: "default"}}>未查看</span> </Tooltip>}
 						</span>