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

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

@@ -184,7 +184,8 @@ class Exercisestatisticalresult extends Component {
 					</style>
 
 					<div className="stud-class-set fafafa">
-						<li className="drop_down fr mt10 mr33 cursor" onClick={() => this.onSortTypeChange()}>
+						<li className="fl mt10 ml30 cursor zexercisetitle">统计详情</li>
+						<li className="drop_down fr mt10 mr33 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">*/}

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

@@ -74,7 +74,7 @@ class OfficialAcademicTranscript extends Component {
         </span>
 			),
 		}, {
-			title: '不及格(0-60)',
+			title: '不及格（得分 低于60%）',
 			key: 'fail_counts',
 			dataIndex: 'fail_counts',
 			render: (text, record) => (
@@ -83,7 +83,7 @@ class OfficialAcademicTranscript extends Component {
         </span>
 			),
 		}, {
-			title: '及格(60-70)',
+			title: '及格（得分 60%~70%）',
 			key: 'pass_counts',
 			dataIndex: 'pass_counts',
 
@@ -93,7 +93,7 @@ class OfficialAcademicTranscript extends Component {
         </span>
 			),
 		}, {
-			title: '良好(70-90)',
+			title: '良好（得分 70%~90%）',
 			key: 'good_counts',
 			dataIndex: 'good_counts',
 
@@ -103,7 +103,7 @@ class OfficialAcademicTranscript extends Component {
         </span>
 			),
 		}, {
-			title: '优秀(90-100)',
+			title: '优秀（得分 90%~100%）',
 			key: 'best_counts',
 			dataIndex: 'best_counts',
 
@@ -167,6 +167,12 @@ class OfficialAcademicTranscript extends Component {
 					.exerctabel .ant-table-tbody > tr >td{
 					  border:1px solid transparent;
 					}
+					.exerctabel .ant-table-thead > tr > th {
+							 background: #fff !important;
+							 border-top: 1px solid #F4F4F4;
+               border-bottom: 1px solid #F4F4F4 !important;
+
+					}
 
 			`}
 				</style>

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

@@ -109,7 +109,22 @@ class Exercisetablesmubus extends Component {
 
 		return (
 			<div>
+				<style>{`
+					.Exermubu .ant-table-thead > tr > th {
+							 background: #fff !important;
+               border-bottom: 1px solid #F4F4F4 !important;
+					}
+
+					.Exermubu .ant-table-thead .ant-table-column-title{
+								color:#999999;
+					}
+
+					.Exermubu .ant-table-tbody> tr > td{
+         			border-bottom: transparent;
+					}
 
+			`}
+				</style>
 				
 				{datas===undefined?"":<Table
 					className={"Exermubu"}

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

@@ -1139,6 +1139,7 @@ class Studentshavecompletedthelist extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14",
 					sorter: true,
+					defaultSortOrder: 'descend',
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>

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

@@ -372,3 +372,8 @@ textarea:read-only{
 .myyslwidth {
   min-width:1200px
 }
+
+.zexercisetitle{
+    font-size: 16px;
+    color: rgba(51,51,51,1);
+}