Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/completetaskdetails/Completetaskpage.js

@@ -78,7 +78,7 @@ class Completetaskpage extends Component {
 								{to:`/banks/gtask/${workids}/${this.props.match.params.type}?tab=0`,content:'内容详情'},
 							],
 							category:'gtask',//毕设选题
-							tos:`/banks/gtask/${workids}/edit/${this.props.match.params.type}`,
+							tos:`/banks/gtask/${workids}/edit/${this.props.match.params.type}?tab=0`,
 							id:workids,
 							is_public:response && response.data && response.data.is_public,
 							type:this.props.match.params.type,

public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js

@@ -73,7 +73,7 @@ class CompletetopicdePage extends Component {
 								{to:`/banks/gtopic/${workids}/${this.props.match.params.type}?tab=0`,content:'内容详情'},
 							],
 							category:'gtopic',//毕设选题
-							tos:`/banks/gtopic/${workids}/edit/${this.props.match.params.type}`,
+							tos:`/banks/gtopic/${workids}/edit/${this.props.match.params.type}?tab=0`,
 							id:workids,
 							is_public:response && response.data && response.data.is_public,
 							type:this.props.match.params.type,

public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js

@@ -83,7 +83,7 @@ class GroupjobbankPage extends Component {
 								{to:`/banks/group/${workids}/${this.props.match.params.type}/answer?tab=1`,content:'参考答案'}
 							],
 							category:'group',//毕设选题
-							tos:`/banks/group/${workids}/edit/${this.props.match.params.type}`,
+							tos:`/banks/group/${workids}/edit/${this.props.match.params.type}?tab=0`,
 							id:workids,
 							is_public:response && response.data && response.data.is_public,
 							type:this.props.match.params.type,

public/react/src/modules/courses/questionbank/Generaljobbankdetails.js

@@ -83,7 +83,7 @@ class Generaljobbankdetails extends Component {
 								{to:`/banks/normal/${workids}/${this.props.match.params.type}/answer?tab=1`,content:'参考答案'}
 							],
 							category:'normal',//毕设选题
-							tos:`/banks/normal/${workids}/edit/${this.props.match.params.type}`,
+							tos:`/banks/normal/${workids}/edit/${this.props.match.params.type}?tab=0`,
 							id:workids,
 							is_public:response && response.data && response.data.is_public,
 							type:this.props.match.params.type,

public/react/src/modules/user/usersInfo/InfosTopics.js

@@ -524,8 +524,8 @@ class InfosTopics extends Component{
 												category==="group"?`/banks/group/${item.id}/${types}?tab=0`:
 													category==="poll"?`/banks/poll/${item.id}/${types}`:
 														category==="exercise"?`/banks/exercise/${item.id}/${types}`:
-															category==="gtask"?`/banks/gtask/${item.id}/${types}`:
-																category==="gtopic"?`/banks/gtopic/${item.id}/${types}`:""
+															category==="gtask"?`/banks/gtask/${item.id}/${types}?tab=0`:
+																category==="gtopic"?`/banks/gtopic/${item.id}/${types}?tab=0`:""
 										}
 										>
 											{item.name}

public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js

@@ -59,7 +59,7 @@ class GtaskBanksEdit extends Component {
 			});
 	}
 	toWorkDetail = () => {
-		this.props.history.push(`/banks/gtask/${this.props.match.params.workId}/${this.props.match.params.type}`);
+		this.props.history.push(`/banks/gtask/${this.props.match.params.workId}/${this.props.match.params.type}?tab=0`);
 		this.props.initPublic(undefined);
 	}
 	onCancel = () => {

public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js

@@ -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.match.params.type}`);
+        this.props.history.push(`/banks/gtopic/${bankId}/${this.props.match.params.type}?tab=0`);
       }
     }).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.match.params.type}`);
+    this.props.history.push(`/banks/gtopic/${this.props.match.params.bankId}/${this.props.match.params.type}?tab=0`);
 		this.props.initPublic(undefined);
   }
 

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.match.params.type}`)
+    this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}/${this.props.match.params.type}?tab=0`)
 		this.props.initPublic(undefined);
   }
   onCancel = () => {