Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

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

@@ -20,7 +20,7 @@
     <% subjects.each do |subject| %>
       <tr class="subject-item-<%= subject.id %>">
         <td class="text-left">
-          <%= link_to(subject.name, subject_path(subject), target: '_blank') %>
+          <%= link_to(subject.name, "/paths/#{subject.id}", target: '_blank') %>
           <span class="badge badge-pill badge-success homepage-show-badge" style="<%= subject.homepage_show? ? '' : 'display:none' %>">首页</span>
           <span class="badge badge-pill badge-info excellent-badge" style="<%= subject.excellent? ? '' : 'display:none' %>">金课</span>
         </td>

public/react/src/modules/courses/exercise/Exercisestatisticalresult.js

@@ -185,7 +185,7 @@ class Exercisestatisticalresult extends Component {
 
 					<div className="stud-class-set fafafa">
 						<li className="fl mt10 cursor zexercisetitle">统计详情</li>
-						<li className="drop_down fr mt10 mr33 cursor zexercisetitle" onClick={() => this.onSortTypeChange()}>
+						<li className="drop_down fr mt10 cursor zexercisetitle" onClick={() => this.onSortTypeChange()}>
 							{/*{sort==="percent"?"正确率":sort==="type"?"题型":sort==="position"?"题序":""}*/}
 							{/*<i className="iconfont icon-xiajiantou font-12 ml2"></i>*/}
 							{/*<ul className="drop_down_normal">*/}
@@ -209,6 +209,9 @@ class Exercisestatisticalresult extends Component {
 					 .CACFF{
 						 color:#4CACFF;
 					 }
+					 .C3333{
+					   color:#333;
+					 }
 					 .bor-greyE{
 						border: 1px solid #EEEEEE!important;
 					 }
@@ -282,7 +285,7 @@ class Exercisestatisticalresult extends Component {
 								<div className="stud-class-set mb20 exerciseTable" key={key}>
 									<div className="clearfix edu-back-white poll_list"  style={{padding: '20px'}}>
 										<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="C3333">{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>
 											{/*Q{item.ques_position}：*/}
 											{/* <div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML1(item.ques_title).replace(/▁/g,"▁▁▁")}}></div> */}

public/react/src/modules/courses/poll/pollStyle.css

@@ -376,4 +376,5 @@ textarea:read-only{
 .zexercisetitle{
     font-size: 16px;
     color: rgba(51,51,51,1);
+    min-width: 95px;
 }