From 49220499fa5b068f477847423e5ace5f471d5fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 17:36:52 +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 --- .../completetaskdetails/Completetaskpage.js | 2 +- .../comtopicdetails/CompletetopicdePage.js | 2 +- .../courses/groupjobbank/GroupjobbankPage.js | 4 +-- .../questionbank/Generaljobbankdetails.js | 4 +-- .../src/modules/user/usersInfo/InfosTopics.js | 4 +-- .../usersInfo/banks/ExerciseBanksDetail.js | 2 +- .../user/usersInfo/banks/GtaskBanksEdit.js | 2 +- .../user/usersInfo/banks/GtopicBanksEdit.js | 2 +- .../user/usersInfo/banks/HomeworkBanksEdit.js | 2 +- .../modules/user/usersInfo/banks/banksMenu.js | 30 ++++++++++++++++--- 10 files changed, 38 insertions(+), 16 deletions(-) diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js index 3c443c741..e2a209cb7 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}`,content:'内容详情'}, + {to:`/banks/gtask/${workids}/${this.props.match.params.type}?tab=0`,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 40234af18..a9bec86b0 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}`,content:'内容详情'}, + {to:`/banks/gtopic/${workids}/${this.props.match.params.type}?tab=0`,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 c4812756a..c50b3a9a2 100644 --- a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js +++ b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js @@ -79,8 +79,8 @@ class GroupjobbankPage extends Component { const menuData={ tab:'0',//tab选中的index menuArray:[//tab以及tab路由 - {to:`/banks/group/${workids}/${this.props.match.params.type}/details`,content:'内容详情'}, - {to:`/banks/group/${workids}/${this.props.match.params.type}/answer`,content:'参考答案'} + {to:`/banks/group/${workids}/${this.props.match.params.type}?tab=0`,content:'内容详情'}, + {to:`/banks/group/${workids}/${this.props.match.params.type}/answer?tab=1`,content:'参考答案'} ], category:'group',//毕设选题 tos:`/banks/group/${workids}/edit/${this.props.match.params.type}`, diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js index 485911520..0eddb7799 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js +++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js @@ -79,8 +79,8 @@ class Generaljobbankdetails extends Component { const menuData={ tab:'0',//tab选中的index menuArray:[//tab以及tab路由 - {to:`/banks/normal/${workids}/${this.props.match.params.type}/details`,content:'内容详情'}, - {to:`/banks/normal/${workids}/${this.props.match.params.type}/answer`,content:'参考答案'} + {to:`/banks/normal/${workids}/${this.props.match.params.type}?tab=0`,content:'内容详情'}, + {to:`/banks/normal/${workids}/${this.props.match.params.type}/answer?tab=1`,content:'参考答案'} ], category:'normal',//毕设选题 tos:`/banks/normal/${workids}/edit/${this.props.match.params.type}`, diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index 382abdd47..60a37be61 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -519,8 +519,8 @@ class InfosTopics extends Component{ 55?item.name:""} className="ml10 fl mt3 font-16 color-dark maxwidth900" href={ - category==="normal"?`/banks/normal/${item.id}/${types}/details`: - category==="group"?`/banks/group/${item.id}/${types}/details`: + category==="normal"?`/banks/normal/${item.id}/${types}?tab=0`: + category==="group"?`/banks/group/${item.id}/${types}?tab=0`: category==="poll"?`/banks/poll/${item.id}/${types}`: category==="exercise"?`/banks/exercise/${item.id}/${types}`: category==="gtask"?`/banks/gtask/${item.id}/${types}`: diff --git a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js index 071d036a3..2fee1f511 100644 --- a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js +++ b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js @@ -27,7 +27,7 @@ class ExerciseBanksDetail extends Component{ const menuData={ tab:'0',//tab选中的index menuArray:[//tab以及tab路由 - {to:`/banks/exercise/${Id}/${this.props.match.params.type}`,content:'内容详情'} + {to:`/banks/exercise/${Id}/${this.props.match.params.type}?tab=0`,content:'内容详情'} ], category:'exercise',// tos: `/banks/exercise/${Id}/edit/${this.props.match.params.type}`, diff --git a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js index 4c3bc4e24..4aa29a4c4 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js @@ -25,7 +25,7 @@ class GtaskBanksEdit extends Component { title:'编辑', is_public:result && result.data && result.data.is_public, crumbArray:[ - {to:`/banks/gtask/${workId}/${this.props.match.params.type}`,content:'详情'}, + {to:`/banks/gtask/${workId}/${this.props.match.params.type}?tab=0`,content:'详情'}, {content:'编辑'} ] } diff --git a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js index 87be40195..2ebf753d7 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js @@ -24,7 +24,7 @@ class GtopicBanksEdit extends Component{ title:'编辑', is_public:result && result.data.selected_data && result.data.selected_data.is_public, crumbArray:[ - {to:`/banks/gtopic/${bankId}/${this.props.match.params.type}`,content:'详情'}, + {to:`/banks/gtopic/${bankId}/${this.props.match.params.type}?tab=0`,content:'详情'}, {content:'编辑'} ] } diff --git a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js index 25133f547..1768101c8 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}`,content:'详情'}, + {to:`/banks/${this.getModuleName()}/${workId}/${this.props.match.params.type}?tab=0`,content:'详情'}, {content:'编辑'} ] } diff --git a/public/react/src/modules/user/usersInfo/banks/banksMenu.js b/public/react/src/modules/user/usersInfo/banks/banksMenu.js index 60fbba14b..1c753450b 100644 --- a/public/react/src/modules/user/usersInfo/banks/banksMenu.js +++ b/public/react/src/modules/user/usersInfo/banks/banksMenu.js @@ -25,10 +25,32 @@ class BanksMenu extends Component{ }) } componentDidMount() { - let { banksMenu} = this.props; - this.setState({ - tab:banksMenu && banksMenu.tab?[String(banksMenu.tab)]:['0'], - }) + debugger + try { + const query = this.props.location.search; + const type = query.split('?tab='); + if(type[1]===undefined){ + this.setState({ + tab:['0'], + }); + }else{ + if(type[1]==="0"){ + this.setState({ + tab:['0'], + }); + }else if(type[1]==="1"){ + this.setState({ + tab:['1'], + }); + } + } + + }catch (e) { + this.setState({ + tab:['0'], + }); + } + } topicscancelmodel=()=>{