Merge branch 'develop' into dev_aliyun

config/routes.rb

@@ -69,7 +69,9 @@ Rails.application.routes.draw do
         delete :delete_set
       end
       resources :comments do
-        post :reply
+        collection do
+          post :reply
+        end
       end
     end
 

public/react/src/AppConfig.js

@@ -35,7 +35,7 @@ if (isDev) {
 // 老师
 //ebugType="teacher";
 // 学生
-// debugType="student";
+//debugType="student";
 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {

public/react/src/modules/tpm/TPMDataset.js

@@ -502,7 +502,7 @@ class TPMDataset extends Component {
 				//上传前的操作
 			  console.log('beforeUpload', file);
 				// this.props.showNotification(`文件上传中`);
-				const isLt400M = file.size / 1024 / 1024 <= 1;
+				const isLt400M = file.size / 1024 / 1024 <= 400;
 
 				if (!isLt400M) {
 					this.props.showNotification('文件大小必须小于等于400MB!');

public/react/src/modules/tpm/TPMIndex.js

@@ -412,7 +412,7 @@ class TPMIndex extends Component {
                           <span className={"tpmbannernavstyler"}>合作者</span>
                         </Menu.Item>
 
-                        {	this.state.is_jupyter===true?<Menu.Item key="6" className={"competitionmr50"}>
+                        {	this.state.identity >4||this.state.identity===undefined ? "":this.state.is_jupyter===true?<Menu.Item key="6" className={"competitionmr50"}>
                           <span className={"tpmbannernavstyler"}>数据集</span>
                         </Menu.Item>:""}