Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

.gitignore

@@ -33,6 +33,7 @@
 # Ignore react node_modules
 /public/react/build
 /public/react/build/
+/public/react/.cache
 /public/react/node_modules/
 /public/react/config/stats.json
 /public/react/stats.json

public/react/config/webpack.config.dev.js

@@ -9,6 +9,7 @@ const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
 const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
 const eslintFormatter = require('react-dev-utils/eslintFormatter');
 const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+const ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin');
 // const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 const getClientEnvironment = require('./env');
 const paths = require('./paths');
@@ -249,6 +250,46 @@ module.exports = {
     // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
     // You can remove this if you don't use Moment.js:
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+    new ParallelUglifyPlugin({
+      // 传递给 UglifyJS的参数如下：
+      uglifyJS: {
+        output: {
+          /*
+           是否输出可读性较强的代码，即会保留空格和制表符，默认为输出，为了达到更好的压缩效果，
+           可以设置为false
+          */
+          beautify: false,
+          /*
+           是否保留代码中的注释，默认为保留，为了达到更好的压缩效果，可以设置为false
+          */
+          comments: false
+        },
+        compress: {
+          /*
+           是否在UglifyJS删除没有用到的代码时输出警告信息，默认为输出，可以设置为false关闭这些作用
+           不大的警告
+          */
+          warnings: false,
+
+          /*
+           是否删除代码中所有的console语句，默认为不删除，开启后，会删除所有的console语句
+          */
+          drop_console: false,
+
+          /*
+           是否内嵌虽然已经定义了，但是只用到一次的变量，比如将 var x = 1; y = x, 转换成 y = 5, 默认为不
+           转换，为了达到更好的压缩效果，可以设置为false
+          */
+          collapse_vars: false,
+
+          /*
+           是否提取出现了多次但是没有定义成变量去引用的静态值，比如将 x = 'xxx'; y = 'xxx'  转换成
+           var a = 'xxxx'; x = a; y = a; 默认为不转换，为了达到更好的压缩效果，可以设置为false
+          */
+          reduce_vars: false
+        }
+      }
+    }),
   ],
   // Some libraries import Node modules but don't use them in the browser.
   // Tell Webpack to provide empty mocks for them so importing them works.

public/react/config/webpack.config.prod.js

@@ -10,6 +10,8 @@ const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
 const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
 const eslintFormatter = require('react-dev-utils/eslintFormatter');
 const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+const ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin');
+
 const paths = require('./paths');
 const getClientEnvironment = require('./env');
 
