From 83bc320c73504f17c042717f92fa2eacf62960f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 2 Sep 2019 15:17:15 +0800
Subject: [PATCH] =?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 | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index ce9522b57..01d9f7a50 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2963,7 +2963,7 @@ class PollNew extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																						<div className="mr40 flex1 ">
-																							{/*可选最小*/}
+																							{/*可选最小1*/}
 																							<style>
 																								{
 																									`
@@ -2982,7 +2982,6 @@ class PollNew extends Component {
 																							<Select className="fl  w100"
 																											onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
 																											value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
-
 																							>
 																								<Option value={"0"}>--</Option>
 																								{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -2993,7 +2992,7 @@ class PollNew extends Component {
 																							</Select>
 																							<span
 																								className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																							{/*可选最大*/}
+																							{/*可选最大1*/}
 																							<Select className="fl w100"
 																											onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices,itemo.question.answers.length)}
 																											value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
@@ -3206,7 +3205,7 @@ class PollNew extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																							<div className="mr40 flex1 ">
-																								{/*可选最小*/}
+																								{/*可选最小2*/}
 																								<style>
 																									{
 																										`
@@ -3224,8 +3223,7 @@ class PollNew extends Component {
 																								</style>
 																								<Select className="fl  w100"
 																												onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																												value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
-
+																												value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
 																								>
 																									<Option value={String("0")}>--</Option>
 																									{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3236,10 +3234,10 @@ class PollNew extends Component {
 																								</Select>
 																								<span
 																									className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																								{/*可选最大*/}
+																								{/*可选最大2*/}
 																								<Select className="fl w100"
 																												onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices,itemo.question.answers.length)}
-																												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}
+																												value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
 																								>
 																									<Option value={String("0")}>--</Option>
 																									{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3458,7 +3456,7 @@ class PollNew extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																				<div className="mr40 flex1 ">
-																					{/*可选最小*/}
+																					{/*可选最小3*/}
 																					<style>
 																						{
 																							`
@@ -3476,8 +3474,7 @@ class PollNew extends Component {
 																					</style>
 																					<Select className="fl  w100"
 																									onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																									value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
-
+																									value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
 																					>
 																						<Option value={String("0")}>--</Option>
 																						{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3488,10 +3485,10 @@ class PollNew extends Component {
 																					</Select>
 																					<span
 																						className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																					{/*可选最大*/}
+																					{/*可选最大3*/}
 																					<Select className="fl w100"
 																									onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices,itemo.question.answers.length)}
-																									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}
+																									value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
 																					>
 																						<Option value={String("0")}>--</Option>
 																						{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {