From e7474bd4abba44504d1620f3ddf71f7129fd7722 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Sat, 7 Sep 2019 10:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=81=8C=E4=B8=9A=E8=AE=A4=E8=AF=81-?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=BF=9B=E5=85=A5=E9=A2=98=E5=BA=93=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= 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 +- public/react/src/modules/courses/poll/PollNewQuestbank.js | 2 +- .../modules/courses/questionbank/Generaljobbankdetails.js | 2 +- public/react/src/modules/user/usersInfo/banks/BanksIndex.js | 5 ++++- .../react/src/modules/user/usersInfo/banks/BanksTabIndex.js | 4 ++-- .../src/modules/user/usersInfo/banks/ExerciseBanksDetail.js | 2 +- .../src/modules/user/usersInfo/banks/ExerciseBanksEdit.js | 2 +- .../react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js | 2 +- .../src/modules/user/usersInfo/banks/GtopicBanksEdit.js | 3 +-- .../src/modules/user/usersInfo/banks/HomeworkBanksEdit.js | 2 +- .../src/modules/user/usersInfo/banks/PollBanksContent.js | 2 +- 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js index 043d02470..9cfab4aa5 100644 --- a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js +++ b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js @@ -87,7 +87,7 @@ class Completetaskpage extends Component { this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js index 818a141d2..be1241163 100644 --- a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js +++ b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js @@ -82,7 +82,7 @@ class CompletetopicdePage extends Component { this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js index f8853703f..873c4c1e6 100644 --- a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js +++ b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js @@ -92,7 +92,7 @@ class GroupjobbankPage extends Component { this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index e29acfc55..b38bfccfd 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -302,7 +302,7 @@ class PollNewQuestbank extends Component { {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js index 9c70ecf95..7aef5f743 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js +++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js @@ -93,7 +93,7 @@ class Generaljobbankdetails extends Component { this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js index 0698048f2..e921022c3 100644 --- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js +++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js @@ -85,7 +85,10 @@ class BanksIndex extends Component{ } - initPublic = (crumbData) =>{ + initPublic = (crumbData,data) =>{ + if(data && data.status && data.status == -2){ + this.props.history.push(`/topicbank/publicly`); + } this.setState({ crumbData }) diff --git a/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js index e7202ded5..e38bb5de8 100644 --- a/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js +++ b/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js @@ -31,11 +31,11 @@ class BanksTabIndex extends Component{ } } - initPublic = (crumbData,menuData) =>{ + initPublic = (crumbData,menuData,data) =>{ this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,data); } render(){ diff --git a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js index 2fee1f511..00fb830db 100644 --- a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js +++ b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js @@ -36,7 +36,7 @@ class ExerciseBanksDetail extends Component{ type:this.props.match.params.type, authorize:result && result.data && result.data.authorize, } - this.props.initPublic(crumbData,menuData); + this.props.initPublic(crumbData,menuData,result.data); } render(){ diff --git a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js index 723761277..94d093454 100644 --- a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js @@ -29,7 +29,7 @@ class ExerciseBanksEdit extends Component { {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,responseData.data); } render(){ diff --git a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js index d7e433de3..8209effa4 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js @@ -29,7 +29,7 @@ class GtaskBanksEdit extends Component { {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,result.data); result.data.isEdit = true; this.setState({ data:result.data}) this.newWorkFormRef.initValue(result.data); diff --git a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js index 4a9163304..a03a5b533 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js @@ -12,7 +12,6 @@ class GtopicBanksEdit extends Component{ } componentDidMount = () =>{ let bankId = this.props.match.params.bankId; - this.initData(bankId); } @@ -28,7 +27,7 @@ class GtopicBanksEdit extends Component{ {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,result.data); this.GraduateTopicNewFromRef.initValue(result); } diff --git a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js index fa48361f6..33a981141 100644 --- a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js @@ -30,7 +30,7 @@ class HomeworkBanksEdit extends Component { {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,result.data); result.data.isEdit = true; result.data.ref_attachments = result.data.reference_attachments // this.setState({ isGroup: result.data.min_num || result.data.max_num }) diff --git a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js index c9d2d48c3..be6bd5e2c 100644 --- a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js +++ b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js @@ -47,7 +47,7 @@ class PollBanksContent extends Component{ type:this.props.match.params.type, authorize:result && result.data && result.data.authorize, } - this.props.initPublic(crumbData,menuData); + this.props.initPublic(crumbData,menuData,result.data); this.setState({ pollDetail })