From 0e35ef83ff54aab0f83d8545bd82000de993b45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 4 Sep 2019 12:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=B7=AF=E7=94=B1=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/poll/PollNewQuestbank.js     |  4 ++--
 .../react/src/modules/user/usersInfo/InfosTopics.js  | 12 ++++++------
 .../src/modules/user/usersInfo/banks/BanksIndex.js   | 12 ++++++------
 .../modules/user/usersInfo/banks/BanksTabIndex.js    |  6 +++---
 .../user/usersInfo/banks/ExerciseBanksDetail.js      |  4 ++--
 .../user/usersInfo/banks/ExerciseBanksEdit.js        |  4 ++--
 .../modules/user/usersInfo/banks/GtaskBanksEdit.js   |  4 ++--
 .../modules/user/usersInfo/banks/GtopicBanksEdit.js  |  6 +++---
 .../user/usersInfo/banks/HomeworkBanksEdit.js        |  4 ++--
 .../modules/user/usersInfo/banks/PollBanksContent.js |  4 ++--
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js
index a3cced2e9..5530f839a 100644
--- a/public/react/src/modules/courses/poll/PollNewQuestbank.js
+++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js
@@ -296,7 +296,7 @@ class PollNewQuestbank extends Component {
 						title:'编辑',
 						is_public:result && result.data && result.data.is_public,
 						crumbArray:[
-							{to:`/banks/poll/${pollid}`,content:'详情'},
+							{to:`/banks/poll/${pollid}/${this.props.match.params.type}`,content:'详情'},
 							{content:'编辑'}
 						]
 					}
