From abf2789c7a60dfea69d1bb619c423f7cbdc9021b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 27 Jul 2019 08:57:56 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/LoginRegisterComponent.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index 3f54149bf..fa56398e2 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -358,7 +358,6 @@ class LoginRegisterComponent extends Component { weekArray="/"; } window.location.href = weekArray; - } } From 4f1430c914b71ea0345ce38637b7c74c06485313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 27 Jul 2019 09:14:14 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/user/LoginRegisterComponent.js | 10 ++++++++-- public/react/src/modules/user/Notcompletedysl.js | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index fa56398e2..eb0a3a5c2 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -65,6 +65,7 @@ class LoginRegisterComponent extends Component { Whethertoverify:false, pciphone:true, MyEduCoderModals:false, + registered:undefined, } } @@ -101,6 +102,7 @@ class LoginRegisterComponent extends Component { Whethertoverify:false, pciphone:true, MyEduCoderModals:false, + registered:undefined, } } @@ -880,12 +882,15 @@ class LoginRegisterComponent extends Component { setNotcompleteds=()=>{ this.setState({ Notcompleteds:true, - MyEduCoderModals:false + MyEduCoderModals:false, + registered:undefined, + }) }; setMyEduCoderModals=()=>{ this.setState({ - MyEduCoderModals:true + MyEduCoderModals:true, + registered:"注册成功" }) }; render() { @@ -1039,6 +1044,7 @@ class LoginRegisterComponent extends Component { } {this.state.MyEduCoderModals===true? {this.setNotcompleteds()}} />:""} diff --git a/public/react/src/modules/user/Notcompletedysl.js b/public/react/src/modules/user/Notcompletedysl.js index fc70f838e..8f147957a 100644 --- a/public/react/src/modules/user/Notcompletedysl.js +++ b/public/react/src/modules/user/Notcompletedysl.js @@ -53,13 +53,13 @@ class Notcompletedysl extends Component { closable={false} footer={null} destroyOnClose={true} - title="提示" + title={this.props.registered===undefined?"提示":"注册成功"} centered={true} visible={this.props.modalsType} width="530px" >
-

完善您的资料，将获得更多的使用权限

+

完善您的资料，将获得更多的使用权限

this.modalCancel()}>取消 this.setDownload()}>立即完善 From de3261c9a053643f28765551368b5edc521f4cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 27 Jul 2019 10:05:20 +0800 Subject: [PATCH 03/33] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/poll/PollNew.js | 2 +- .../src/modules/courses/shixunHomework/ShixunWorkReport.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index cd559b75f..705b1658c 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -2388,7 +2388,7 @@ class PollNew extends Component { this.gotohome()}>{this.props.coursedata.name} > 问卷 + href={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}>问卷 > {this.props.match.params.news === undefined ? "新建" : this.props.match.params.news === "new" ? "新建" : "编辑"}

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 91f6f3001..565121e1b 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -135,7 +135,7 @@ class ShixunWorkReport extends Component { {data===undefined?"":data.category===null?"":data.category.category_name} > - 作业详情 + 作业详情 > {data&&data.username}

From 1dfa7a3bf916e6187b91d63f0aa6fa6e3afda98a Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 27 Jul 2019 10:06:31 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=B2=A1=E5=80=BC=EF=BC=8C=E5=B0=B1=E4=BC=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index af0158cfd..f01ad4b6b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -442,12 +442,18 @@ class ApplicationController < ActionController::Base shixun.shixun_service_configs.each do |config| mirror = config.mirror_repository if mirror.name.present? + # 资源限制没有就传默认值。 + cpu_limit = config.cpu_limit.presence || 1 + cpu_request = config.lower_cpu_limit.presence || 0.1 + memory_limit = config.memory_limit.presence || 1024 + request_limit = config.resource_limit.presence || 10 + resource_limit = config.resource_limit.presence || 10000 container << {:image => mirror.name, - :cpuLimit => config.cpu_limit, - :cpuRequest => config.lower_cpu_limit, - :memoryLimit => "#{config.memory_limit}M", - :memoryRequest => "#{config.request_limit}M", - :resourceLimit => "#{config.resource_limit}K", + :cpuLimit => cpu_limit, + :cpuRequest => cpu_request, + :memoryLimit => "#{memory_limit}M", + :memoryRequest => "#{request_limit}M", + :resourceLimit => "#{resource_limit}K", :type => mirror.try(:main_type) == "1" ? "main" : "sub"} end end From 8c393990f0210310eb288a6de4d03354d90753e9 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 27 Jul 2019 10:16:55 +0800 Subject: [PATCH 05/33] height 40 --- public/react/src/modules/courses/boards/BoardsNew.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js index 8d9db7c3f..03c5f84f8 100644 --- a/public/react/src/modules/courses/boards/BoardsNew.js +++ b/public/react/src/modules/courses/boards/BoardsNew.js @@ -297,6 +297,9 @@ class BoardsNew extends Component{ .courseForm .noBorder { border-bottom: none; } + .courseForm .ant-input-group > .ant-input:first-child, .ant-input-group-addon:first-child { + height: 40px; + } `}
Date: Sat, 27 Jul 2019 10:39:27 +0800 Subject: [PATCH 06/33] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E6=9C=80?= =?UTF-8?q?=E5=B0=8F=E9=80=89=E9=A1=B9=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_votes_controller.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/controllers/poll_votes_controller.rb b/app/controllers/poll_votes_controller.rb index b1191d8ea..b376b870f 100644 --- a/app/controllers/poll_votes_controller.rb +++ b/app/controllers/poll_votes_controller.rb @@ -147,9 +147,17 @@ class PollVotesController < ApplicationController else question_max_choices = 0 end + if @poll_question.min_choices.present? + question_min_choices = @poll_question.min_choices + else + question_min_choices = 0 + end if question_max_choices > 0 && (user_vote_count > question_max_choices) normal_status(-1,"多选题答案超过最大限制！") end + if question_min_choices > 0 && (user_vote_count < question_min_choices) + normal_status(-1,"多选题答题不得少于最小限制！") + end elsif (poll_user.present? && poll_user.commit_status == 1) || poll_user_status == 3 normal_status(-1,"已提交/已结束的问卷不允许修改！") end From 14ce4c695f65904ef805fc61e22a37b7f3b80f9d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 27 Jul 2019 10:40:56 +0800 Subject: [PATCH 07/33] 40 --- .../src/modules/courses/boards/BoardsNew.js | 4 +--- .../react/src/modules/courses/css/Courses.css | 20 +++++++++++++++++++ .../courses/members/modal/AddStudentModal.js | 2 +- .../courses/members/modal/AddTeacherModal.js | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js index 03c5f84f8..7c48d372b 100644 --- a/public/react/src/modules/courses/boards/BoardsNew.js +++ b/public/react/src/modules/courses/boards/BoardsNew.js @@ -297,9 +297,7 @@ class BoardsNew extends Component{ .courseForm .noBorder { border-bottom: none; } - .courseForm .ant-input-group > .ant-input:first-child, .ant-input-group-addon:first-child { - height: 40px; - } + `}
.ant-input:first-child, .ant-input-group-addon:first-child { + height: 40px; +} +.courseForm .ant-select-selection, .courseForm .ant-select-selection-selected-value { + height: 40px; + line-height: 40px; +} +.courseForm .ant-input-affix-wrapper .ant-input { + height: 40px; +} +.courseForm .ant-select-auto-complete.ant-select .ant-input { + height: 40px; +} + +.courseForm .ant-select-auto-complete.ant-select .ant-select-selection__rendered { + line-height: 40px; +} +.courseForm .ant-select-auto-complete.ant-select .ant-input { + height: 40px; +} /*新建课堂*/ diff --git a/public/react/src/modules/courses/members/modal/AddStudentModal.js b/public/react/src/modules/courses/members/modal/AddStudentModal.js index c3d8cdd75..97e1a4bbe 100644 --- a/public/react/src/modules/courses/members/modal/AddStudentModal.js +++ b/public/react/src/modules/courses/members/modal/AddStudentModal.js @@ -159,7 +159,7 @@ class AddStudentModal extends Component{ title={`添加${moduleName}`} {...this.props } onOk={this.onOk} - className="addStudentModal" + className="addStudentModal courseForm" > :"" + }
{this.props.children} {this.props.checkBoxValuestype===true?
From 6ffa26bc3ac5a02211c25bc5e0268952ddf67632 Mon Sep 17 00:00:00 2001 From: SylorHuang Date: Sat, 27 Jul 2019 11:30:41 +0800 Subject: [PATCH 12/33] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E6=8F=90=E4=BA=A4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_votes_controller.rb | 8 ------ app/controllers/polls_controller.rb | 32 ++++++++++++++++++------ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/controllers/poll_votes_controller.rb b/app/controllers/poll_votes_controller.rb index b376b870f..b1191d8ea 100644 --- a/app/controllers/poll_votes_controller.rb +++ b/app/controllers/poll_votes_controller.rb @@ -147,17 +147,9 @@ class PollVotesController < ApplicationController else question_max_choices = 0 end - if @poll_question.min_choices.present? - question_min_choices = @poll_question.min_choices - else - question_min_choices = 0 - end if question_max_choices > 0 && (user_vote_count > question_max_choices) normal_status(-1,"多选题答案超过最大限制！") end - if question_min_choices > 0 && (user_vote_count < question_min_choices) - normal_status(-1,"多选题答题不得少于最小限制！") - end elsif (poll_user.present? && poll_user.commit_status == 1) || poll_user_status == 3 normal_status(-1,"已提交/已结束的问卷不允许修改！") end diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index f5003a0c7..a89544669 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -896,13 +896,31 @@ class PollsController < ApplicationController def commit_poll ActiveRecord::Base.transaction do begin - poll_user_current = @poll.poll_users.find_by_group_ids(current_user.id).first - poll_user_params = { - :commit_status => 1, - :end_at => Time.now - } - poll_user_current.update_attributes(poll_user_params) - normal_status(0, "问卷提交成功！") + @poll_multi_questions = @poll.poll_questions.where(question_type:2).select(:id,:max_choices,:min_choices,:question_number) + error_question = [] + @poll_multi_questions.each do |q| + poll_user_votes = current_user.poll_votes.where(question_id:q.id)&.size + if q.max_choices.present? && (poll_user_votes > q.max_choices) + error_messages = "第#{q.question_number}题：超过最大选项限制" + elsif q.min_choices.present? && (poll_user_votes < q.min_choices) + error_messages = "第#{q.question_number}题：不得少于最小选项限制" + else + error_messages = nil + end + error_question.push(error_messages) + end + error_question = error_question.reject(&:blank?) + if error_question.reject(&:blank?).length > 0 + normal_status(-1, "#{error_question.join("\n")}") + else + poll_user_current = @poll.poll_users.find_by_group_ids(current_user.id).first + poll_user_params = { + :commit_status => 1, + :end_at => Time.now + } + poll_user_current.update_attributes(poll_user_params) + normal_status(0, "问卷提交成功！") + end ## 需添加发送消息的接口，稍后添加 rescue Exception => e uid_logger_error(e.message) From fdea2203a46ffc8be595108cfcae6a3b5dd0ec79 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 27 Jul 2019 11:30:57 +0800 Subject: [PATCH 13/33] answer_percent --- public/react/src/modules/courses/poll/PollDetailTabSecond.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollDetailTabSecond.js b/public/react/src/modules/courses/poll/PollDetailTabSecond.js index a6a2b6b62..45b3c1583 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabSecond.js +++ b/public/react/src/modules/courses/poll/PollDetailTabSecond.js @@ -127,9 +127,9 @@ class PollDetailTabSecond extends Component{ {options.answer_users_count}

- +

- {parseFloat(options.answer_percent ? options.answer_percent : 0 ).toFixed(2)*100} % + {options.answer_percent * 100}% { From 969ae735d0a53f31ce16d3fae72871bf5a866e3f Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 27 Jul 2019 11:33:47 +0800 Subject: [PATCH 14/33] current_user --- public/react/src/modules/courses/poll/PollDetailIndex.js | 2 +- public/react/src/modules/courses/poll/PollNew.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollDetailIndex.js b/public/react/src/modules/courses/poll/PollDetailIndex.js index 9119b7902..6106e5ea2 100644 --- a/public/react/src/modules/courses/poll/PollDetailIndex.js +++ b/public/react/src/modules/courses/poll/PollDetailIndex.js @@ -123,7 +123,7 @@ class PollDetailIndex extends Component{ />

- {this.props.coursedata.name} + {this.props.coursedata.name} > 问卷 > diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index 705b1658c..be904afe7 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -2322,7 +2322,7 @@ class PollNew extends Component { gotohome=()=>{ const { current_user} = this.props - this.props.history.push(current_user.first_category_url); + this.props.history.push(current_user && current_user.first_category_url); // let courseId=this.props.match.params.coursesId; From 8ea7e46fb57978ffd311e67240b51550d8771dbe Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 27 Jul 2019 11:35:00 +0800 Subject: [PATCH 15/33] current_user --- public/react/src/modules/courses/poll/PollInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/poll/PollInfo.js b/public/react/src/modules/courses/poll/PollInfo.js index f32d652c2..22c1f542e 100644 --- a/public/react/src/modules/courses/poll/PollInfo.js +++ b/public/react/src/modules/courses/poll/PollInfo.js @@ -315,7 +315,7 @@ class PollInfo extends Component{ >

- {courseName} + {courseName} > 问卷 > From f2acf4b2c7e12e2491770542a64c0aa157d3aed3 Mon Sep 17 00:00:00 2001 From: SylorHuang Date: Sat, 27 Jul 2019 11:40:52 +0800 Subject: [PATCH 16/33] fixbug --- app/controllers/polls_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index a89544669..5aecaadb0 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -899,7 +899,7 @@ class PollsController < ApplicationController @poll_multi_questions = @poll.poll_questions.where(question_type:2).select(:id,:max_choices,:min_choices,:question_number) error_question = [] @poll_multi_questions.each do |q| - poll_user_votes = current_user.poll_votes.where(question_id:q.id)&.size + poll_user_votes = current_user.poll_votes.where(poll_question_id:q.id)&.size if q.max_choices.present? && (poll_user_votes > q.max_choices) error_messages = "第#{q.question_number}题：超过最大选项限制" elsif q.min_choices.present? && (poll_user_votes < q.min_choices) From acfde4ae2f50741b4d1d16180bcfc0aa52d49ee8 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 27 Jul 2019 11:43:43 +0800 Subject: [PATCH 17/33] toFixed(1) --- public/react/src/modules/courses/poll/PollDetailTabSecond.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollDetailTabSecond.js b/public/react/src/modules/courses/poll/PollDetailTabSecond.js index 45b3c1583..b3a1e829c 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabSecond.js +++ b/public/react/src/modules/courses/poll/PollDetailTabSecond.js @@ -127,9 +127,9 @@ class PollDetailTabSecond extends Component{ {options.answer_users_count}

- +

- {options.answer_percent * 100}% + {(options.answer_percent * 100).toFixed(1)}% { From d65bb1cb0366b1dc3ccfdd4ea816317d26c7bc3b Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 27 Jul 2019 11:53:16 +0800 Subject: [PATCH 18/33] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=AE=A1=E7=90=86=E5=91=98=E8=83=BD=E5=A4=9F?= =?UTF-8?q?=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/edu_settings_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/edu_settings_controller.rb b/app/controllers/edu_settings_controller.rb index 0d80cbf3d..6baf38e5b 100644 --- a/app/controllers/edu_settings_controller.rb +++ b/app/controllers/edu_settings_controller.rb @@ -1,5 +1,5 @@ class EduSettingsController < ApplicationController - # before_action :require_admin + before_action :require_admin before_action :set_edu_setting, only: [:show, :edit, :update, :destroy] # GET /edu_settings From 0ad641843d5b0792c2fb7b47986e1418c8f810a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 27 Jul 2019 11:55:59 +0800 Subject: [PATCH 19/33] =?UTF-8?q?=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/poll/PollNew.js | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index 705b1658c..82d06a991 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -844,12 +844,12 @@ class PollNew extends Component { if (object.question.question_type === 2) { if (object.question.max_choices > 0) { - if (object.question.min_choices < 2) { - this.props.showNotification(`可选最小不能少于2个`); - - return; - - } + // if (object.question.min_choices < 2) { + // this.props.showNotification(`可选最小不能少于2个`); + // + // return; + // + // } } } @@ -1332,10 +1332,10 @@ class PollNew extends Component { if (object.question.question_type === 2) { if (object.question.max_choices > 0) { - if (object.question.min_choices < 2) { - this.props.showNotification(`可选最小不能少于2个`); - return; - } + // if (object.question.min_choices < 2) { + // this.props.showNotification(`可选最小不能少于2个`); + // return; + // } } } if (object.question.new === "new") { @@ -2108,14 +2108,17 @@ class PollNew extends Component { } //最大值 - HandleGradationGroupChangeee = (value, index) => { - + HandleGradationGroupChangeee = (value, index,minchoices) => { + // console.log(value); let arr = this.state.adddom; for (var i = 0; i < arr.length; i++) { if (index === i) { + arr[i].question.min_choices= minchoices===null?0:minchoices===undefined?0:parseInt(minchoices); arr[i].question.max_choices = parseInt(value); } } + // console.log(2119); + // console.log(arr); this.setState({ adddom: arr }) @@ -2772,7 +2775,7 @@ class PollNew extends Component { className="ml10 mr10 color-grey-6 lineh-40 fl">~ {/*可选最大*/} this.HandleGradationGroupChangeee(value, indexo)} + onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices)} value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices} > @@ -3267,7 +3270,7 @@ class PollNew extends Component { className="ml10 mr10 color-grey-6 lineh-40 fl">~ {/*可选最大*/}