From 89374e329697ed41b17938c73f95ff1477be1a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 29 Oct 2019 09:41:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=95=E5=8D=B7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/exercise/Exercisestatisticalresulttabel.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js index 7f221ee55..0ee638dfc 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js @@ -74,7 +74,7 @@ class OfficialAcademicTranscript extends Component { ), }, { - title: '不及格(0-60)', + title: '不及格（得分 低于60%）', key: 'fail_counts', dataIndex: 'fail_counts', render: (text, record) => ( @@ -83,7 +83,7 @@ class OfficialAcademicTranscript extends Component { ), }, { - title: '及格(60-70)', + title: '及格（得分 60%~70%）', key: 'pass_counts', dataIndex: 'pass_counts', @@ -93,7 +93,7 @@ class OfficialAcademicTranscript extends Component { ), }, { - title: '良好(70-90)', + title: '良好（得分 70%~90%）', key: 'good_counts', dataIndex: 'good_counts', @@ -103,7 +103,7 @@ class OfficialAcademicTranscript extends Component { ), }, { - title: '优秀(90-100)', + title: '优秀（得分 90%~100%）', key: 'best_counts', dataIndex: 'best_counts', From c33ea90cb53e4e55ff7e46f001c43f2fac80c147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 29 Oct 2019 17:02:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/exercise/Studentshavecompletedthelist.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 1c440d274..f842a685b 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/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) => ( From 7a1b489094c56bc8ef77960cdd9063f36f08491e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 29 Oct 2019 17:17:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exercise/Exercisestatisticalresult.js | 3 ++- .../exercise/Exercisestatisticalresulttabel.js | 6 ++++++ .../courses/exercise/Exercisetablesmubu.js | 17 ++++++++++++++++- .../src/modules/courses/poll/pollStyle.css | 5 +++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js index b87d34acf..f7e1f15d1 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js @@ -184,7 +184,8 @@ class Exercisestatisticalresult extends Component {
-
  • this.onSortTypeChange()}> +
  • 统计详情
    • +
  • this.onSortTypeChange()}> {/*{sort==="percent"?"正确率":sort==="type"?"题型":sort==="position"?"题序":""}*/} {/**/} {/*
      */} diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js index 7f221ee55..db865ed78 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js @@ -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; + + } `} diff --git a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js index 501a7ebf5..196625d46 100644 --- a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js +++ b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js @@ -109,7 +109,22 @@ class Exercisetablesmubus extends Component { return (
      - + {datas===undefined?"":