From 4745a3b2804301403431d168fb98b6991a25ae73 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 25 Jul 2019 10:00:55 +0800 Subject: [PATCH 01/10] 40px --- .../modules/user/account/AccountBasicEdit.js | 6 ++-- .../src/modules/user/account/AccountSecure.js | 6 ++-- .../react/src/modules/user/account/common.css | 30 +++++++++++++++++++ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js index 9a37f866e..1755ca365 100644 --- a/public/react/src/modules/user/account/AccountBasicEdit.js +++ b/public/react/src/modules/user/account/AccountBasicEdit.js @@ -448,9 +448,7 @@ class AccountBasic extends Component { .basicForm .cancelBtn { margin-left: 0px; } - .basicForm .ant-input-lg { - height: 32px; - } + .basicForm .ant-form-item-label { width: 100px; padding-right: 10px; @@ -576,6 +574,7 @@ class AccountBasic extends Component { {getFieldDecorator('student_No', { @@ -680,6 +679,7 @@ class AccountBasic extends Component { {getFieldDecorator('org2', { rules: [{ diff --git a/public/react/src/modules/user/account/AccountSecure.js b/public/react/src/modules/user/account/AccountSecure.js index 29abf22e4..e5b03e36b 100644 --- a/public/react/src/modules/user/account/AccountSecure.js +++ b/public/react/src/modules/user/account/AccountSecure.js @@ -335,7 +335,7 @@ class AccountSecure extends Component { -
+
@@ -398,7 +398,7 @@ class AccountSecure extends Component { { !secondsFlag ? "获取验证码":`重新发送${seconds}s`} -
+
@@ -471,7 +471,7 @@ class AccountSecure extends Component { )} -
+
diff --git a/public/react/src/modules/user/account/common.css b/public/react/src/modules/user/account/common.css index 113b39e07..908948710 100644 --- a/public/react/src/modules/user/account/common.css +++ b/public/react/src/modules/user/account/common.css @@ -51,3 +51,33 @@ button.ant-btn.ant-btn-primary.grayBtn { .basicForm .ant-form-item-label label { color: #979797 } */ + + +.basicForm .ant-select-show-search { + height: 40px; +} +.basicForm .ant-select-auto-complete.ant-select .ant-input { + height: 40px; +} +.basicForm .ant-select-search__field__mirror { + height: 40px; +} +.basicForm .ant-input-lg { + height: 40px; +} +.basicForm .ant-select-selection--single { + height: 40px; +} +.basicForm .ant-select-auto-complete.ant-select .ant-select-selection--single { + height: 40px +} +.basicForm .ant-input-affix-wrapper { + height: 40px; +} +/* 职业 */ +.basicForm .ant-select-selection-selected-value { + line-height: 38px +} +.basicForm input { + height: 40px; +} \ No newline at end of file From e8b0866ff0a41f389c323a6c60c50e91855e9b1f Mon Sep 17 00:00:00 2001 From: p31729568 Date: Thu, 25 Jul 2019 10:45:48 +0800 Subject: [PATCH 02/10] fix department show deleted --- app/controllers/departments_controller.rb | 2 +- app/models/department.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/departments_controller.rb b/app/controllers/departments_controller.rb index b6ebcb2ef..5e82b2c51 100644 --- a/app/controllers/departments_controller.rb +++ b/app/controllers/departments_controller.rb @@ -1,6 +1,6 @@ class DepartmentsController < ApplicationController def for_option - render_ok(departments: current_school.departments.select(:id, :name).as_json) + render_ok(departments: current_school.departments.without_deleted.select(:id, :name).as_json) end private diff --git a/app/models/department.rb b/app/models/department.rb index 15a8a7c1b..9c4a0908b 100644 --- a/app/models/department.rb +++ b/app/models/department.rb @@ -2,4 +2,6 @@ class Department < ApplicationRecord belongs_to :school has_many :department_members, dependent: :destroy + + scope :without_deleted, -> { where(is_delete: false) } end From 64dcbba6aded3b8d0e5082f93d6740d17e47ff53 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 25 Jul 2019 10:48:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=9B=BE=E7=89=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...725024516_modify_attachment_url_for_challenge_answer.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 db/migrate/20190725024516_modify_attachment_url_for_challenge_answer.rb diff --git a/db/migrate/20190725024516_modify_attachment_url_for_challenge_answer.rb b/db/migrate/20190725024516_modify_attachment_url_for_challenge_answer.rb new file mode 100644 index 000000000..41840bac1 --- /dev/null +++ b/db/migrate/20190725024516_modify_attachment_url_for_challenge_answer.rb @@ -0,0 +1,7 @@ +class ModifyAttachmentUrlForChallengeAnswer < ActiveRecord::Migration[5.2] + def change + ChallengeChoose.find_each do |cc| + cc.update_column(:subject, cc.subject.gsub("(/attachments/download", "(/api/attachments")) if cc.subject.present? + end + end +end From 56bfc47444874ef9a74634993d1193ffe98c4dd8 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 25 Jul 2019 10:57:43 +0800 Subject: [PATCH 04/10] 40 --- .../modules/user/account/AccountBasicEdit.js | 5 +++-- .../user/account/AccountCertification.js | 22 ++++++++----------- .../react/src/modules/user/account/common.css | 18 +++++++-------- .../user/modal/ApplyForAddChildOrgModal.js | 4 ++-- .../modules/user/modal/ApplyForAddOrgModal.js | 6 ++--- .../user/modal/RealNameCertificationModal.js | 4 ++-- 6 files changed, 28 insertions(+), 31 deletions(-) diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js index 1755ca365..1458862a1 100644 --- a/public/react/src/modules/user/account/AccountBasicEdit.js +++ b/public/react/src/modules/user/account/AccountBasicEdit.js @@ -278,6 +278,7 @@ class AccountBasic extends Component { this.setState({ departments: [], filterDepartments: [], + departmentsName: '', school_id: '', department_id: '', }) @@ -412,7 +413,7 @@ class AccountBasic extends Component { addChildOrgSuccess={this.addChildOrgSuccess} > -
+
-
+ - + @@ -186,7 +186,7 @@ class RealNameCertificationModal extends Component{ >
- + 登录 注册 @@ -839,8 +840,9 @@ class LoginRegisterComponent extends Component { Whethertoverify===false&&pciphone===true? : "" @@ -850,8 +852,9 @@ class LoginRegisterComponent extends Component { Whethertoverify===true&&pciphone===true? : "" diff --git a/public/react/src/modules/user/commontwo.css b/public/react/src/modules/user/commontwo.css index d25b888c8..ee43d5834 100644 --- a/public/react/src/modules/user/commontwo.css +++ b/public/react/src/modules/user/commontwo.css @@ -270,4 +270,7 @@ .bth100{ width: 100px; margin: 0 auto; +} +.ysllw100{ + width: 100%; } \ No newline at end of file From f2097f2a11721a2d24a2e7ee3a314850b70947d0 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 25 Jul 2019 11:07:00 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...725024516_modify_attachment_url_for_challenge_answer.rb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 db/migrate/20190725024516_modify_attachment_url_for_challenge_answer.rb diff --git a/db/migrate/20190725024516_modify_attachment_url_for_challenge_answer.rb b/db/migrate/20190725024516_modify_attachment_url_for_challenge_answer.rb deleted file mode 100644 index 41840bac1..000000000 --- a/db/migrate/20190725024516_modify_attachment_url_for_challenge_answer.rb +++ /dev/null @@ -1,7 +0,0 @@ -class ModifyAttachmentUrlForChallengeAnswer < ActiveRecord::Migration[5.2] - def change - ChallengeChoose.find_each do |cc| - cc.update_column(:subject, cc.subject.gsub("(/attachments/download", "(/api/attachments")) if cc.subject.present? - end - end -end From 11cd50eb7574877ec34df50421fd7d42b5af0eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 25 Jul 2019 11:10:29 +0800 Subject: [PATCH 08/10] =?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/shixunHomework/ShixunHomeworkPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index 91639d240..9b053f03b 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -132,7 +132,7 @@ class ShixunHomeworkPage extends Component {

- this.gotohome()}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name} + this.gotohome()}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name} > - this.gotohome()}>返回 + this.gotohome()}>返回 实训详情 From 20e85d513f777ad1e3baa9112d88e44187c77762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 25 Jul 2019 11:18:17 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exercise/Testpapersettinghomepage.js | 20 +++++++++++++++---- .../tasks/GraduationTasksappraise.js | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index e382625b0..a54f5a6e2 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -218,6 +218,20 @@ class Testpapersettinghomepage extends Component{ // DownloadMessageval:undefined // }) // } + goback=()=>{ + // let {datalist}=this.state; + // let courseId=this.props.match.params.coursesId; + // let category_id=this.props.match.params.category_id; + // + // window.location.href="/courses/"+courseId+"/graduation_tasks/"+datalist.graduation_id; + let courseId=this.props.match.params.coursesId; + if(courseId===undefined){ + this.props.history.push("/courses"); + }else{ + this.props.history.push(this.props.current_user.first_category_url); + } + + } render(){ let {tab,visible,Commonheadofthetestpaper}=this.state; const isAdmin =this.props.isAdmin(); @@ -251,7 +265,7 @@ class Testpapersettinghomepage extends Component{

- {this.props.coursedata.name} + {this.props.coursedata.name} > 试卷 > @@ -274,9 +288,7 @@ class Testpapersettinghomepage extends Component{ - 返回 + 返回

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js index 7aa1530af..5eccb2332 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js @@ -170,7 +170,7 @@ class GraduationTasksappraise extends Component{

- {datalist&&datalist.course_name} + {datalist&&datalist.course_name} > {datalist&&datalist.graduation_name} > From e57317351d8877329dcbdf1fac3b72f8b1e65263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 25 Jul 2019 11:21:37 +0800 Subject: [PATCH 10/10] =?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/poll/PollDetailIndex.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollDetailIndex.js b/public/react/src/modules/courses/poll/PollDetailIndex.js index 0099c8615..cbcdd1533 100644 --- a/public/react/src/modules/courses/poll/PollDetailIndex.js +++ b/public/react/src/modules/courses/poll/PollDetailIndex.js @@ -108,6 +108,16 @@ class PollDetailIndex extends Component{ DownloadMessageval:undefined }) } + goback=()=>{ + + let courseId=this.props.match.params.coursesId; + if(courseId===undefined){ + this.props.history.push("/courses"); + }else{ + this.props.history.push(this.props.current_user.first_category_url); + } + + } render(){ let {tab,pollDetail,user_permission}=this.state; @@ -123,7 +133,7 @@ class PollDetailIndex extends Component{ />

- {this.props.coursedata.name} + this.goback()}>{this.props.coursedata.name} > 问卷 > @@ -134,7 +144,7 @@ class PollDetailIndex extends Component{ - this.props.history.goBack()}>返回 + this.goback()}>返回