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] =?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{
 										<div className="homepagePostSetting homepagePostSettingname topscisright">
 											{types==="personal"?user_id===targetuserid&&user_type!="学生"?
 												<a className="btn colorblue mr25 font-16 fr"
-												 href={category==="normal"?``:
-															 category==="group"?``:
+												 href={category==="normal"?`/banks/normal/${item.id}/edit`:
+															 category==="group"?`/banks/group/${item.id}/edit`:
 															 category==="poll"?`/banks/poll/${item.id}/edit`:
-															 category==="exercise"?``:
-															 category==="gtask"?``:
+															 category==="exercise"?`/banks/exercise/${item.id}/edit`:
+															 category==="gtask"?`/banks/gtask/${item.id}/edit`:
 															 category==="gtopic"?`/banks/gtopic/${item.id}/edit`:""
 												 }
 												>编辑</a>
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{
           </p>
 
           <Switch {...this.props}>
-						{/*毕设任务编辑*/}
-						<Route path='/banks/gtask/:workId/edit'
-									 render={
-										 (props) => {
-											 return (<GtaskBanksEdit {...this.props} {...props} {...this.state} {...common}/>)
-										 }
-									 }></Route>
-
 
             <Route path='/banks/normal/:workId/edit'
               render={
@@ -143,46 +133,51 @@ class BanksIndex extends Component{
                 }
             }></Route>
 
-            <Route path='/banks/gtopic/:bankId' 
-              render={
-                (props) => {
-                  return (<BanksTabIndex {...this.props} {...props} {...this.state} {...common}/>)
-                }
-            }></Route>
-            <Route path='/banks/poll/:bankId' 
+						{/*毕设任务编辑*/}
+						<Route path='/banks/gtask/:workId/edit'
+									 render={
+										 (props) => {
+											 return (<GtaskBanksEdit {...this.props} {...props} {...this.state} {...common}/>)
+										 }
+									 }></Route>
+						
+						{/*题库问卷编辑详情*/}
+						<Route path="/courses/poll/:workid/edit"
+									 render={
+										 (props) => (<PollNewQuestbank {...this.props}  {...props} {...this.state} {...common} />)
+									 }
+						></Route>
+
+
+            <Route path='/banks/poll/:bankId'
               render={
                 (props) => {
                   return (<BanksTabIndex {...this.props} {...props} {...this.state} {...common} />)
                 }
             }></Route>
-            {/*题库问卷编辑详情*/}
-            <Route path="/courses/poll/:workid/edit"
-                   render={
-                     (props) => (<PollNewQuestbank {...this.props}  {...this.state} {...common} />)
-                   }
-            ></Route>
+
             {/*毕设任务题库详情*/}
             <Route path="/banks/gtask/:workid"
                    render={
-                     (props) => (<Completetaskpage {...this.props}  {...this.state} {...common} />)
+                     (props) => (<Completetaskpage {...this.props} {...props} {...this.state} {...common} />)
                    }
             ></Route>
             {/*毕设内容题库详情*/}
             <Route path="/banks/gtopic/:workid"
                    render={
-                     (props) => (<CompletetopicdePage {...this.props} {...this.state}  {...common}/>)
+                     (props) => (<CompletetopicdePage {...this.props} {...props} {...this.state}  {...common}/>)
                    }
             ></Route>
             {/*分组作业题库详情*/}
             <Route path="/banks/group/:workid"
                    render={
-                     (props) => (<GroupjobbankPage {...this.props}  {...this.state} {...common} />)
+                     (props) => (<GroupjobbankPage {...this.props}  {...props} {...this.state} {...common} />)
                    }
             ></Route>
             {/*  普通作业题库详情*/}
             <Route path="/banks/normal/:workid"
                    render={
-                     (props) => (<Generaljobbankdetails {...this.props}  {...this.state} {...common} />)
+                     (props) => (<Generaljobbankdetails {...this.props} {...props}  {...this.state} {...common} />)
                    }
             ></Route>
           </Switch>
@@ -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) ));
+
+
+
+//       <Route path='/banks/gtopic/:bankId'
+//               render={
+//                 (props) => {
+//                   return (<BanksTabIndex {...this.props} {...props} {...this.state} {...common}/>)
+//                 }
+//             }></Route>
\ No newline at end of file