@@ -56,8 +58,8 @@ module.exports = {
   bail: true,
   // We generate sourcemaps in production. This is slow but gives good results.
   // You can exclude the *.map files from the build during deployment.
-  devtool: shouldUseSourceMap ? 'nosources-source-map' : false,  //正式版
+  // devtool: shouldUseSourceMap ? 'nosources-source-map' : false,  //正式版
-  // devtool: shouldUseSourceMap ? 'source-map' : false,//测试版
+	devtool: shouldUseSourceMap ? 'source-map' : false,//测试版
   // In production, we only want to load the polyfills and the app code.
   entry: [require.resolve('./polyfills'), paths.appIndexJs],
   output: {
@@ -270,25 +272,39 @@ module.exports = {
     // Otherwise React will be compiled in the very slow development mode.
     new webpack.DefinePlugin(env.stringified),
     // Minify the code.
-    new webpack.optimize.UglifyJsPlugin({
+    // new webpack.optimize.UglifyJsPlugin({
-      compress: {
+    //   compress: {
-        warnings: false,
+    //     warnings: false,
-        // Disabled because of an issue with Uglify breaking seemingly valid code:
+    //     // Disabled because of an issue with Uglify breaking seemingly valid code:
-        // https://github.com/facebookincubator/create-react-app/issues/2376
+    //     // https://github.com/facebookincubator/create-react-app/issues/2376
-        // Pending further investigation:
+    //     // Pending further investigation:
-        // https://github.com/mishoo/UglifyJS2/issues/2011
+    //     // https://github.com/mishoo/UglifyJS2/issues/2011
-        comparisons: false,
+    //     comparisons: false,
-      },
+    //   },
-      mangle: {
+    //   mangle: {
-        safari10: true,
+    //     safari10: true,
-      },
+    //   },
+    //   output: {
+    //     comments: false,
+    //     // Turned on because emoji and regex is not minified properly using default
+    //     // https://github.com/facebookincubator/create-react-app/issues/2488
+    //     ascii_only: true,
+    //   },
+    //   sourceMap: shouldUseSourceMap,
+    // }),
+   //正式版上线后打开去掉debuger和console
+    new ParallelUglifyPlugin({
+      cacheDir: '.cache/',
+      uglifyJS:{
         output: {
-        comments: false,
+          comments: false
-        // Turned on because emoji and regex is not minified properly using default
-        // https://github.com/facebookincubator/create-react-app/issues/2488
-        ascii_only: true,
         },
-      sourceMap: shouldUseSourceMap,
+        warnings: false,
+        compress: {
+          drop_debugger: false,
+          drop_console: false
+        }
+      }
     }),
     // Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
     new ExtractTextPlugin({

public/react/package.json

@@ -88,6 +88,7 @@
     "webpack": "3.8.1",
     "webpack-dev-server": "2.9.4",
     "webpack-manifest-plugin": "1.3.2",
+    "webpack-parallel-uglify-plugin": "^1.1.0",
     "whatwg-fetch": "2.0.3",
     "wrap-md-editor": "^0.2.20"
   },
@@ -164,6 +165,7 @@
     "concat": "^1.0.3",
     "happypack": "^5.0.1",
     "videojs-for-react": "^0.0.3",
-    "webpack-bundle-analyzer": "^3.0.3"
+    "webpack-bundle-analyzer": "^3.0.3",
+    "webpack-parallel-uglify-plugin": "^1.1.0"
   }
 }

public/react/src/App.js

@@ -224,7 +224,12 @@ class App extends Component {
 
 	componentDidMount() {
 		// force an update if the URL changes
-		history.listen(() => this.forceUpdate());
+		history.listen(() => {
+			this.forceUpdate()
+			const $ = window.$
+			// https://www.trustie.net/issues/21919 可能会有问题
+			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
+		});
 
 		initAxiosInterceptors(this.props)
 

public/react/src/common/components/Cropper.js

@@ -6,26 +6,7 @@ const $ = window.$
 let _url_origin = getUrl2()
 // let _url_origin = `http://47.96.87.25:48080`;
 
-if (!window.Cropper) {
-    $.ajaxSetup({
-        cache: true
-    });
-
-
-    $('head').append($('<link rel="stylesheet" type="text/css" />')
-        .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`));
-
-    $.getScript(
-      `${_url_origin}/react/public/js/cropper/cropper.js`,
-      (data, textStatus, jqxhr) => {
-      
-    });
-    $.getScript(
-      `${_url_origin}/react/public/js/cropper/html2canvas.min.js`,
-      (data, textStatus, jqxhr) => {
 
-    });
-}
 
 function save_avatar(){        
         
@@ -93,9 +74,30 @@ class Cropper extends Component {
             // console.log(event.detail.scaleX);
             // console.log(event.detail.scaleY);
         },
-
         preview: this.props.previewId ? `#${this.props.previewId}` : '.img-preview',
       }
+
+      if (!window.Cropper) {
+        $.ajaxSetup({
+            cache: true
+        });
+
+
+        $('head').append($('<link rel="stylesheet" type="text/css" />')
+            .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`));
+
+        $.getScript(
+          `${_url_origin}/react/public/js/cropper/cropper.js`,
+          (data, textStatus, jqxhr) => {
+          
+        });
+        $.getScript(
+          `${_url_origin}/react/public/js/cropper/html2canvas.min.js`,
+          (data, textStatus, jqxhr) => {
+          
+        });
+      }
+
       setTimeout(() => {
         const image = document.getElementById(this.props.imageId || '__image');
         this.cropper = new window.Cropper(image, this.options);

public/react/src/modules/courses/busyWork/commonWork.js

@@ -401,7 +401,7 @@ class commonWork extends Component{
             }
             secondRowLeft={
               <div style={{"display":"inline-block", "marginTop": "22px"}}>
-                <span>共 {mainList&&mainList.all_count} 个作业</span>
+                <span>共 {mainList&&mainList.all_count} 个{moduleChineseName}</span>
                 <span style={{"marginLeft":"16px"}}>已发布：{published_count}个</span>
                 {/* {this.props.isAdmin()?:""} */}
                 <span style={{"marginLeft":"16px"}}>未发布：{unpublished_count}个</span>

public/react/src/modules/courses/coursesPublic/PathModal.js

@@ -75,13 +75,13 @@ class PathModal extends Component{
     if(patheditarry===undefined){
       this.setState({
         patheditarrytype:true,
-        patheditarryvalue:"请先选择实训课程"
+        patheditarryvalue:"请先选择实践课程"
       })
       return
     }else if(patheditarry.length===0){
       this.setState({
         patheditarrytype:true,
-        patheditarryvalue:"请先选择实训课程"
+        patheditarryvalue:"请先选择实践课程"
       })
       return
     }
@@ -137,7 +137,7 @@ class PathModal extends Component{
         />:""}
         <Modal
           keyboard={false}
-          title="选择实训课程"
+          title="选择实践课程"
           visible={visible}
           closable={false}
           footer={null}

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js

@@ -77,7 +77,7 @@ class GraduationTasksappraiseReplyChild extends Component{
 
 						{this.props.ultimate===true ? "": isAdmin && <GraduationTasksappraiseMainEditor {...this.props}
 								addSuccess={() => this.props.addSuccess()}
-								showSameScore={true}																																							
+								showSameScore={this.props.task_type == 2}																																							
 							></GraduationTasksappraiseMainEditor> }
 				</div>
 

public/react/src/modules/courses/shixunHomework/Listofworks.js

@@ -1350,15 +1350,22 @@ class Listofworks extends Component {
 		},{responseType: 'blob'}).then((response) => {
 			console.log("1342");
 			console.log(response);
+			if (response.status == 200) {
+
 				var blob = new Blob([response.data])
 			var downloadElement = document.createElement('a');
 			var href = window.URL.createObjectURL(blob); //创建下载的链接
+			let filename = response.headers.get('Content-Disposition');
+			if (filename) {
+				filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
 				downloadElement.href = href;
-			downloadElement.download = '实习报告.pdf'; //下载后文件名
+				downloadElement.download = filename; //下载后文件名
 				document.body.appendChild(downloadElement);
 				downloadElement.click(); //点击下载
 				document.body.removeChild(downloadElement); //下载完成移除元素
+			}
 			window.URL.revokeObjectURL(href); //释放掉blob对象
+			}
  		}).catch((error) => {
 			console.log(error)
 		});
@@ -1377,15 +1384,21 @@ class Listofworks extends Component {
 		},{responseType: 'blob'}).then((response) => {
 			console.log("1306");
 			console.log(response);
+			if (response.status == 200) {
 			var blob = new Blob([response.data])
 			var downloadElement = document.createElement('a');
 			var href = window.URL.createObjectURL(blob); //创建下载的链接
+			let filename = response.headers.get('Content-Disposition');
+			if (filename) {
+				filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
 				downloadElement.href = href;
-			downloadElement.download = '课堂学生成绩.xlsx'; //下载后文件名
+				downloadElement.download = filename; //下载后文件名
 				document.body.appendChild(downloadElement);
 				downloadElement.click(); //点击下载
 				document.body.removeChild(downloadElement); //下载完成移除元素
+			}
 			window.URL.revokeObjectURL(href); //释放掉blob对象
+			}
 		}).catch((error) => {
 			console.log(error)
 		});

public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js

@@ -572,10 +572,10 @@ class ShixunStudentWork extends Component {
 					</div>
 						<div className="educontent mb30">
 						<p className=" fl color-black  summaryname" style={{heigth:"33px"}}>
-							{data&&data.homework_name}
+							{jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}
 						</p>
 						<CoursesListType
-							typelist={data&&data.homework_status}
+							typelist={jobsettingsdata === undefined ? [] : jobsettingsdata.data.homework_status}
 						/>
 						<a className="color-grey-9 fr font-16 summaryname  ml20 mr20"
 							 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}`}>返回</a>

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -1607,7 +1607,7 @@ class Trainingjobsetting extends Component {
             showmodel:false
         })
     }
-// 导出实习报告批量
+    // 导出实习报告批量
     internshipreport = () => {
         console.log("internshipreport");
         var homeworkid = this.props.match.params.homeworkid;
@@ -1616,14 +1616,26 @@ class Trainingjobsetting extends Component {
             params: {
                 homework_common_id: homeworkid,
             }
-        }).then((response) => {
+        },{responseType: 'blob'}).then((response) => {
-            console.log("1593");
+            console.log("326");
             console.log(response);
+            var blob = new Blob([response.data])
+            var downloadElement = document.createElement('a');
+            var href = window.URL.createObjectURL(blob); //创建下载的链接
+            let filename = response.headers.get('Content-Disposition');
+            if (filename) {
+                filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
+                downloadElement.href = href;
+                downloadElement.download = filename; //下载后文件名
+                document.body.appendChild(downloadElement);
+                downloadElement.click(); //点击下载
+                document.body.removeChild(downloadElement); //下载完成移除元素
+            }
+            window.URL.revokeObjectURL(href); //释放掉blob对象
 
         }).catch((error) => {
             console.log(error)
         });
-
     }
 
     // 课堂学生成绩的导出下载
@@ -1631,9 +1643,22 @@ class Trainingjobsetting extends Component {
         console.log("Classstudentachievement");
         const course_id = this.props.match.params.coursesId;
         let url = "/courses/" + course_id + "/export_member_scores_excel.xlsx";
-        axios.get(url).then((response) => {
+        axios.get((url),{responseType: 'blob'}).then((response) => {
-            console.log("1607");
+            console.log("339");
             console.log(response);
+            var blob = new Blob([response.data])
+            var downloadElement = document.createElement('a');
+            var href = window.URL.createObjectURL(blob); //创建下载的链接
+            let filename = response.headers.get('Content-Disposition');
+            if (filename) {
+                filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
+                downloadElement.href = href;
+                downloadElement.download = filename; //下载后文件名
+                document.body.appendChild(downloadElement);
+                downloadElement.click(); //点击下载
+                document.body.removeChild(downloadElement); //下载完成移除元素
+            }
+            window.URL.revokeObjectURL(href); //释放掉blob对象
 
         }).catch((error) => {
             console.log(error)

public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js

@@ -327,9 +327,22 @@ class Workquestionandanswer extends Component {
 			params: {
 				homework_common_id: homeworkid,
 			}
-		}).then((response) => {
+		},{responseType: 'blob'}).then((response) => {
 			console.log("326");
 			console.log(response);
+			var blob = new Blob([response.data])
+			var downloadElement = document.createElement('a');
+			var href = window.URL.createObjectURL(blob); //创建下载的链接
+			let filename = response.headers.get('Content-Disposition');
+			if (filename) {
+				filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
+				downloadElement.href = href;
+				downloadElement.download = filename; //下载后文件名
+				document.body.appendChild(downloadElement);
+				downloadElement.click(); //点击下载
+				document.body.removeChild(downloadElement); //下载完成移除元素
+			}
+			window.URL.revokeObjectURL(href); //释放掉blob对象
 
 		}).catch((error) => {
 			console.log(error)
@@ -341,9 +354,22 @@ class Workquestionandanswer extends Component {
 		console.log("Classstudentachievement");
 		const course_id = this.props.match.params.coursesId;
 		let url = "/courses/" + course_id + "/export_member_scores_excel.xlsx";
-		axios.get(url).then((response) => {
+		axios.get((url),{responseType: 'blob'}).then((response) => {
 			console.log("339");
 			console.log(response);
+			var blob = new Blob([response.data])
+			var downloadElement = document.createElement('a');
+			var href = window.URL.createObjectURL(blob); //创建下载的链接
+			let filename = response.headers.get('Content-Disposition');
+			if (filename) {
+				filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
+				downloadElement.href = href;
+				downloadElement.download = filename; //下载后文件名
+				document.body.appendChild(downloadElement);
+				downloadElement.click(); //点击下载
+				document.body.removeChild(downloadElement); //下载完成移除元素
+			}
+			window.URL.revokeObjectURL(href); //释放掉blob对象
 
 		}).catch((error) => {
 			console.log(error)

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -1074,7 +1074,7 @@ class ShixunHomework extends Component{
                     {/*<WordsBtn style="blue" onClick={()=>this.editname(datas&&datas.main_category_name)} className={"mr30"}>目录重命名</WordsBtn>*/}
                   </span>:
                   <WordsBtn style="blue" onClick={()=>this.editDir(datas&&datas.category_name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:""}
-              {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?<WordsBtn style="blue" className="mr30 font-16" onClick={this.createCommonpath}>选用实训课程</WordsBtn>:"":""}
+              {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?<WordsBtn style="blue" className="mr30 font-16" onClick={this.createCommonpath}>选用实践课程</WordsBtn>:"":""}
               {this.props.isAdmin()===true?<a className={"btn colorblue font-16"} onClick={()=>this.createCommonWork()}>选用实训</a>:""}
             </li>
             </p>

public/react/src/modules/home/shixunsHome.js

@@ -189,7 +189,7 @@ class ShixunsHome extends Component {
                             {/*实训路径*/}
                             <div className="clearfix pt20 educontent pr pb20">
                                 <div className="edu-txt-center">
-                                    <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>实训课程</p>
+                                    <p className="color-dark edu-txt-center font-24" style={{lineHeight: '30px'}}>实践课程</p>
                                     <p className="color-grey-cd font-12">TRAINING COURSE</p>
                                 </div>
                                 <Link to={"/paths"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link>

public/react/src/modules/paths/PathNew.js

@@ -94,7 +94,7 @@ class PathNew extends Component{
   submitNewPath=()=>{
     let {pathName} = this.state;
     if(pathName===""){
-      this.props.showSnackbar("请输入实训课程名称");
+      this.props.showSnackbar("请输入实践课程名称");
       window.location.href="#part_Name";
       this.setState({
         flag_name:false
@@ -103,23 +103,23 @@ class PathNew extends Component{
     }
     let des=this.Des_editMD.getValue();
     if(des===""){
-      this.props.showSnackbar("请输入实训课程的简介");
+      this.props.showSnackbar("请输入实践课程的简介");
       window.location.href="#part_Des";
       return;
     }
     if (des.length > 5000) {
-      this.props.showSnackbar("实训课程的简介最大限制5000个字符");
+      this.props.showSnackbar("实践课程的简介最大限制5000个字符");
       window.location.href="#part_Des";
       return;
     }
     let point = this.Point_editMD.getValue();
     if(point===""){
-      this.props.showSnackbar("请输入实训课程的学习须知");
+      this.props.showSnackbar("请输入实践课程的学习须知");
       window.location.href="#part_point";
       return;
     }
     if(point.length > 500){
-      this.props.showSnackbar("实训课程的学习须知最大限制500个字符");
+      this.props.showSnackbar("实践课程的学习须知最大限制500个字符");
       window.location.href="#part_point";
       return;
     }
@@ -177,10 +177,10 @@ class PathNew extends Component{
           })
 
           const Des_editMD = create_editorMD("shixun_introduction","100%","490px"
-            ,"请在此输入实训课程的简介，最大限制5000个字符","/api/attachments.json", response.data.description,"");
+            ,"请在此输入实践课程的简介，最大限制5000个字符","/api/attachments.json", response.data.description,"");
           this.Des_editMD=Des_editMD;
           const Point_editMD = create_editorMD("shixun_propaedeutics","100%","260px"
-            ,"请在此输入实训课程的学习须知，最大限制500个字符","/api/attachments.json",response.data.learning_notes,"");
+            ,"请在此输入实践课程的学习须知，最大限制500个字符","/api/attachments.json",response.data.learning_notes,"");
           this.Point_editMD=Point_editMD;
          }
       }).catch((error)=>{
@@ -189,9 +189,9 @@ class PathNew extends Component{
     } else {
       this.isEditPage = false
 
-      const Des_editMD = create_editorMD("shixun_introduction","100%","490px","请在此输入实训课程的简介，最大限制5000个字符","/api/attachments.json","","");
+      const Des_editMD = create_editorMD("shixun_introduction","100%","490px","请在此输入实践课程的简介，最大限制5000个字符","/api/attachments.json","","");
       this.Des_editMD=Des_editMD;
-      const Point_editMD = create_editorMD("shixun_propaedeutics","100%","260px","请在此输入实训课程的学习须知，最大限制500个字符","/api/attachments.json","","");
+      const Point_editMD = create_editorMD("shixun_propaedeutics","100%","260px","请在此输入实践课程的学习须知，最大限制500个字符","/api/attachments.json","","");
       this.Point_editMD=Point_editMD;
     }
     
@@ -210,9 +210,9 @@ class PathNew extends Component{
         <div className="newMain clearfix">
           <div className="educontent mt10 mb50">
             <div className="mb10 edu-back-white">
-              <p className="padding20 bor-bottom-greyE font-18 color-grey-3">创建实训课程</p>
+              <p className="padding20 bor-bottom-greyE font-18 color-grey-3">创建实践课程</p>
               <div className="padding30-20" id="part_Name">
-                <p className="color-grey-6 font-16 mb15">实训课程名称</p>
+                <p className="color-grey-6 font-16 mb15">实践课程名称</p>
                 <div className="df">
                   <span className="mr30 color-orange pt10">*</span>
                   <div className="flex1 mr20">
@@ -233,7 +233,7 @@ class PathNew extends Component{
                 <span className="mr30 color-orange pt10">*</span>
                 <div className="flex1 mr20">
                   <div id="shixun_introduction" className="new_li editormd editormd-vertical">
-                    <textarea className="input-100-45" name="description" placeholder="请在此输入实训课程的简介" value={description}></textarea>
+                    <textarea className="input-100-45" name="description" placeholder="请在此输入实践课程的简介" value={description}></textarea>
                   </div>
                   <p id="e_tip_shixun_introduction" className="edu-txt-right color-grey-cd font-12"></p>
                   <p id="e_tips_shixun_introduction" className="edu-txt-right color-grey-cd font-12"></p>
@@ -247,7 +247,7 @@ class PathNew extends Component{
                 <span className="mr30 color-orange pt10">*</span>
                 <div className="flex1 mr20">
                   <div id="shixun_propaedeutics" className="new_li editormd editormd-vertical">
-                    <textarea name="learning_notes" placeholder="请在此输入实训课程的学习须知" value={point}></textarea>
+                    <textarea name="learning_notes" placeholder="请在此输入实践课程的学习须知" value={point}></textarea>
                   </div>
                   <p id="e_tip_shixun_propaedeutics" className="edu-txt-right color-grey-cd font-12"></p>
                   <p id="e_tips_shixun_propaedeutics" className="edu-txt-right color-grey-cd font-12"></p>

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

@@ -751,9 +751,9 @@ submittojoinclass=(value)=>{
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`}>我的课堂</Link></li>
                 {/* p 老师  l 学生 */}
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训</Link></li>
-                <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实训课程</Link></li>
+                <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li>
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的项目</Link></li>
-                <li><a href={this.props.Headertop===undefined?"":this.props.Headertop.account_manager_url}>账号管理</a></li>
+                <li><a href={`/account/basic`}>账号管理</a></li>
                 {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
                 {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
                 {/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
@@ -788,7 +788,7 @@ submittojoinclass=(value)=>{
                 <ul className="fl with50 edu-txt-center pr ul-leftline">
                   <li><Link to={"/courses/new"}>新建课堂</Link></li>
                   <li><a href="/shixuns/new">新建实训</a></li>
-                  <li><a href={this.props.Headertop===undefined?"":"/paths/new"}>新建实训课程</a></li>
+                  <li><a href={this.props.Headertop===undefined?"":"/paths/new"}>新建实践课程</a></li>
                   <li><a href={this.props.Headertop===undefined?"":this.props.Headertop.new_project_url} target="_blank">新建项目</a></li>
                 </ul>
                 <ul className="fl with50 edu-txt-center">

public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css

@@ -60,7 +60,7 @@ a{
 
 #exercisememoMD .CodeMirror {
     margin-top: 31px !important;
-    height: 700px !important;
+    height: 374px !important;
     /*width: 579px !important;*/
 }
 
@@ -125,7 +125,7 @@ a{
 #neweditanswer .editormd-preview {
     top: 40px !important;
     height: 364px !important;
-    width: 578px !important;
+    width: 551px !important;
 }
 
 #repository_url_tip {

public/react/src/modules/tpm/component/TPMRightSection.js

@@ -151,7 +151,7 @@ class TPMRightSection extends Component {
                         <div className="padding20 edu-back-white mb10 mt10" style={{
                             display: TPMRightSectionData === undefined?"none":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "none" : "block"
                         }}>
-                              <p className="mb20 font-16 clearfix">相关实训课程</p>
+                              <p className="mb20 font-16 clearfix">相关实践课程</p>
                             <div className="recommend-list" >
                               {
                                   TPMRightSectionData===undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.map((i,k)=>{

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

@@ -330,7 +330,7 @@ class Infos extends Component{
                   <li className={`${moduleName == 'paths' ? 'active' : '' }`}>
                     <Link 
                       onClick={() => this.setState({moduleName: 'paths'})}
-                      to={`/users/${username}/paths`}>实训课程</Link>
+                      to={`/users/${username}/paths`}>实践课程</Link>
                   </li>
                   <li className={`${moduleName == 'projects' ? 'active' : '' }`}>
                     <Link 

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

@@ -143,13 +143,13 @@ class InfosPath extends Component{
           </div>
         }
         <div className="pl25 pr25 clearfix font-12 mb20 mt20">
-          <span className="fl color-grey-9">共参与{totalCount}个{category?category=="manage"?"发布":"学习":"实训课程"}</span>
+          <span className="fl color-grey-9">共参与{totalCount}个{category?category=="manage"?"发布":"学习":"实践课程"}</span>
           <span className="fr color-grey-9">时间最新</span>
         </div>
         <div className="square-list clearfix">
           {
             !isStudent && page == 1 && !category && is_current &&
-            <Create href={"/paths/new"} name={"新建实训课程"} index="3"></Create>
+            <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>
           }
           {
             (!data || data.subjects.length==0) && (isStudent || category) && <NoneData></NoneData>