From f08757a17fb9cda4c345882228d42283c4e3b0f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 30 Aug 2019 16:45:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?url=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/usersInfo/InfosTopics.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index 9b0e2948e..03b71b858 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -373,11 +373,10 @@ class InfosTopics extends Component{ 个人题库 公共题库 :
我的题库 + >我的题库 公共题库 From e0977396fec413be86b18f9e85ac9c82aad361e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 30 Aug 2019 17:05:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?url=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/user/usersInfo/InfosTopics.js | 10 ++-- .../user/usersInfo/banks/BanksIndex.js | 60 ++++++++++--------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index 03b71b858..167ce14de 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -471,7 +471,7 @@ class InfosTopics extends Component{ category==="normal"?`/banks/normal/${item.id}?tab=0`: category==="group"?`/banks/group/${item.id}?tab=0`: category==="poll"?`/banks/poll/${item.id}`: - category==="exercise"?``: + category==="exercise"?`/banks/exercise/${item.id}`: category==="gtask"?`/banks/gtask/${item.id}`: category==="gtopic"?`/banks/gtopic/${item.id}`:"" } @@ -498,11 +498,11 @@ class InfosTopics extends Component{
{types==="personal"?user_id===targetuserid&&user_type!="学生"? 编辑 diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js index aac2a0fc5..a39904298 100644 --- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js +++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js @@ -7,12 +7,10 @@ import { SnackbarHOC } from 'educoder'; import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC'; import { CNotificationHOC } from '../../../courses/common/CNotificationHOC' - import "../usersInfo.css" import "../../../courses/css/members.css" import "../../../courses/css/Courses.css" - import Loadable from 'react-loadable'; import Loading from '../../../../Loading'; @@ -110,14 +108,6 @@ class BanksIndex extends Component{

- {/*毕设任务编辑*/} - { - return () - } - }> - - { - return () - } - }> - { + return () + } + }> + + {/*题库问卷编辑详情*/} + () + } + > + + + { return () } }> - {/*题库问卷编辑详情*/} - () - } - > + {/*毕设任务题库详情*/} () + (props) => () } > {/*毕设内容题库详情*/} () + (props) => () } > {/*分组作业题库详情*/} () + (props) => () } > {/* 普通作业题库详情*/} () + (props) => () } > @@ -192,4 +187,13 @@ class BanksIndex extends Component{ ) } } -export default CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(BanksIndex) )); \ No newline at end of file +export default CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(BanksIndex) )); + + + +// { +// return () +// } +// }> \ No newline at end of file From 738d889f0032eb71dec8891cbcfdaebbaebdbc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 30 Aug 2019 17:07:59 +0800 Subject: [PATCH 3/6] =?UTF-8?q?url=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index bafaa898c..22bd607bf 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -372,36 +372,7 @@ class App extends Component { - {/*题库问卷编辑详情*/} - () - } - > - {/*毕设任务题库详情*/} - () - } - > - {/*毕设内容题库详情*/} - () - } - > - {/*分组作业题库详情*/} - () - } - > - {/* 普通作业题库详情*/} - () - } - > + {/*题库*/} Date: Fri, 30 Aug 2019 17:11:30 +0800 Subject: [PATCH 4/6] . --- public/react/src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 22bd607bf..6e2fe3dff 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -372,7 +372,7 @@ class App extends Component { - + {/*题库*/} Date: Fri, 30 Aug 2019 17:12:32 +0800 Subject: [PATCH 5/6] =?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 42a402266..8566893c9 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.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}?tab=0`) } onCancel = () => { this.toWorkDetail() From d31e98f217e02387815a9aae2818bb3bf8cdc26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 30 Aug 2019 17:27:29 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/poll/PollNewQuestbank.js | 7 ++++++- .../react/src/modules/user/usersInfo/banks/BanksIndex.js | 4 +++- .../src/modules/user/usersInfo/banks/GtaskBanksEditEdit.js | 5 ++--- .../src/modules/user/usersInfo/banks/GtopicBanksEdit.js | 1 + .../src/modules/user/usersInfo/banks/HomeworkBanksEdit.js | 1 + 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index f84c0df8c..ac325df95 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -2434,6 +2434,11 @@ class PollNewQuestbank extends Component { // } } //试图 + toWorkDetail = () => { + this.props.history.push(`/banks/poll/${this.props.match.params.workId}`); + this.props.initPublic(undefined); + } + render() { let { addonAfter, @@ -3525,7 +3530,7 @@ class PollNewQuestbank extends Component { }} >
  • - this.props.history.goBack()}>取消 + this.toWorkDetail()}>取消 this.submitQuestionnaire()}>提交
    • diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js index a39904298..01d52de70 100644 --- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js +++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js @@ -100,7 +100,7 @@ class BanksIndex extends Component{ } -

    +

    {crumbData && crumbData.title} { crumbData && {crumbData.is_public == true ? '公开':'私有'} @@ -117,6 +117,7 @@ class BanksIndex extends Component{ />) } }> + { @@ -180,6 +181,7 @@ class BanksIndex extends Component{ (props) => () } > +

    diff --git a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEditEdit.js b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEditEdit.js index 3035e9867..893f7eedb 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEditEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEditEdit.js @@ -1,7 +1,5 @@ import React, { Component } from 'react'; import axios from 'axios' - - import NewWorkForm from '../../../courses/busyWork/NewWorkForm'; class GtaskBanksEditEdit extends Component { @@ -61,7 +59,8 @@ class GtaskBanksEditEdit extends Component { }); } toWorkDetail = () => { - this.props.history.push(`/banks/task/${this.props.match.params.workId}`) + this.props.history.push(`/banks/gtask/${this.props.match.params.workId}`); + this.props.initPublic(undefined); } onCancel = () => { this.toWorkDetail() diff --git a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js index ee029a5d9..ade1b3361 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js @@ -57,6 +57,7 @@ class GtopicBanksEdit extends Component{ // 取消 editCancel = () =>{ this.props.history.push(`/banks/gtopic/${this.props.match.params.bankId}`); + this.props.initPublic(undefined); } render(){ diff --git a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js index 8566893c9..149c631e9 100644 --- a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js @@ -65,6 +65,7 @@ class HomeworkBanksEdit extends Component { } toWorkDetail = () => { this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}?tab=0`) + this.props.initPublic(undefined); } onCancel = () => { this.toWorkDetail()