From 88224a8f8c3c075cfc92aa33636d17678e8ae602 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, 31 Aug 2019 15:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/poll/PollNewQuestbank.js  | 26 +++++++++----------
 .../user/usersInfo/banks/PollBanksContent.js  |  2 +-
 .../modules/user/usersInfo/banks/banksMenu.js |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js
index 9e5882db0..482eb6f6b 100644
--- a/public/react/src/modules/courses/poll/PollNewQuestbank.js
+++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js
@@ -2858,7 +2858,7 @@ class PollNewQuestbank extends Component {
 															let resultDomtwo;
 															resultDomtwo =
 																<div>
-																	<span className="color-grey-6">{item.question.question_number}、</span>
+																	<span className="color-grey-6">{itemo&&itemo.question&&itemo.question.question_number}、</span>
 																	<span
 																		id={"ceshiyong3"}
 																		className="font-16 color-grey-6 mb20">{itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"}
@@ -2951,12 +2951,12 @@ class PollNewQuestbank extends Component {
 																								{
 																									itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ?
 
-																										<a className="lineh-40 "
+																										<a className="lineh-40 ml10"
 																											 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																											title="新增" placement={"bottom"}><i
 																											className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
 																										: itemo.question.answers.length - 1 === indext ?
-																										<a className="lineh-40 "
+																										<a className="lineh-40 ml10"
 																											 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																											title="新增" placement={"bottom"}><i
 																											className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
@@ -2965,7 +2965,7 @@ class PollNewQuestbank extends Component {
 																								}
 																									</span>
 																							: indext === 1 && itemo.question.answers.length === 2 || indext === 1 && itemo.question.answers.length === 3 ?
-																							<a className="lineh-40 mr10"
+																							<a className="lineh-40 ml10"
 																								 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																								title="新增" placement={"bottom"}><i
 																								className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> : ""
@@ -3161,7 +3161,7 @@ class PollNewQuestbank extends Component {
 															let resultDomtwo;
 															resultDomtwo =
 																<div>
-																	<span className="color-grey-6">{item.question.question_number}、</span>
+																	<span className="color-grey-6">{itemo&&itemo.question&&itemo.question.question_number}、</span>
 
 																	<span
 																		id={"ceshiyong1"}
@@ -3260,12 +3260,12 @@ class PollNewQuestbank extends Component {
 																								className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
 																								{
 																									itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ?
-																										<a className="lineh-40 "
+																										<a className="lineh-40 ml10"
 																											 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																											title="新增" placement={"bottom"}><i
 																											className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
 																										: itemo.question.answers.length - 1 === indext ?
-																										<a className="lineh-40 "
+																										<a className="lineh-40 ml10"
 																											 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																											title="新增" placement={"bottom"}><i
 																											className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
@@ -3275,7 +3275,7 @@ class PollNewQuestbank extends Component {
 																								}
 																									</span>
 																							: indext === 1 && itemo.question.answers.length === 2 || indext === 1 && itemo.question.answers.length === 3 ?
-																							<a className="lineh-40 mr10"
+																							<a className="lineh-40 ml10"
 																								 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																								title="新增" placement={"bottom"}><i
 																								className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> : ""
@@ -3484,7 +3484,7 @@ class PollNewQuestbank extends Component {
 											let resultDomtwo;
 											resultDomtwo =
 												<div className="problemShow">
-													<span className="color-grey-6">{item.question.question_number}、</span>
+													<span className="color-grey-6">{itemo&&itemo.question&&itemo.question.question_number}、</span>
 													<span
 														id={"ceshiyong2"}
 														className="font-16 color-grey-6 mb20">{itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"}
@@ -3571,17 +3571,17 @@ class PollNewQuestbank extends Component {
 																			 <a className="lineh-40 mr10"
 																					onClick={() => this.Deleteentrys(arrid, indext, false)}><Tooltip
 																				 title="删除" placement={"bottom"}><i
-																				 className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
+																				 className="iconfont icon-htmal5icon19 font-22 color-grey-c "></i></Tooltip></a>
 																				{
 																					itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ?
-																						<a className="lineh-40 "
+																						<a className="lineh-40 ml10"
 																							 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																							title="新增"
 																							placement={"bottom"}><i
 																							className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
 																						:
 																						itemo.question.answers.length - 1 === indext ?
-																							<a className="lineh-40 "
+																							<a className="lineh-40 ml10"
 																								 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																								title="新增"
 																								placement={"bottom"}><i
@@ -3593,7 +3593,7 @@ class PollNewQuestbank extends Component {
 																				}
 																					 </span>
 																			: indext === 1 && itemo.question.answers.length === 2 || indext === 1 && itemo.question.answers.length === 3 ?
-																				<a className="lineh-40 mr10"
+																				<a className="lineh-40 ml10"
 																					 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																					title="新增"
 																					placement={"bottom"}><i
diff --git a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
index cd8848b72..db18c696d 100644
--- a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
+++ b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
@@ -39,8 +39,8 @@ class PollBanksContent extends Component{
             {to:`/banks/poll/${bankId}`,content:'内容详情'}
           ],
           category:'poll',//毕设选题
+          tos:`/banks/poll/${bankId}/edit`,
           id:bankId,
-          edit:'editpoll'
 
         }
         this.props.initPublic(crumbData,menuData);
diff --git a/public/react/src/modules/user/usersInfo/banks/banksMenu.js b/public/react/src/modules/user/usersInfo/banks/banksMenu.js
index bcd79406b..d67760717 100644
--- a/public/react/src/modules/user/usersInfo/banks/banksMenu.js
+++ b/public/react/src/modules/user/usersInfo/banks/banksMenu.js
@@ -32,7 +32,7 @@ class BanksMenu extends Component{
         
         <span className="fr mt18">
           <WordsBtn to={''} style="blue" className="ml20 font-16">删除</WordsBtn>
-          <WordsBtn to={''} style="blue" className="ml20 font-16">编辑</WordsBtn>
+          <WordsBtn to={banksMenu&&banksMenu.category==='poll'?banksMenu.tos:""} style="blue" className="ml20 font-16">编辑</WordsBtn>
           <WordsBtn to={''} style="blue" className="ml20 font-16">发送</WordsBtn>
         </span>
       </div>