diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
index e2b1e29e1..592d78bdd 100644
--- a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
+++ b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js
@@ -75,7 +75,7 @@ class Completetaskpage extends Component {
const menuData={
tab:'0',//tab选中的index
menuArray:[//tab以及tab路由
- {to:`/banks/gtask/${workids}/${this.props.match.params.type}/details`,content:'内容详情'},
+ {to:`/banks/gtask/${workids}/${this.props.match.params.type}`,content:'内容详情'},
],
category:'gtask',//毕设选题
tos:`/banks/gtask/${workids}/edit/${this.props.match.params.type}`,
diff --git a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
index 2235c5a1e..b7be811ba 100644
--- a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
+++ b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js
@@ -70,7 +70,7 @@ class CompletetopicdePage extends Component {
const menuData={
tab:'0',//tab选中的index
menuArray:[//tab以及tab路由
- {to:`/banks/gtopic/${workids}/${this.props.match.params.type}/details`,content:'内容详情'},
+ {to:`/banks/gtopic/${workids}/${this.props.match.params.type}`,content:'内容详情'},
],
category:'gtopic',//毕设选题
tos:`/banks/gtopic/${workids}/edit/${this.props.match.params.type}`,
diff --git a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
index 394477a7d..b80b94712 100644
--- a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
+++ b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js
@@ -147,19 +147,18 @@ class GroupjobbankPage extends Component {
>
}
- {
- return ()
+ return ()
}
}>
- {
- return ()
+ return ()
}
}>
-
)
diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js
index b739e358f..c087e4f06 100644
--- a/public/react/src/modules/courses/poll/PollNewQuestbank.js
+++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js
@@ -539,6 +539,14 @@ class PollNewQuestbank extends Component {
}
answers.push(answerstwo);
}
+ if(anserbool===false){
+ let answersysltwo = {
+ "answer_id": parseInt(object.question.answers[object.question.answers.length-1].answer_id)+1,
+ "answer_position": parseInt(object.question.answers[object.question.answers.length-1].answer_position)+1,
+ "answer_text": "其他"
+ }
+ answers.push(answersysltwo);
+ }
questiontwo = {
"id": object.question.id,
"is_necessary": object.question.is_necessary,
@@ -2116,14 +2124,14 @@ class PollNewQuestbank extends Component {
if(result.data){
if (result.data.status === 0) {
this.props.showNotification(`上移成功`);
- let arr = this.state.poll_questions;
- let newarr = [...arr];
- let temp = newarr[index - 1];
- newarr[index - 1] = newarr[index];
- newarr[index] = temp;
- this.setState({
- poll_questions: newarr,
- });
+ // let arr = this.state.poll_questions;
+ // let newarr = [...arr];
+ // let temp = newarr[index - 1];
+ // newarr[index - 1] = newarr[index];
+ // newarr[index] = temp;
+ // this.setState({
+ // poll_questions: newarr,
+ // });
thiss.thisinitializationdatanew();
}else{
this.props.showNotification(`上移失败`);
@@ -2150,14 +2158,14 @@ class PollNewQuestbank extends Component {
if (result.data.status === 0) {
// message.success("下移题目成功", 1)
this.props.showNotification(`下移成功`);
- let arr = this.state.poll_questions;
- let newarr = [...arr];
- let temp = newarr[index + 1];
- newarr[index + 1] = newarr[index];
- newarr[index] = temp;
- this.setState({
- poll_questions: newarr,
- });
+ // let arr = this.state.poll_questions;
+ // let newarr = [...arr];
+ // let temp = newarr[index + 1];
+ // newarr[index + 1] = newarr[index];
+ // newarr[index] = temp;
+ // this.setState({
+ // poll_questions: newarr,
+ // });
thiss.thisinitializationdatanew();
}else {
this.props.showNotification(`下移失败`);
@@ -3188,7 +3196,17 @@ class PollNewQuestbank extends Component {
}}
onInput={(e) => this.HandleInputChanges(e, indexo, indext)}>
{this.state.polls_status === undefined || this.state.polls_status === 1 ?
- indext > 1 ?
+ (itemo.question.question_type === 2 && itemo.question.answers.length === 3 ?
+ (indext ===1?
+ this.Ewoption(itemo.question.id, itemo)}>
+ :
+ ""
+ )
+ :
+ itemo.question.answers.length > 2 &&indext>1?
this.Deleteentrys(arrid, indext, false)}>
}
- : indext === 1 && itemo.question.answers.length === 2 || indext === 1 && itemo.question.answers.length === 3 ?
- this.Ewoption(itemo.question.id, itemo)}> : ""
+ :itemo.question.answers.length === 2?
+ (indext ===1?
+ this.Ewoption(itemo.question.id, itemo)}>
+ :"")
+ : "")
: ""}
)}
@@ -3441,6 +3462,10 @@ class PollNewQuestbank extends Component {
{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
console.log("chishiyong1");
console.log(itemo.question.answers[itemo.question.answers.length - 1]);
+ // var bools=true;
+ // if(){
+ //
+ // }
return (
@@ -3810,7 +3846,16 @@ class PollNewQuestbank extends Component {
}}
onInput={(e) => this.HandleInputChanges(e, indexo, indext)}>
{polls_status === undefined || polls_status === 1 ?
- (indext > 1 ?
+ (itemo.question.question_type === 2&& itemo.question.answers.length === 3 ?
+ (indext ===1?
+ this.Ewoption(itemo.question.id, itemo)}>
+ :"")
+ :
+ itemo.question.answers.length > 2 && indext>1 ?
this.Deleteentrys(arrid, indext, false)}>
}
- : indext === 1 && itemo.question.answers.length === 2 || indext === 1 && itemo.question.answers.length === 3 ?
- this.Ewoption(itemo.question.id, itemo)}> : "")
+ : itemo.question.answers.length === 2?
+ (indext ===1?
+ this.Ewoption(itemo.question.id, itemo)}>
+ :"")
+
+ : "")
: ""}
)}
diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
index 63b447dec..d09d35d03 100644
--- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
+++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js
@@ -144,16 +144,16 @@ class Generaljobbankdetails extends Component {
>
}
- {
- return ()
+ return ()
}
}>
- {
- return ()
+ return ()
}
}>
diff --git a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
index fa48361f6..25133f547 100644
--- a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
+++ b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
@@ -26,7 +26,7 @@ class HomeworkBanksEdit extends Component {
title:'编辑',
is_public:result && result.data && result.data.is_public,
crumbArray:[
- {to:`/banks/${this.getModuleName()}/${workId}/${this.props.match.params.type}?tab=0`,content:'详情'},
+ {to:`/banks/${this.getModuleName()}/${workId}/${this.props.match.params.type}`,content:'详情'},
{content:'编辑'}
]
}
@@ -64,7 +64,7 @@ class HomeworkBanksEdit extends Component {
return this.props.isGroup ? 'group' : 'normal'
}
toWorkDetail = () => {
- this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}/${this.props.match.params.type}?tab=0`)
+ this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}/${this.props.match.params.type}`)
this.props.initPublic(undefined);
}
onCancel = () => {