From f11b69f5ccc5a49fe64d3dd0c01b0a35c961d9ad 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, 31 Dec 2019 14:07:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=BB=84=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/modals/Bottomsubmit.js | 2 +- .../react/src/modules/question/Paperreview.js | 20 ++++++++++++++----- .../src/modules/question/Paperreview_item.js | 16 +++++++-------- .../comthetestpaper/Comthetestpapers.js | 5 ++--- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/public/react/src/modules/modals/Bottomsubmit.js b/public/react/src/modules/modals/Bottomsubmit.js index 229219bfa..16174c480 100644 --- a/public/react/src/modules/modals/Bottomsubmit.js +++ b/public/react/src/modules/modals/Bottomsubmit.js @@ -13,7 +13,7 @@ class Bottomsubmit extends Component { cannelfun = () => { // window.location.href= if(this.props.Cohetepaperbool===true){ - this.setCohetepaperbool(false); + this.props.setCohetepaperbool(false); }else { this.props.history.replace(this.props.url); } diff --git a/public/react/src/modules/question/Paperreview.js b/public/react/src/modules/question/Paperreview.js index 0edb59677..30b6cd4bb 100644 --- a/public/react/src/modules/question/Paperreview.js +++ b/public/react/src/modules/question/Paperreview.js @@ -188,6 +188,7 @@ class Paperreview extends Component { } preservation = () => { + debugger //保存试卷 if(this.state.Cohetepaperbool===true){ @@ -269,11 +270,20 @@ class Paperreview extends Component {
- - 试题库 - 人工组卷 - 试卷预览 - + { + Cohetepaperbool===false? + + 试题库 + 人工组卷 + 试卷预览 + + : + + 试题库 + 新增试卷 + + } +
{ diff --git a/public/react/src/modules/question/Paperreview_item.js b/public/react/src/modules/question/Paperreview_item.js index 700799d55..1b17638d0 100644 --- a/public/react/src/modules/question/Paperreview_item.js +++ b/public/react/src/modules/question/Paperreview_item.js @@ -185,8 +185,8 @@ class Paperreview_item extends Component {

一、单选题

(共{single_questions&&single_questions.questions_count}题;共{single_questions&&single_questions.questions_score}分)

-
删除
-
设置得分
+
删除
+
设置得分
@@ -245,8 +245,8 @@ class Paperreview_item extends Component {

{single_questions===null?"一":"二"}、多选题

(共{multiple_questions&&multiple_questions.questions_count}题;共{multiple_questions&&multiple_questions.questions_score}分)

-
删除
-
设置得分
+
删除
+
设置得分
@@ -307,8 +307,8 @@ class Paperreview_item extends Component { :"三"}、判断题

(共{judgement_questions&&judgement_questions.questions_count}题;共{judgement_questions&&judgement_questions.questions_score}分)

-
删除
-
设置得分
+
删除
+
设置得分
@@ -374,8 +374,8 @@ class Paperreview_item extends Component { 、编程题

(共{program_questions&&program_questions.questions_count}题;共{program_questions&&program_questions.questions_score}分)

-
删除
-
设置得分
+
删除
+
设置得分
diff --git a/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js b/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js index c4821b14b..e10460d48 100644 --- a/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js +++ b/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js @@ -484,8 +484,8 @@ class Comthetestpapers extends Component { ` .yslzxueshis .ant-input{ border-right: none !important; - height: 40px !important; - width: 655px !important; + height: 38px !important; + width: 970px !important; } .yslzxueshisy span .ant-input-group-addon{ width: 65px !important; @@ -505,7 +505,6 @@ class Comthetestpapers extends Component { })(