From 904ed0cbe19d5fcb690344132def839473e7c493 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:40:50 +0800 Subject: [PATCH 1/2] =?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/usersInfo/banks/HomeworkBanksEdit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js index 1768101c8..fa48361f6 100644 --- a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js @@ -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}`) + this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}/${this.props.match.params.type}?tab=0`) this.props.initPublic(undefined); } onCancel = () => { From 5743bb532caf416d9629d81cec50d49392c08f11 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:44:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/completetaskdetails/Completetaskpage.js | 2 +- .../modules/courses/comtopicdetails/CompletetopicdePage.js | 2 +- .../src/modules/courses/groupjobbank/GroupjobbankPage.js | 2 +- .../src/modules/courses/questionbank/Generaljobbankdetails.js | 2 +- public/react/src/modules/user/usersInfo/InfosTopics.js | 4 ++-- .../react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js | 2 +- .../react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js index e2a209cb7..043d02470 100644 --- a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js +++ b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js @@ -78,7 +78,7 @@ class Completetaskpage extends Component { {to:`/banks/gtask/${workids}/${this.props.match.params.type}?tab=0`,content:'内容详情'}, ], category:'gtask',//毕设选题 - tos:`/banks/gtask/${workids}/edit/${this.props.match.params.type}`, + tos:`/banks/gtask/${workids}/edit/${this.props.match.params.type}?tab=0`, id:workids, is_public:response && response.data && response.data.is_public, type: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 a9bec86b0..818a141d2 100644 --- a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js +++ b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js @@ -73,7 +73,7 @@ class CompletetopicdePage extends Component { {to:`/banks/gtopic/${workids}/${this.props.match.params.type}?tab=0`,content:'内容详情'}, ], category:'gtopic',//毕设选题 - tos:`/banks/gtopic/${workids}/edit/${this.props.match.params.type}`, + tos:`/banks/gtopic/${workids}/edit/${this.props.match.params.type}?tab=0`, id:workids, is_public:response && response.data && response.data.is_public, type: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 c50b3a9a2..f8853703f 100644 --- a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js +++ b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js @@ -83,7 +83,7 @@ class GroupjobbankPage extends Component { {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}`, + tos:`/banks/group/${workids}/edit/${this.props.match.params.type}?tab=0`, id:workids, is_public:response && response.data && response.data.is_public, type: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 0eddb7799..9c70ecf95 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js +++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js @@ -83,7 +83,7 @@ class Generaljobbankdetails extends Component { {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}`, + tos:`/banks/normal/${workids}/edit/${this.props.match.params.type}?tab=0`, id:workids, is_public:response && response.data && response.data.is_public, type: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 c4965cfbc..8f9c394a5 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -524,8 +524,8 @@ class InfosTopics extends Component{ 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}`: - category==="gtopic"?`/banks/gtopic/${item.id}/${types}`:"" + category==="gtask"?`/banks/gtask/${item.id}/${types}?tab=0`: + category==="gtopic"?`/banks/gtopic/${item.id}/${types}?tab=0`:"" } > {item.name} diff --git a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js index 4aa29a4c4..16ecea151 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js @@ -59,7 +59,7 @@ class GtaskBanksEdit extends Component { }); } toWorkDetail = () => { - this.props.history.push(`/banks/gtask/${this.props.match.params.workId}/${this.props.match.params.type}`); + this.props.history.push(`/banks/gtask/${this.props.match.params.workId}/${this.props.match.params.type}?tab=0`); this.props.initPublic(undefined); } onCancel = () => { diff --git a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js index 2ebf753d7..4a9163304 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js @@ -47,7 +47,7 @@ class GtopicBanksEdit extends Component{ axios.put(url,params).then((result)=>{ if(result){ this.props.showNotification('保存成功！'); - this.props.history.push(`/banks/gtopic/${bankId}/${this.props.match.params.type}`); + this.props.history.push(`/banks/gtopic/${bankId}/${this.props.match.params.type}?tab=0`); } }).catch((error)=>{ console.log(error); @@ -56,7 +56,7 @@ class GtopicBanksEdit extends Component{ // 取消 editCancel = () =>{ - this.props.history.push(`/banks/gtopic/${this.props.match.params.bankId}/${this.props.match.params.type}`); + this.props.history.push(`/banks/gtopic/${this.props.match.params.bankId}/${this.props.match.params.type}?tab=0`); this.props.initPublic(undefined); }