@@ -2683,7 +2683,7 @@ class PollNewQuestbank extends Component {
 	toWorkDetail = () => {
 		// console.log(this.props);
 		// console.log("toWorkDetail");
-		this.props.history.push(`/banks/poll/${this.props.match.params.workid}`);
+		this.props.history.push(`/banks/poll/${this.props.match.params.workid}/${this.props.match.params.type}`);
 		// this.props.initPublic(undefined);
 	};
 	//跳转道描点的地方
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index b32cbc086..7dcd3bfe5 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -520,12 +520,12 @@ class InfosTopics extends Component{
 										<div className="homepagePostSetting homepagePostSettingname topscisright">
 											{types==="personal"?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
 												&&<a className="btn colorblue mr25 font-16 fr"
-													 href={category==="normal"?`/banks/normal/${item.id}/edit`:
-														 category==="group"?`/banks/group/${item.id}/edit`:
-															 category==="poll"?`/banks/poll/${item.id}/edit`:
-																 category==="exercise"?`/banks/exercise/${item.id}/edit`:
-																	 category==="gtask"?`/banks/gtask/${item.id}/edit`:
-																		 category==="gtopic"?`/banks/gtopic/${item.id}/edit`:""
+													 href={category==="normal"?`/banks/normal/${item.id}/edit/${types}`:
+														 category==="group"?`/banks/group/${item.id}/edit/${types}`:
+															 category==="poll"?`/banks/poll/${item.id}/edit/${types}`:
+																 category==="exercise"?`/banks/exercise/${item.id}/edit/${types}`:
+																	 category==="gtask"?`/banks/gtask/${item.id}/edit/${types}`:
+																		 category==="gtopic"?`/banks/gtopic/${item.id}/edit/${types}`:""
 													 }
 												>编辑</a>
 												:""}
diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
index c41bb3914..496c21459 100644
--- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
+++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
@@ -117,14 +117,14 @@ class BanksIndex extends Component{
 
           <Switch {...this.props}>
 						{/*毕设任务编辑*/}
-						<Route path='/banks/gtask/:workId/edit'
+						<Route path='/banks/gtask/:workId/edit/:type'
 									 render={
 										 (props) => {
 											 return (<GtaskBanksEdit {...this.props} {...props} {...this.state} {...common}/>)
 										 }
 									 }></Route>
 
-						<Route path='/banks/normal/:workId/edit'
+						<Route path='/banks/normal/:workId/edit/:type'
               render={
                 (props) => {
                   return (<HomeworkBanksEdit {...this.props} {...props} {...this.state} {...common}
@@ -133,7 +133,7 @@ class BanksIndex extends Component{
                 }
             }></Route>
             
-            <Route path='/banks/group/:workId/edit'
+            <Route path='/banks/group/:workId/edit/:type'
               render={
                 (props) => {
                   return (<HomeworkBanksEdit {...this.props} {...props} {...this.state} {...common}
@@ -142,7 +142,7 @@ class BanksIndex extends Component{
                 }
             }></Route>
 
-            <Route path='/banks/exercise/:Id/edit'
+            <Route path='/banks/exercise/:Id/edit/:type'
               render={
                 (props) => {
                   return (<ExerciseBanksEdit {...this.props} {...props} {...this.state} {...common}
@@ -151,7 +151,7 @@ class BanksIndex extends Component{
             }></Route>
 
 
-            <Route path='/banks/gtopic/:bankId/edit' 
+            <Route path='/banks/gtopic/:bankId/edit/:type'
               render={
                 (props) => {
                   return (<GtopicBanksEdit {...this.props} {...props} {...this.state} {...common}/>)
@@ -160,7 +160,7 @@ class BanksIndex extends Component{
 
 
 						{/*题库问卷编辑详情*/}
-						<Route path="/banks/poll/:workid/edit"
+						<Route path="/banks/poll/:workid/edit/:type"
 									 render={
 										 (props) => (<PollNewQuestbank {...this.props}  {...props} {...this.state} {...common} />)
 									 }
diff --git a/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js
index de900e792..491deb57a 100644
--- a/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js
+++ b/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js
@@ -58,7 +58,7 @@ class BanksTabIndex extends Component{
           ></BanksMenu>
         }
         <Switch {...this.props}>
-          <Route path='/banks/exercise/:Id'
+          <Route path={`/banks/exercise/:Id/${this.props.match.params.type}`}
             render={
               (props) => {
                 return (<ExerciseBanksDetail {...this.props} {...props} {...this.state} {...common}
@@ -66,13 +66,13 @@ class BanksTabIndex extends Component{
               }
           }></Route>  
 
-          <Route path='/banks/gtopic/:bankId' 
+          <Route path={`/banks/gtopic/:bankId/${this.props.match.params.type}`}
             render={
               (props) => {
                 return (<GtopicBanks {...this.props} {...props} {...this.state} {...common} />)
               }
           }></Route>
-          <Route path='/banks/poll/:bankId' 
+          <Route path={`/banks/poll/:bankId/${this.props.match.params.type}`}
             render={
               (props) => {
                 return (<PollBanks {...this.props} {...props} {...this.state} {...common} />)
diff --git a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js
index 7f261da82..5a8ba120b 100644
--- a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js
+++ b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js
@@ -27,10 +27,10 @@ class ExerciseBanksDetail extends Component{
     const menuData={
         tab:'0',//tab选中的index
         menuArray:[//tab以及tab路由
-            {to:`/banks/exercise/${Id}`,content:'内容详情'}
+            {to:`/banks/exercise/${Id}/${this.props.match.params.type}`,content:'内容详情'}
         ],
         category:'exercise',//
-        tos: `/banks/exercise/${Id}/edit`,
+        tos: `/banks/exercise/${Id}/edit/${this.props.match.params.type}`,
         id: Id,
 
     }
diff --git a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js
index 0a4588d8f..7ab9aedec 100644
--- a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js
+++ b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js
@@ -18,13 +18,13 @@ class ExerciseBanksEdit extends Component {
   }
 
   initData = (responseData) =>{
-      const Id = this.props.match.params.Id    
+      const Id = this.props.match.params.Id;
 
       const crumbData={
         title:'编辑',
         is_public: responseData && responseData.data && responseData.data.exercise.is_public,
         crumbArray:[
-            {to:`/banks/exercise/${Id}`,content:'详情'},
+            {to:`/banks/exercise/${Id}/${this.props.match.params.type}`,content:'详情'},
             {content:'编辑'}
         ]
     }
diff --git a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js
index b3145f00f..4c3bc4e24 100644
--- a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js
+++ b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js
@@ -25,7 +25,7 @@ class GtaskBanksEdit extends Component {
 					title:'编辑',
 					is_public:result && result.data && result.data.is_public,
 					crumbArray:[
-						{to:`/banks/gtask/${workId}/edit`,content:'详情'},
+						{to:`/banks/gtask/${workId}/${this.props.match.params.type}`,content:'详情'},
 						{content:'编辑'}
 					]
 				}
@@ -59,7 +59,7 @@ class GtaskBanksEdit extends Component {
 			});
 	}
 	toWorkDetail = () => {
-		this.props.history.push(`/banks/gtask/${this.props.match.params.workId}`);
+		this.props.history.push(`/banks/gtask/${this.props.match.params.workId}/${this.props.match.params.type}`);
 		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 ade1b3361..87be40195 100644
--- a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js
+++ b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js
@@ -24,7 +24,7 @@ class GtopicBanksEdit extends Component{
           title:'编辑',
           is_public:result && result.data.selected_data && result.data.selected_data.is_public,
           crumbArray:[
-            {to:`/banks/gtopic/${bankId}/edit`,content:'详情'},
+            {to:`/banks/gtopic/${bankId}/${this.props.match.params.type}`,content:'详情'},
             {content:'编辑'}
           ]
         }
@@ -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.history.push(`/banks/gtopic/${bankId}/${this.props.match.params.type}`);
       }
     }).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.history.push(`/banks/gtopic/${this.props.match.params.bankId}/${this.props.match.params.type}`);
 		this.props.initPublic(undefined);
   }
 
diff --git a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
index 7d0a8641a..fa48361f6 100644
--- a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
+++ b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js
@@ -26,7 +26,7 @@ class HomeworkBanksEdit extends Component {
           title:'编辑',
           is_public:result && result.data && result.data.is_public,
           crumbArray:[
-            {to:`/banks/${this.getModuleName()}/${workId}?tab=0`,content:'详情'},
+            {to:`/banks/${this.getModuleName()}/${workId}/${this.props.match.params.type}?tab=0`,content:'详情'},
             {content:'编辑'}
           ]
         }
@@ -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}?tab=0`)
+    this.props.history.push(`/banks/${this.getModuleName()}/${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/PollBanksContent.js b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
index db18c696d..b7fef4074 100644
--- a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
+++ b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
@@ -36,10 +36,10 @@ class PollBanksContent extends Component{
         const menuData={
           tab:'0',//tab选中的index
           menuArray:[//tab以及tab路由
-            {to:`/banks/poll/${bankId}`,content:'内容详情'}
+            {to:`/banks/poll/${bankId}/${this.props.match.params.type}`,content:'内容详情'}
           ],
           category:'poll',//毕设选题
-          tos:`/banks/poll/${bankId}/edit`,
+          tos:`/banks/poll/${bankId}/edit/${this.props.match.params.type}`,
           id:bankId,
 
         }