diff --git a/public/react/src/App.js b/public/react/src/App.js index bafaa898c..6e2fe3dff 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -372,36 +372,7 @@ class App extends Component { - {/*题库问卷编辑详情*/} - () - } - > - {/*毕设任务题库详情*/} - () - } - > - {/*毕设内容题库详情*/} - () - } - > - {/*分组作业题库详情*/} - () - } - > - {/* 普通作业题库详情*/} - () - } - > + {/*题库*/} { + 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/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index 9b0e2948e..167ce14de 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{ 个人题库 公共题库 :
    我的题库 + >我的题库 公共题库 @@ -472,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}`:"" } @@ -499,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..01d52de70 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'; @@ -102,7 +100,7 @@ class BanksIndex extends Component{ } -

    +

    {crumbData && crumbData.title} { crumbData && {crumbData.is_public == true ? '公开':'私有'} @@ -110,14 +108,6 @@ class BanksIndex extends Component{

    - {/*毕设任务编辑*/} - { - return () - } - }> - ) } }> + { @@ -143,48 +134,54 @@ class BanksIndex extends Component{ } }> - { - return () - } - }> - { + return () + } + }> + + {/*题库问卷编辑详情*/} + () + } + > + + + { return () } }> - {/*题库问卷编辑详情*/} - () - } - > + {/*毕设任务题库详情*/} () + (props) => () } > {/*毕设内容题库详情*/} () + (props) => () } > {/*分组作业题库详情*/} () + (props) => () } > {/* 普通作业题库详情*/} () + (props) => () } > +
    @@ -192,4 +189,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 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 42a402266..149c631e9 100644 --- a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js @@ -64,7 +64,8 @@ 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`) + this.props.initPublic(undefined); } onCancel = () => { this.toWorkDetail()