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

public/react/src/modules/courses/common/CNotificationHOC.js

@@ -18,14 +18,22 @@ export function CNotificationHOC(options = {}) {
       }
     
 			showNotification = (description, message = "提示", icon) => {
-        const data = {
-          message,
-          description
-        }
-        if (icon) {
-          data.icon = icon;
-        }
-        notification.open(data);
+        // const data = {
+        //   message,
+        //   description
+        // }
+        // if (icon) {
+        //   data.icon = icon;
+        // }
+        // notification.open(data);
+
+				notification.open({
+					message:message,
+					description: description,
+					style: {
+						zIndex: 99999999
+					},
+				});
       }
 
 			  bytesToSize = (bytes)  => {

public/react/src/modules/courses/new/CoursesNew.js

@@ -78,6 +78,12 @@ class CoursesNew extends Component {
                 console.log(error);
             })
         }else{
+					let url = "/courses/new.json"
+					axios.get(url).then((result) => {
+						 console.log(result)
+					}).catch((error) => {
+						console.log(error);
+					})
             // console.log(user_school);
             this.props.form.setFieldsValue({
                 school:user_school,

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

@@ -15,7 +15,8 @@ import {
 	Pagination,
 	Radio,
 	Tooltip,
-	notification
+	notification,
+	Spin,
 } from "antd";
 import './style.css';
 import 'moment/locale/zh-cn';
@@ -2253,7 +2254,7 @@ class Listofworksstudentone extends Component {
 	render() {
 		let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
 
-
+		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 		// console.log(this.state.student_works);
 		// console.log("841");
 		// console.log(this.state.columns);
@@ -2384,13 +2385,16 @@ class Listofworksstudentone extends Component {
 								background:#EDEDED;
 							  cursor: pointer;
 							}
-
+							.shixunSpin{
+								color:#FF6801;
+							  margin-right: 10px;
+							}
 							`}
 							</style>
 							{computeTimetype===false?<li className="clearfix startbox">
+							 <Spin indicator={antIcon} spinning={!computeTimetype} className={"shixunSpin"}/>
 							<span className={"startfont"}>
-				         	正在执行成绩计算，请稍后刷新页面查看结果
-								  温馨提示：执行时间因作品数量而异
+			         	正在执行成绩计算，完成后将为您自动刷新结果。温馨提示：执行时间因作品数量而异
 							</span>
 							</li>:""}
 
@@ -2654,12 +2658,19 @@ class Listofworksstudentone extends Component {
 								<div className={"educontent "}>
 									<div className="edu-back-white" style={{width: "1200"}}>
 
-
-
+										<style>
+											{
+												`
+											.shixunSpin{
+												color:#FF6801;
+												margin-right: 10px;
+												}
+										`}
+										</style>
 										{computeTimetype===false?<li className="clearfix startbox mb20">
+											<Spin indicator={antIcon} spinning={!computeTimetype} className={"shixunSpin"}/>
 									<span className={"startfont"}>
-								      正在执行成绩计算，请稍后刷新页面查看结果
-								      温馨提示：执行时间因作品数量而异
+					         	正在执行成绩计算，完成后将为您自动刷新结果。温馨提示：执行时间因作品数量而异
 									</span>
 										</li>:""}
 
@@ -2774,12 +2785,20 @@ class Listofworksstudentone extends Component {
 								<div className={"educontent mb20"}>
 
 									<div className="edu-back-white">
-
+										<style>
+											{
+												`
+											.shixunSpin{
+												color:#FF6801;
+												margin-right: 10px;
+												}
+										`}
+										</style>
 
 										{computeTimetype===false?<li className="clearfix startbox mb20">
+											<Spin indicator={antIcon} spinning={!computeTimetype} className={"shixunSpin"}/>
 									<span className={"startfont"}>
-								      正在执行成绩计算，请稍后刷新页面查看结果
-								      温馨提示：执行时间因作品数量而异
+						         	正在执行成绩计算，完成后将为您自动刷新结果。温馨提示：执行时间因作品数量而异
 									</span>
 										</li>:""}
 

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

@@ -158,6 +158,15 @@ class PathNew extends Component{
   }
 
   componentDidMount() {
+
+		let url = "/paths/new.json"
+		axios.get(url).then((result) => {
+			console.log(result)
+		}).catch((error) => {
+			console.log(error);
+		})
+
+
     let pathId = this.props.match.params.pathId;
     if (pathId) {
       this.isEditPage = true