From 64deed89082f7b42f3f943da16ff047e5214e280 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 9 Aug 2019 16:22:45 +0800 Subject: [PATCH 1/5] 13px font 130 --- public/react/src/modules/courses/busyWork/CommonWorkList.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 43586360d..10bbca9f3 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -152,7 +152,7 @@ function buildColumns(that, student_works) { {project_info && project_info.name && {project_info.name}} ), @@ -749,6 +749,9 @@ class CommonWorkList extends Component{ border-bottom: none; } .studentTable .ant-table-tbody { background: '#F1F9FF' } + .studentTable table, .stageTable table{ + font-size: 13px !important; + } `} { isStudent &&StudentData===undefined?"":StudentData===undefined?"": Date: Fri, 9 Aug 2019 16:29:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/coursesPublic/PathModal.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js index 43901c87a..3fbbd4af4 100644 --- a/public/react/src/modules/courses/coursesPublic/PathModal.js +++ b/public/react/src/modules/courses/coursesPublic/PathModal.js @@ -288,17 +288,19 @@ class PathModal extends Component{
  • - +
  • {item.shixun_count}
  • {item.myshixun_count}
    • - +
  • 详情
    •
    From 7f48f0793885a575370734cfdb80d070ee015322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 9 Aug 2019 16:37:56 +0800 Subject: [PATCH 3/5] b --- .../courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js index d8b0da921..75a7c5ca1 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js @@ -308,7 +308,7 @@ class ShixunWorkModal extends Component{ }
    {onChangetype===true?"清除":"全选"} - 有效作品都为0 + {/*有效作品都为0*/}
    From eae33ad06328cad3aaf7c3279accab4623e8d78e Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 9 Aug 2019 16:48:49 +0800 Subject: [PATCH 4/5] color --- .../react/src/modules/courses/members/modal/AddTeacherModal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/members/modal/AddTeacherModal.js b/public/react/src/modules/courses/members/modal/AddTeacherModal.js index b059ea845..720ca870f 100644 --- a/public/react/src/modules/courses/members/modal/AddTeacherModal.js +++ b/public/react/src/modules/courses/members/modal/AddTeacherModal.js @@ -283,11 +283,12 @@ class AddTeacherModal extends Component{

    + {/* "color":"#4c4c4c" */} 12 }> From ac618d57440394704998fee22b31c5469cf37f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 9 Aug 2019 17:05:47 +0800 Subject: [PATCH 5/5] b --- .../react/src/modules/tpm/challengesnew/TPMevaluation.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js index 3c7bbaced..985a838fb 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js +++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js @@ -216,7 +216,8 @@ export default class TPMevaluation extends Component { position: response.data.position, //int 关卡位置，导航栏中的第几关 scorevalue:response.data.test_set_score, markvalue:response.data.test_set_average, - web_route:response.data.web_route + web_route:response.data.web_route, + has_web_route:response.data.has_web_route }) this.evaluationoninputvalueonload(); if(response.data.power===false){ @@ -780,7 +781,8 @@ export default class TPMevaluation extends Component { web_route, scorevalue, markvalue, - scoretype + scoretype, + has_web_route } = this.state; let tab1url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/editcheckpoint"; @@ -987,7 +989,7 @@ export default class TPMevaluation extends Component {

    - {pathoptionvalue===4&&web_route!=null?
    + {pathoptionvalue===4&&web_route!=null||pathoptionvalue===4&&has_web_route===true?

    Web路由