From 24f1f9e86e86062644586495ad912124522371b3 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, 3 Jul 2019 18:30:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/Resource/Fileslistitem.js |    2 +-
 .../courses/exercise/Exercisesetting.js       |    6 +-
 .../courses/shixunHomework/Listofworks.js     |    2 +-
 .../shixunHomework/Listofworksstudentone.js   |   64 +-
 .../shixunHomework/Trainingjobsetting.js      |    2 +-
 .../shixunHomework/Workquestionandanswer.js   |    2 +-
 .../paths/PathDetail/PathDetailIndex.js       | 1026 ++++++++---------
 public/react/src/modules/paths/PathNew.js     |  546 ++++-----
 8 files changed, 844 insertions(+), 806 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index e69cdb4d5..382283fee 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -300,7 +300,7 @@ class Fileslistitem extends Component{
                       </WordsBtn>
                       </span>:""}
 
-											{this.props.current_user.login===discussMessage.author.login?
+											{this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
 												<span className={"fr mrf2 mr10"}>
 
                       <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js
index d07258ab3..1e151b654 100644
--- a/public/react/src/modules/courses/exercise/Exercisesetting.js
+++ b/public/react/src/modules/courses/exercise/Exercisesetting.js
@@ -131,9 +131,9 @@ class Exercisesetting extends Component{
                     //         end_timetype:false
                     //     })
                     // }else{
-                        this.setState({
-                            end_timetype:true
-                        })
+                    //     this.setState({
+                    //         end_timetype:true
+                    //     })
                     // }
                 }
 
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 30a0af582..94dab0b63 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1440,7 +1440,7 @@ class Listofworks extends Component {
 								<Link
 									to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/questions`}>作业问答</Link>
 								{this.props.isAdmin() ?
-									this.state.code_review === true ? "" : <Link
+									this.state.code_review === true ||jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0]==="未发布"? "" : <Link
 										// to={`/courses/${this.state.props.match.params.coursesId}/${this.state.props.match.params.homeworkid}/student_work`}
 										to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/student_work`}>
 										代码查重</Link> : ""}
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 2974bf6ac..148b4b2e3 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -748,11 +748,12 @@ class Listofworksstudentone extends Component {
 	}
 
 	setComputeTime=()=>{
+		let {teacherdata}=this.state;
 		this.setState({
 			computeTimetype:false
 		})
 		let homeworkid = this.props.match.params.homeworkid;
-		let url = "/homework_commons/"+homeworkid+"/update_student_score.json";
+		let url = "/homework_commons/"+homeworkid+"/update_student_score.json?shixun_id="+teacherdata.shixun_id;
 
 		axios.get(url).then((response) => {
 			this.props.showNotification(`${response.data.message}`);
@@ -925,13 +926,13 @@ class Listofworksstudentone extends Component {
 											<div className="fr">
 
 												<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-												<span>
+												{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>:<div className={"computeTimes font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>}
-												</span>
+												</span>}
 
 											</div>
 
@@ -1079,22 +1080,61 @@ class Listofworksstudentone extends Component {
 													<span className="ml20"
 																style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>}
 
+											</span>
+											<style>
+												{`
+													.startbox{
+													height: 48px;
+													background: rgba(255,104,0,0.1);
+													line-height: 48px;
+
+													text-align: center;
+													}
+
+													.startfont{
+													 font-size:14px;
+													font-family:MicrosoftYaHei;
+													font-weight:400;
+													color:rgba(255,104,0,1);
+													}
+												.computeTime{
+														width: 73px;
+														height: 24px;
+														display: inline-block;
+														padding: 5px;
+														text-align: center;
+														line-height: 13px;
+														color: #4CACFF;
+														border: 1px solid #4CACFF;
+														cursor: pointer;
+													}
+
+													.computeTimes{
+														width: 73px;
+														height: 24px;
+														display: inline-block;
+														padding: 5px;
+														text-align: center;
+														line-height: 13px;
+														color: #C5C5C5;
+														border: 1px solid #EDEDED;
+														background:#EDEDED;
+														cursor: pointer;
+													}
+													`}
+											</style>
+											<div className="fr">
 
-												 <div className="fr">
-
-												 <span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-												 <span>
+												<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
+												{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>:<div className={"computeTimes font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>}
-												 </span>
-
-											   </div>
-
-											</span>
+												 </span>}
 
+											</div>
 											{/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/}
 											{/*<div className="fr  edu-menu-panel">*/}
 												{/*<ul>*/}
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 11017259a..064b17d2f 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1676,7 +1676,7 @@ class Trainingjobsetting extends Component {
                                 }
                                 <Link
                                     to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/questions`}>作业问答</Link>
-                                {this.props.isAdmin()?this.state.code_review===true?"": <Link
+                                {this.props.isAdmin()?this.state.code_review===true||jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0]==="未发布"?"": <Link
 																	to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/student_work`}>代码查重</Link> : ""}
 
                                 <style>{
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index 922496d69..65c0769b8 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -401,7 +401,7 @@ class Workquestionandanswer extends Component {
                                     className="active"
                                     to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/questions`}>作业问答</Link>
                                 {this.props.isAdmin()?
-                                  this.state.code_review===true?"":<Link
+                                  this.state.code_review===true||jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0]==="未发布"?"":<Link
                                     // to={`/courses/${this.state.props.match.params.coursesId}/${this.state.props.match.params.homeworkid}/student_work`}
                                     to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/student_work`}>
                                       代码查重</Link>:""}
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index 0c24a6756..ee7579ddc 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -1,515 +1,513 @@
-import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
-import DetailTop from './DetailTop.js';
-import DetailCards from './DetailCards.js'
-import AddCollaborators from "./addCollaborators.js";
-import {Icon,Tooltip} from 'antd';
-import { BrowserRouter as Router, Route, Link } from "react-router-dom";
-import { DragDropContext ,  Draggable, Droppable} from 'react-beautiful-dnd';
-import '../../paths/ShixunPaths.css';
-import "antd/dist/antd.css";
-import Modals from '../../modals/Modals';
-import axios from 'axios';
-import TPMRightSection from "../../tpm/component/TPMRightSection";
-import styled from "styled-components";
-
-const getItemStyle = (isDragging, draggableStyle) => ({
-  // change background colour if dragging
-  background: isDragging ? '#dceeff' : '',
-  // styles we need to apply on draggables
-  ...draggableStyle,
-});
-const getItems = count =>
-    Array.from({ length: count }, (v, k) => k).map(k => ({
-      id: `item-${k}`,
-      content: `item ${k}`
-    }));
-
-// a little function to help us with reordering the result
-const reorder = (list, startIndex, endIndex) => {
-  const result = Array.from(list);
-  const [removed] = result.splice(startIndex, 1);
-  result.splice(endIndex, 0, removed);
-
-  return result;
-};
-
-const List = styled.div`
-  background: lightgrey;
-  padding: 10px;
-`;
-
-const Item = styled.div`
-  display: flex;
-  align-items: center;
-  padding: 10px;
-  margin-bottom: 10px;
-  border: 1px solid grey;
-  background: white;
-  &:hover {
-    background: lightgrey;
-  }
-`;
-
-const DragHandle = styled.div`
-  width: 15px;
-  height: 15px;
-  margin-right: 8px;
-  background: grey;
-  visibility: hidden;
-  &:hover {
-    background: black;
-  }
-  ${Item}:hover & {
-    visibility: visible;
-  }
-`;
-const $ =window.$
-class PathDetailIndex extends Component{
-  constructor(props){
-    super(props)
-    this.state={
-      detailInfoList:undefined,
-      clickdetailInfoListtype:false,
-      Modalstype:false,
-      Modalstopval:undefined,
-      Modalsbottomval:undefined,
-      cardsModalcancel:this.cardsModalcancel,
-      cardsModalsave:this.cardsModalsave,
-      user_id:undefined,
-      loadtype:false,
-      items: getItems(10)
-    }
-    this.onDragEnd = this.onDragEnd.bind(this);
-
-  }
-  onDragEnd(result) {
-    // dropped outside the list
-    if (!result.destination) {
-      return;
-    }
-
-    try {
-
-    }catch (e) {
-
-    }
-    const items = reorder(
-        this.state.detailInfoList.members,
-        result.source.index,
-        result.destination.index
-    );
-     this.state.detailInfoList.members=items;
-    this.setState({
-      detailInfoList:this.state.detailInfoList,
-      items
-    });
-    console.log(this.state.detailInfoList.members)
-    console.log("items 数组数组数组数组")
-    console.log(items)
-  }
-  cardsModalcancel=()=>{
-    this.setState({
-      Modalstype:false,
-    })
-    window.history.go(-1)
-  }
-
-  cardsModalsave=()=>{
-    this.setState({
-      Modalstype:false,
-    })
-     window.history.go(-1)
-  }
-  // 加载markdown
-  updatamakedown=(id)=>{
-    setTimeout(()=>{
-        var shixunDescr = window.editormd.markdownToHTML(id, {
-            htmlDecode: "style,script,iframe",
-            taskList: true,
-            tex: true,
-            flowChart: true,
-            sequenceDiagram: true
-        });
-        $("#"+id+" p:first").addClass("ReactMarkdown");
-    }, 200)
-  }
-
-  componentDidMount(){
-    let pathid=this.props.match.params.pathId;
-    let url="/paths/"+pathid+".json";
-    axios.get(url).then((result)=>{
-
-        if(result.data.allow_visit===true){
-          this.setState({
-            detailInfoList:result.data,
-             items:  getItems(result.data.members.length),
-          })
-        }else{
-          window.location.href = "/403";
-          // this.setState({
-          //   Modalstype:true,
-          //   Modalstopval:'你没有权限访问，请联系对应课程管理人员开通',
-          // })
-        }
-
-    }).catch((error)=>{
-      console.log(error);
-    })
-  }
-
-  updatadetailInfoList=()=>{
-    let pathid=this.props.match.params.pathId;
-    let url="/paths/"+pathid+".json";
-    axios.get(url).then((result)=>{
-      if(result.data.allow_visit===true){
-        this.setState({
-          detailInfoList:result.data,
-          items:  getItems(result.data.members.length),
-          user_id:undefined,
-        })
-      }else{
-        window.location.href = "/403";
-        // this.setState({
-        //   Modalstype:true,
-        //   Modalstopval:'你没有权限访问，请联系对应课程管理人员开通',
-        // })
-      }
-    }).catch((error)=>{
-      console.log(error);
-    })
-  }
-  clickNewsubscript=(val)=>{
-    if(val===0){
-      this.setState({
-        clickdetailInfoListtype:true
-      })
-    }else{
-      this.setState({
-        clickdetailInfoListtype:false
-      })
-    }
-
-  }
-
-  timeStamp=(value)=>{
-    var secondTime = parseInt(value);// 秒
-    var minuteTime = 0;// 分
-    var hourTime = 0;// 小时
-    if(secondTime > 60) {//如果秒数大于60，将秒数转换成整数
-      //获取分钟，除以60取整数，得到整数分钟
-      minuteTime = parseInt(secondTime / 60);
-      //获取秒数，秒数取佘，得到整数秒数
-      secondTime = parseInt(secondTime % 60);
-      //如果分钟大于60，将分钟转换成小时
-      if(minuteTime > 60) {
-        //获取小时，获取分钟除以60，得到整数小时
-        hourTime = parseInt(minuteTime / 60);
-        //获取小时后取佘的分，获取分钟除以60取佘的分
-        minuteTime = parseInt(minuteTime % 60);
-      }
-    }
-    var result = "" + parseInt(secondTime) + "秒";
-
-    if(minuteTime > 0) {
-      result = "" + parseInt(minuteTime) + "分" + result;
-    }
-    if(hourTime > 0) {
-      result = "" + parseInt(hourTime) + "小时" + result;
-    }
-    return result;
-  }
-
-
-  shanchuallow=(id)=>{
-    this.setState({
-      user_id:id,
-      Modalstype:true,
-      Modalstopval:"你确定要删除该成员吗？",
-      cardsModalsave:this.delectshanchuallow,
-      loadtype:false
-    })
-  }
-
-  delectshanchuallow=()=>{
-    let{user_id}=this.state;
-    let pathid=this.props.match.params.pathId;
-    let url="/paths/"+pathid+"/delete_member.json";
-    let param={user_id:user_id};
-    axios.delete(url,{data:param}).then((response) => {
-      if(response.data.status===1){
-        this.setState({
-          Modalstype:true,
-          Modalstopval:response.data.message,
-          loadtype:true,
-          cardsModalsave:this.cardsModalsave,
-        })
-        this.updatadetailInfoList();
-      }
-    }).catch((error) => {
-      console.log(error)
-    })
-  }
-
-  //上移
-  moveup=(data)=>{
-    // console.log(data);
-    let pathid=this.props.match.params.pathId;
-    let url=`/paths/${pathid}/up_member_position.json`;
-    axios.post(url,{
-      user_id:data.id
-    }).then((response) => {
-      if(response.status === 200){
-        console.log("上移");
-        // console.log(this.state.detailInfoList.members);
-        // console.log(response);
-        this.state.detailInfoList.members=response.data.members;
-        this.setState({
-          detailInfoList:this.state.detailInfoList,
-        });
-        // console.log(this.state.detailInfoList.members);
-
-      }
-
-    }).catch((error) => {
-      console.log(error)
-    })
-  }
-
-  //下移
-  movedown =(data) => {
-    // console.log(data);
-    let pathid=this.props.match.params.pathId;
-    let url=`/paths/${pathid}/down_member_position.json`;
-    axios.post(url,{
-      user_id:data.id
-    }).then((response) => {
-       if( response.status === 200){
-         console.log("下移");
-         // console.log(this.state.detailInfoList.members);
-         // console.log(response);
-         this.state.detailInfoList.members=response.data.members;
-         this.setState({
-           detailInfoList:this.state.detailInfoList,
-         });
-         // console.log(this.state.detailInfoList.members);
-       }
-
-    }).catch((error) => {
-      console.log(error)
-    })
-  }
-    render(){
-
-    this.updatamakedown("shixuns_propaedeutics");
-    this.updatamakedown("subject_learning_notes");
-    let {detailInfoList,
-      clickdetailInfoListtype,
-      Modalstype,
-      Modalstopval,
-      Modalsbottomval,
-      cardsModalcancel,
-      cardsModalsave,
-      loadtype
-    } = this.state
-
-
-    return(
-      <div className="newContainer">
-        <Modals
-          modalsType={Modalstype}
-          modalsTopval={Modalstopval}
-          modalsBottomval={Modalsbottomval}
-          modalCancel={cardsModalcancel}
-          modalSave={cardsModalsave}
-          loadtype={loadtype}
-        >
-        </Modals>
-          <div className="newMain clearfix">
-            <DetailTop {...this.state} {...this.props}></DetailTop>
-            <div className="educontent clearfix mb80">
-              <div className="with65 fl"> 
-                <div className="produce-content mb10">
-                  <p className="clearfix mb20">
-                    <span className="fl font-18 font-bd">简介</span>
-                    {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
-                      <Link className="fr" to={"/paths/"+this.props.match.params.pathId+"/edit"}>
-                        <i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>
-                      </Link>
-                      :""
-                    }
-                  </p>
-                  <div className="color-grey-6 clearfix">
-                    <div id="shixuns_propaedeutics" className="new_li fl" style={{"padding":" 0px","textAlign": "justify;"}}>
-                      {detailInfoList === undefined ? "" :detailInfoList.description===null?"":
-                          <textarea>
-                          {detailInfoList.description}
-                        </textarea>
-                      }
-                    </div>
-                  </div>
-                </div>
-                
-                <DetailCards
-                  {...this.props}
-                  {...this.state}
-                  updatadetailInfoLists={this.updatadetailInfoList}
-                ></DetailCards>
-              </div>
-              <div className="with35 fr pl20">
-                <div className="edu-back-white mustlearn mb10">
-                  <p className="clearfix mb30">
-                    <span className="font-16">课程须知</span>
-                    {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
-                      <Link to={"/paths/"+this.props.match.params.pathId+"/edit"} className="fr mtf5">
-                        <i className="iconfont icon-bianjidaibeijing font-20 color-green" data-tip-down="编辑"></i>
-                      </Link>
-                      :""
-                    }
-                  </p>
-                  <div id="subject_learning_notes" className="color-grey-6 new_li markdown-body editormd-html-preview justify">
-                    {detailInfoList === undefined ? "" :detailInfoList.learning_notes===null?"":
-                    <textarea>{detailInfoList.learning_notes}</textarea>
-                    }
-                  </div>
-                </div>
-                {detailInfoList === undefined ? "" : detailInfoList.tags === null ? "":
-                  <div className="edu-back-white padding40-20 mb10 relative">
-                    <p className="font-16 mb20">技能标签 <span className="color-grey-c">{detailInfoList.tags.length}</span></p>
-
-                      <div className={clickdetailInfoListtype===false?"newedbox newedboxheight":"newedbox newminheight"}>
-                          <div className="clearfix" id="boxheight">
-                            {
-                              detailInfoList.tags && detailInfoList.tags.map((item,key)=>{
-                                return(
-                                  <span value={key} className = {item.status == true ? "edu-filter-btn29BD8B fl" : "newedu-filter-btn fl"}>{item.tag_name}</span>
-                                )
-                              })
-                            }
-                          </div>
-                      </div>
-
-                    <div className={detailInfoList.tags.length>15&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"}
-                         data-tip-down="显示全部"
-                         onClick={()=>this.clickNewsubscript(0)}
-                    ><span className="mr8">...</span><Icon type="caret-down" />
-                    </div>
-
-                    <div className={clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 none":"newsubscript mb9 color-grey-9 fr"}
-                         data-tip-down="收起"
-                         onClick={()=>this.clickNewsubscript(1)}><Icon type="caret-up" />
-                    </div>
-
-                  </div>
-                }
-                {
-                  detailInfoList === undefined ? "" : detailInfoList.progress === null ? "" :
-                  <div className="edu-back-white myProgress padding40-20 mb10">
-                    <p className="mb20">
-                      <span className="font-16 mr10">我的进展</span>
-                      <Tooltip placement="bottom" title="获得经验值/总经验值">
-                          <span className="color-green"  >{detailInfoList.progress.my_score} / {detailInfoList.progress.all_score}</span>
-                      </Tooltip>
-                    </p>
-                    <p className="clearfix mb10">
-                      <span className="fl color-green">已学 {detailInfoList.progress.learned}%</span>
-                      <span className="fr color-grey-9" id="time-consuming">学习耗时{this.timeStamp(detailInfoList.progress.time)} </span>
-                    </p>
-                    <div className="myProgressNav"><div className="myProgressGreen" style={{"width":`${detailInfoList.progress.learned+"%"}`}}></div></div>
-                  </div>
-                }
-
-                {
-                  detailInfoList ===undefined ?"":detailInfoList.members === null ?"":
-                  <div className="teacherTeam edu-back-white clearfix" id="subject_members">  
-                    <p className="font-16 clearfix">教学团队</p>
-
-                    { detailInfoList===undefined?
-                      detailInfoList.members && detailInfoList.members.map((item,key)=>{
-                        return(
-                            <div className="teacherTeamItem clearfix df" key={key}>
-                              <a href={item.user_url} target="_blank" className="fl">
-                                <img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
-                              </a>
-
-                              <div className="fl ml15 flex1">
-                                <p className="mb10 mt5">{item.name}
-                                  {/*{*/}
-                                  {/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
-                                  {/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
-                                  {/*}*/}
-                                </p>
-                                <div className="clearfix">
-                                  <p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
-                                </div>
-                              </div>
-                            </div>
-                        )
-                      })
-                    :detailInfoList.allow_add_member===true?
-                            detailInfoList.members && detailInfoList.members.map((item,key)=>{
-                              return(
-                                  <div className="teacherTeamItem clearfix df" key={key}>
-                                    <a href={item.user_url} target="_blank" className="fl">
-                                      <img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
-                                    </a>
-
-                                    <div className="fl ml15 flex1">
-                                      <p className="mb10 mt5">{item.name}
-                                        {
-                                         detailInfoList===undefined?"":detailInfoList.allow_add_member===true?
-                                          <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""
-                                        }
-                                      </p>
-                                      <div className="clearfix">
-                                        <p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
-                                      </div>
-                                      {
-                                        detailInfoList===undefined?"":detailInfoList.allow_add_member===true? <div>
-                                              <div className="fr ml15 flex1"><a onClick={()=>this.moveup(item)}><Tooltip title="上移"><i className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a></div>
-                                            <div className="fr  ml15 flex1 "><a onClick={()=>this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>
-                                            </div>
-                                              :""
-                                      }
-
-                                    </div>
-                                  </div>
-                              )
-                            })
-                            : detailInfoList.members && detailInfoList.members.map((item,key)=>{
-                          return(
-                              <div className="teacherTeamItem clearfix df" key={key}>
-                                <a href={item.user_url} target="_blank" className="fl">
-                                  <img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
-                                </a>
-
-                                <div className="fl ml15 flex1">
-                                  <p className="mb10 mt5">{item.name}
-                                    {/*{*/}
-                                    {/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
-                                    {/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
-                                    {/*}*/}
-                                  </p>
-                                  <div className="clearfix">
-                                    <p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
-                                  </div>
-                                </div>
-                              </div>
-                          )
-                        })}
-
-                  </div>
-                }  
-                
-                
-                <AddCollaborators {...this.props} {...this.state} updatadetailInfoLists={this.updatadetailInfoList}></AddCollaborators>
-                
-              </div>
-            </div>            
-          </div>
-          
-      </div>
-    )
-  }
-}
+import React, { Component } from 'react';
+import {getImageUrl,markdownToHTML} from 'educoder';
+import DetailTop from './DetailTop.js';
+import DetailCards from './DetailCards.js'
+import AddCollaborators from "./addCollaborators.js";
+import {Icon,Tooltip} from 'antd';
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
+import { DragDropContext ,  Draggable, Droppable} from 'react-beautiful-dnd';
+import '../../paths/ShixunPaths.css';
+import "antd/dist/antd.css";
+import Modals from '../../modals/Modals';
+import axios from 'axios';
+import TPMRightSection from "../../tpm/component/TPMRightSection";
+import styled from "styled-components";
+
+const getItemStyle = (isDragging, draggableStyle) => ({
+  // change background colour if dragging
+  background: isDragging ? '#dceeff' : '',
+  // styles we need to apply on draggables
+  ...draggableStyle,
+});
+const getItems = count =>
+    Array.from({ length: count }, (v, k) => k).map(k => ({
+      id: `item-${k}`,
+      content: `item ${k}`
+    }));
+
+// a little function to help us with reordering the result
+const reorder = (list, startIndex, endIndex) => {
+  const result = Array.from(list);
+  const [removed] = result.splice(startIndex, 1);
+  result.splice(endIndex, 0, removed);
+
+  return result;
+};
+
+const List = styled.div`
+  background: lightgrey;
+  padding: 10px;
+`;
+
+const Item = styled.div`
+  display: flex;
+  align-items: center;
+  padding: 10px;
+  margin-bottom: 10px;
+  border: 1px solid grey;
+  background: white;
+  &:hover {
+    background: lightgrey;
+  }
+`;
+
+const DragHandle = styled.div`
+  width: 15px;
+  height: 15px;
+  margin-right: 8px;
+  background: grey;
+  visibility: hidden;
+  &:hover {
+    background: black;
+  }
+  ${Item}:hover & {
+    visibility: visible;
+  }
+`;
+const $ =window.$
+class PathDetailIndex extends Component{
+  constructor(props){
+    super(props)
+    this.state={
+      detailInfoList:undefined,
+      clickdetailInfoListtype:false,
+      Modalstype:false,
+      Modalstopval:undefined,
+      Modalsbottomval:undefined,
+      cardsModalcancel:this.cardsModalcancel,
+      cardsModalsave:this.cardsModalsave,
+      user_id:undefined,
+      loadtype:false,
+      items: getItems(10)
+    }
+    this.onDragEnd = this.onDragEnd.bind(this);
+
+  }
+  onDragEnd(result) {
+    // dropped outside the list
+    if (!result.destination) {
+      return;
+    }
+
+    try {
+
+    }catch (e) {
+
+    }
+    const items = reorder(
+        this.state.detailInfoList.members,
+        result.source.index,
+        result.destination.index
+    );
+     this.state.detailInfoList.members=items;
+    this.setState({
+      detailInfoList:this.state.detailInfoList,
+      items
+    });
+    console.log(this.state.detailInfoList.members)
+    console.log("items 数组数组数组数组")
+    console.log(items)
+  }
+  cardsModalcancel=()=>{
+    this.setState({
+      Modalstype:false,
+    })
+    window.history.go(-1)
+  }
+
+  cardsModalsave=()=>{
+    this.setState({
+      Modalstype:false,
+    })
+     window.history.go(-1)
+  }
+  // 加载markdown
+  updatamakedown=(id)=>{
+    setTimeout(()=>{
+        var shixunDescr = window.editormd.markdownToHTML(id, {
+            htmlDecode: "style,script,iframe",
+            taskList: true,
+            tex: true,
+            flowChart: true,
+            sequenceDiagram: true
+        });
+        $("#"+id+" p:first").addClass("ReactMarkdown");
+    }, 200)
+  }
+
+  componentDidMount(){
+    let pathid=this.props.match.params.pathId;
+    let url="/paths/"+pathid+".json";
+    axios.get(url).then((result)=>{
+
+        if(result.data.allow_visit===true){
+          this.setState({
+            detailInfoList:result.data,
+             items:  getItems(result.data.members.length),
+          })
+        }else{
+          window.location.href = "/403";
+          // this.setState({
+          //   Modalstype:true,
+          //   Modalstopval:'你没有权限访问，请联系对应课程管理人员开通',
+          // })
+        }
+
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+
+  updatadetailInfoList=()=>{
+    let pathid=this.props.match.params.pathId;
+    let url="/paths/"+pathid+".json";
+    axios.get(url).then((result)=>{
+      if(result.data.allow_visit===true){
+        this.setState({
+          detailInfoList:result.data,
+          items:  getItems(result.data.members.length),
+          user_id:undefined,
+        })
+      }else{
+        window.location.href = "/403";
+        // this.setState({
+        //   Modalstype:true,
+        //   Modalstopval:'你没有权限访问，请联系对应课程管理人员开通',
+        // })
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+  clickNewsubscript=(val)=>{
+    if(val===0){
+      this.setState({
+        clickdetailInfoListtype:true
+      })
+    }else{
+      this.setState({
+        clickdetailInfoListtype:false
+      })
+    }
+
+  }
+
+  timeStamp=(value)=>{
+    var secondTime = parseInt(value);// 秒
+    var minuteTime = 0;// 分
+    var hourTime = 0;// 小时
+    if(secondTime > 60) {//如果秒数大于60，将秒数转换成整数
+      //获取分钟，除以60取整数，得到整数分钟
+      minuteTime = parseInt(secondTime / 60);
+      //获取秒数，秒数取佘，得到整数秒数
+      secondTime = parseInt(secondTime % 60);
+      //如果分钟大于60，将分钟转换成小时
+      if(minuteTime > 60) {
+        //获取小时，获取分钟除以60，得到整数小时
+        hourTime = parseInt(minuteTime / 60);
+        //获取小时后取佘的分，获取分钟除以60取佘的分
+        minuteTime = parseInt(minuteTime % 60);
+      }
+    }
+    var result = "" + parseInt(secondTime) + "秒";
+
+    if(minuteTime > 0) {
+      result = "" + parseInt(minuteTime) + "分" + result;
+    }
+    if(hourTime > 0) {
+      result = "" + parseInt(hourTime) + "小时" + result;
+    }
+    return result;
+  }
+
+
+  shanchuallow=(id)=>{
+    this.setState({
+      user_id:id,
+      Modalstype:true,
+      Modalstopval:"你确定要删除该成员吗？",
+      cardsModalsave:this.delectshanchuallow,
+      loadtype:false
+    })
+  }
+
+  delectshanchuallow=()=>{
+    let{user_id}=this.state;
+    let pathid=this.props.match.params.pathId;
+    let url="/paths/"+pathid+"/delete_member.json";
+    let param={user_id:user_id};
+    axios.delete(url,{data:param}).then((response) => {
+      if(response.data.status===1){
+        this.setState({
+          Modalstype:true,
+          Modalstopval:response.data.message,
+          loadtype:true,
+          cardsModalsave:this.cardsModalsave,
+        })
+        this.updatadetailInfoList();
+      }
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+
+  //上移
+  moveup=(data)=>{
+    // console.log(data);
+    let pathid=this.props.match.params.pathId;
+    let url=`/paths/${pathid}/up_member_position.json`;
+    axios.post(url,{
+      user_id:data.id
+    }).then((response) => {
+      if(response.status === 200){
+        console.log("上移");
+        // console.log(this.state.detailInfoList.members);
+        // console.log(response);
+        this.state.detailInfoList.members=response.data.members;
+        this.setState({
+          detailInfoList:this.state.detailInfoList,
+        });
+        // console.log(this.state.detailInfoList.members);
+
+      }
+
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+
+  //下移
+  movedown =(data) => {
+    // console.log(data);
+    let pathid=this.props.match.params.pathId;
+    let url=`/paths/${pathid}/down_member_position.json`;
+    axios.post(url,{
+      user_id:data.id
+    }).then((response) => {
+       if( response.status === 200){
+         console.log("下移");
+         // console.log(this.state.detailInfoList.members);
+         // console.log(response);
+         this.state.detailInfoList.members=response.data.members;
+         this.setState({
+           detailInfoList:this.state.detailInfoList,
+         });
+         // console.log(this.state.detailInfoList.members);
+       }
+
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
+    render(){
+
+    this.updatamakedown("shixuns_propaedeutics");
+    this.updatamakedown("subject_learning_notes");
+    let {detailInfoList,
+      clickdetailInfoListtype,
+      Modalstype,
+      Modalstopval,
+      Modalsbottomval,
+      cardsModalcancel,
+      cardsModalsave,
+      loadtype
+    } = this.state
+
+
+    return(
+      <div className="newContainer">
+        <Modals
+          modalsType={Modalstype}
+          modalsTopval={Modalstopval}
+          modalsBottomval={Modalsbottomval}
+          modalCancel={cardsModalcancel}
+          modalSave={cardsModalsave}
+          loadtype={loadtype}
+        >
+        </Modals>
+          <div className="newMain clearfix">
+            <DetailTop {...this.state} {...this.props}></DetailTop>
+            <div className="educontent clearfix mb80">
+              <div className="with65 fl"> 
+                <div className="produce-content mb10">
+                  <p className="clearfix mb20">
+                    <span className="fl font-18 font-bd">简介</span>
+                    {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
+                      <Link className="fr" to={"/paths/"+this.props.match.params.pathId+"/edit"}>
+                        <i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>
+                      </Link>
+                      :""
+                    }
+                  </p>
+                  <div className="color-grey-6 clearfix">
+                    <div id="shixuns_propaedeutics" className="new_li fl" style={{"padding":" 0px","textAlign": "justify;"}}>
+                      {detailInfoList === undefined ? "" :detailInfoList.description===null?"":
+												<div dangerouslySetInnerHTML={{__html: markdownToHTML(detailInfoList.description).replace(/▁/g,"▁▁▁")}}></div>
+                      }
+                    </div>
+                  </div>
+                </div>
+                
+                <DetailCards
+                  {...this.props}
+                  {...this.state}
+                  updatadetailInfoLists={this.updatadetailInfoList}
+                ></DetailCards>
+              </div>
+              <div className="with35 fr pl20">
+                <div className="edu-back-white mustlearn mb10">
+                  <p className="clearfix mb30">
+                    <span className="font-16">课程须知</span>
+                    {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
+                      <Link to={"/paths/"+this.props.match.params.pathId+"/edit"} className="fr mtf5">
+                        <i className="iconfont icon-bianjidaibeijing font-20 color-green" data-tip-down="编辑"></i>
+                      </Link>
+                      :""
+                    }
+                  </p>
+                  <div id="subject_learning_notes" className="color-grey-6 new_li markdown-body editormd-html-preview justify">
+                    {detailInfoList === undefined ? "" :detailInfoList.learning_notes===null?"":
+                    <textarea>{detailInfoList.learning_notes}</textarea>
+                    }
+                  </div>
+                </div>
+                {detailInfoList === undefined ? "" : detailInfoList.tags === null ? "":
+                  <div className="edu-back-white padding40-20 mb10 relative">
+                    <p className="font-16 mb20">技能标签 <span className="color-grey-c">{detailInfoList.tags.length}</span></p>
+
+                      <div className={clickdetailInfoListtype===false?"newedbox newedboxheight":"newedbox newminheight"}>
+                          <div className="clearfix" id="boxheight">
+                            {
+                              detailInfoList.tags && detailInfoList.tags.map((item,key)=>{
+                                return(
+                                  <span value={key} className = {item.status == true ? "edu-filter-btn29BD8B fl" : "newedu-filter-btn fl"}>{item.tag_name}</span>
+                                )
+                              })
+                            }
+                          </div>
+                      </div>
+
+                    <div className={detailInfoList.tags.length>15&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"}
+                         data-tip-down="显示全部"
+                         onClick={()=>this.clickNewsubscript(0)}
+                    ><span className="mr8">...</span><Icon type="caret-down" />
+                    </div>
+
+                    <div className={clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 none":"newsubscript mb9 color-grey-9 fr"}
+                         data-tip-down="收起"
+                         onClick={()=>this.clickNewsubscript(1)}><Icon type="caret-up" />
+                    </div>
+
+                  </div>
+                }
+                {
+                  detailInfoList === undefined ? "" : detailInfoList.progress === null ? "" :
+                  <div className="edu-back-white myProgress padding40-20 mb10">
+                    <p className="mb20">
+                      <span className="font-16 mr10">我的进展</span>
+                      <Tooltip placement="bottom" title="获得经验值/总经验值">
+                          <span className="color-green"  >{detailInfoList.progress.my_score} / {detailInfoList.progress.all_score}</span>
+                      </Tooltip>
+                    </p>
+                    <p className="clearfix mb10">
+                      <span className="fl color-green">已学 {detailInfoList.progress.learned}%</span>
+                      <span className="fr color-grey-9" id="time-consuming">学习耗时{this.timeStamp(detailInfoList.progress.time)} </span>
+                    </p>
+                    <div className="myProgressNav"><div className="myProgressGreen" style={{"width":`${detailInfoList.progress.learned+"%"}`}}></div></div>
+                  </div>
+                }
+
+                {
+                  detailInfoList ===undefined ?"":detailInfoList.members === null ?"":
+                  <div className="teacherTeam edu-back-white clearfix" id="subject_members">  
+                    <p className="font-16 clearfix">教学团队</p>
+
+                    { detailInfoList===undefined?
+                      detailInfoList.members && detailInfoList.members.map((item,key)=>{
+                        return(
+                            <div className="teacherTeamItem clearfix df" key={key}>
+                              <a href={item.user_url} target="_blank" className="fl">
+                                <img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
+                              </a>
+
+                              <div className="fl ml15 flex1">
+                                <p className="mb10 mt5">{item.name}
+                                  {/*{*/}
+                                  {/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
+                                  {/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
+                                  {/*}*/}
+                                </p>
+                                <div className="clearfix">
+                                  <p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+                                </div>
+                              </div>
+                            </div>
+                        )
+                      })
+                    :detailInfoList.allow_add_member===true?
+                            detailInfoList.members && detailInfoList.members.map((item,key)=>{
+                              return(
+                                  <div className="teacherTeamItem clearfix df" key={key}>
+                                    <a href={item.user_url} target="_blank" className="fl">
+                                      <img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
+                                    </a>
+
+                                    <div className="fl ml15 flex1">
+                                      <p className="mb10 mt5">{item.name}
+                                        {
+                                         detailInfoList===undefined?"":detailInfoList.allow_add_member===true?
+                                          <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""
+                                        }
+                                      </p>
+                                      <div className="clearfix">
+                                        <p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+                                      </div>
+                                      {
+                                        detailInfoList===undefined?"":detailInfoList.allow_add_member===true? <div>
+                                              <div className="fr ml15 flex1"><a onClick={()=>this.moveup(item)}><Tooltip title="上移"><i className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a></div>
+                                            <div className="fr  ml15 flex1 "><a onClick={()=>this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>
+                                            </div>
+                                              :""
+                                      }
+
+                                    </div>
+                                  </div>
+                              )
+                            })
+                            : detailInfoList.members && detailInfoList.members.map((item,key)=>{
+                          return(
+                              <div className="teacherTeamItem clearfix df" key={key}>
+                                <a href={item.user_url} target="_blank" className="fl">
+                                  <img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
+                                </a>
+
+                                <div className="fl ml15 flex1">
+                                  <p className="mb10 mt5">{item.name}
+                                    {/*{*/}
+                                    {/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
+                                    {/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
+                                    {/*}*/}
+                                  </p>
+                                  <div className="clearfix">
+                                    <p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+                                  </div>
+                                </div>
+                              </div>
+                          )
+                        })}
+
+                  </div>
+                }  
+                
+                
+                <AddCollaborators {...this.props} {...this.state} updatadetailInfoLists={this.updatadetailInfoList}></AddCollaborators>
+                
+              </div>
+            </div>            
+          </div>
+          
+      </div>
+    )
+  }
+}
 export default PathDetailIndex;
\ No newline at end of file
diff --git a/public/react/src/modules/paths/PathNew.js b/public/react/src/modules/paths/PathNew.js
index 0d0eff177..89adbc233 100644
--- a/public/react/src/modules/paths/PathNew.js
+++ b/public/react/src/modules/paths/PathNew.js
@@ -1,274 +1,274 @@
-import React,{ Component } from "react";
-
-import {getUrl} from 'educoder';
-import {Input} from 'antd';
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import axios from 'axios';
-// import '../page/tpiPage.css';
-require('codemirror/lib/codemirror.css');
-
-
-const $ = window.$;
-
-let origin = getUrl();
-let path = getUrl("/editormd/lib/");
-function create_editorMD(id, width, high, placeholder, imageUrl,initValue, callback) {
-  var editorName = window.editormd(id, {
-      width: width,
-      height: high,
-      path: path,   // "/editormd/lib/"
-      markdown : initValue,
-      syncScrolling: "single",
-      tex: true,
-      tocm: true,
-      emoji: true,
-      taskList: true,
-      codeFold: true,
-      searchReplace: true,
-      htmlDecode: "style,script,iframe",
-      sequenceDiagram: true,
-      autoFocus: false,
-      placeholder: placeholder,
-      toolbarIcons: function () {
-          // Or return editormd.toolbarModes[name]; // full, simple, mini
-          // Using "||" set icons align right.
-          return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-      },
-      toolbarCustomIcons: {
-          testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-          testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-      },
-      //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-      saveHTMLToTextarea: true,
-      // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-      dialogMaskOpacity: 0.6,
-      imageUpload: true,
-      imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-      imageUploadURL: imageUrl,//url
-      onload: function () {
-          // this.previewing();
-          $("#" + id + " [type=\"latex\"]").bind("click", function () {
-              editorName.cm.replaceSelection("```latex");
-              editorName.cm.replaceSelection("\n");
-              editorName.cm.replaceSelection("\n");
-              editorName.cm.replaceSelection("```");
-              var __Cursor = editorName.cm.getDoc().getCursor();
-              editorName.cm.setCursor(__Cursor.line - 1, 0);
-          });
-
-          $("#" + id + " [type=\"inline\"]").bind("click", function () {
-              editorName.cm.replaceSelection("$$$$");
-              var __Cursor = editorName.cm.getDoc().getCursor();
-              editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
-              editorName.cm.focus();
-          });
-          $("[type=\"inline\"]").attr("title", "行内公式");
-          $("[type=\"latex\"]").attr("title", "多行公式");
-
-
-          callback && callback()
-      }
-  });
-  // 一个页面有多个md时，onload方法只执行了一次
-  window.md_elocalStorage(editorName, `MemoQuestion_${id}`, `${id}`);
-
-  return editorName;
-}
-
-
-
-
-class PathNew extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      pathName:"",
-      description:"",
-      point:"",
-      flag_name:true
-    }
-  }
-
-  // 提交
-  submitNewPath=()=>{
-    let {pathName} = this.state;
-    if(pathName===""){
-      this.props.showSnackbar("请输入实训课程名称");
-      window.location.href="#part_Name";
-      this.setState({
-        flag_name:false
-      })
-      return;
-    }
-    let des=this.Des_editMD.getValue();
-    if(des===""){
-      this.props.showSnackbar("请输入实训课程的简介");
-      window.location.href="#part_Des";
-      return;
-    }
-    if (des.length > 5000) {
-      this.props.showSnackbar("实训课程的简介最大限制5000个字符");
-      window.location.href="#part_Des";
-      return;
-    }
-    let point = this.Point_editMD.getValue();
-    if(point===""){
-      this.props.showSnackbar("请输入实训课程的学习须知");
-      window.location.href="#part_point";
-      return;
-    }
-    if(point.length > 500){
-      this.props.showSnackbar("实训课程的学习须知最大限制500个字符");
-      window.location.href="#part_point";
-      return;
-    }
-    if (this.isEditPage == true) {
-      let pathId = this.props.match.params.pathId;
-
-      const editUrl = `/paths/${pathId}.json`
-      axios.put(editUrl,{
-        name:pathName,
-        description:des,
-        learning_notes:point
-      }).then((response)=>{
-        // console.log(response.data.subject_id);
-        if (response.data.subject_id) {
-          this.props.history.push(`/paths/${response.data.subject_id}`)
-        }
-      }).catch((error)=>{
-        console.log(error);
-      })
-    } else {
-      let url="/paths.json"
-      axios.post(url,{
-        name:pathName,
-        description:des,
-        learning_notes:point
-      }).then((response)=>{
-        // console.log(response.data.subject_id);
-        if (response.data.subject_id) {
-          this.props.history.push(`/paths/${response.data.subject_id}`)
-        }
-      }).catch((error)=>{
-        console.log(error);
-      })
-    }
-    
-  }
-
-  componentDidMount() {
-    let pathId = this.props.match.params.pathId;
-    if (pathId) {
-      this.isEditPage = true
-
-      // const url = `/paths/${pathId}.json`
-      const url = `/paths/${pathId}/edit.json`
-      axios.get(url).then((response)=>{
-        /**
-          description:
-          id: 13
-          learning_notes:
-          name: 
-         */ 
-         if (response.data.name) {
-          this.setState({
-            pathName: response.data.name
-          })
-
-          const Des_editMD = create_editorMD("shixun_introduction","100%","490px"
-            ,"请在此输入实训课程的简介，最大限制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,"");
-          this.Point_editMD=Point_editMD;
-         }
-      }).catch((error)=>{
-        console.log(error);
-      })
-    } else {
-      this.isEditPage = false
-
-      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","","");
-      this.Point_editMD=Point_editMD;
-    }
-    
-  }
-
-  InputName=(e)=>{
-    this.setState({
-      pathName:e.target.value,
-    })
-  }
-
-  render(){
-    let {pathName,description,point,flag_name}=this.state;
-    return(
-      <div className="newContainer">
-        <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>
-              <div className="padding30-20" id="part_Name">
-                <p className="color-grey-6 font-16 mb15">实训课程名称</p>
-                <div className="df">
-                  <span className="mr30 color-orange pt10">*</span>
-                  <div className="flex1 mr20">
-                    <Input className={flag_name===true?"input-100-45 greyInput":"input-100-45 greyInput bor-red"}
-                      maxLength="60"
-                      placeholder="例如：从Python程序设计-入门精通"
-                      value={pathName}
-                      onInput={this.InputName}
-                    ></Input>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <div className="mb10 edu-back-white padding30-20" id="part_Des">
-              <p className="color-grey-6 font-16 mb15">简介</p>
-              <div className="df">
-                <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>
-                  </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>
-                </div>
-              </div>
-            </div>
-
-            <div className="mb10 edu-back-white padding30-20" id="part_point">
-              <p className="color-grey-6 font-16 mb15">学习须知</p>
-              <div className="df">
-                <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>
-                  </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>
-                </div>
-              </div>
-            </div>
-            
-            <div className="clearfix mb30 mt30">
-              <a href="javascript:void(0)" className="defalutSubmitbtn fl mr20" onClick={this.submitNewPath}>提交</a>
-              {this.isEditPage ? 
-                <Link to={`/paths/${this.props.match.params.pathId}`} 
-                    className="defalutCancelbtn fl">取消</Link>
-                : <Link to={`/paths`} className="defalutCancelbtn fl">取消</Link>
-                }
-            </div>
-          
-          </div>
-        </div>
-        
-      </div>
-    )
-  }
-}
+import React,{ Component } from "react";
+
+import {getUrl,markdownToHTML} from 'educoder';
+import {Input} from 'antd';
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import axios from 'axios';
+// import '../page/tpiPage.css';
+require('codemirror/lib/codemirror.css');
+
+
+const $ = window.$;
+
+let origin = getUrl();
+let path = getUrl("/editormd/lib/");
+function create_editorMD(id, width, high, placeholder, imageUrl,initValue, callback) {
+  var editorName = window.editormd(id, {
+      width: width,
+      height: high,
+      path: path,   // "/editormd/lib/"
+      markdown : initValue,
+      syncScrolling: "single",
+      tex: true,
+      tocm: true,
+      emoji: true,
+      taskList: true,
+      codeFold: true,
+      searchReplace: true,
+      htmlDecode: "style,script,iframe",
+      sequenceDiagram: true,
+      autoFocus: false,
+      placeholder: placeholder,
+      toolbarIcons: function () {
+          // Or return editormd.toolbarModes[name]; // full, simple, mini
+          // Using "||" set icons align right.
+          return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
+      },
+      toolbarCustomIcons: {
+          testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
+          testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
+      },
+      //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+      saveHTMLToTextarea: true,
+      // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+      dialogMaskOpacity: 0.6,
+      imageUpload: true,
+      imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+      imageUploadURL: imageUrl,//url
+      onload: function () {
+          // this.previewing();
+          $("#" + id + " [type=\"latex\"]").bind("click", function () {
+              editorName.cm.replaceSelection("```latex");
+              editorName.cm.replaceSelection("\n");
+              editorName.cm.replaceSelection("\n");
+              editorName.cm.replaceSelection("```");
+              var __Cursor = editorName.cm.getDoc().getCursor();
+              editorName.cm.setCursor(__Cursor.line - 1, 0);
+          });
+
+          $("#" + id + " [type=\"inline\"]").bind("click", function () {
+              editorName.cm.replaceSelection("$$$$");
+              var __Cursor = editorName.cm.getDoc().getCursor();
+              editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+              editorName.cm.focus();
+          });
+          $("[type=\"inline\"]").attr("title", "行内公式");
+          $("[type=\"latex\"]").attr("title", "多行公式");
+
+
+          callback && callback()
+      }
+  });
+  // 一个页面有多个md时，onload方法只执行了一次
+  window.md_elocalStorage(editorName, `MemoQuestion_${id}`, `${id}`);
+
+  return editorName;
+}
+
+
+
+
+class PathNew extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      pathName:"",
+      description:"",
+      point:"",
+      flag_name:true
+    }
+  }
+
+  // 提交
+  submitNewPath=()=>{
+    let {pathName} = this.state;
+    if(pathName===""){
+      this.props.showSnackbar("请输入实训课程名称");
+      window.location.href="#part_Name";
+      this.setState({
+        flag_name:false
+      })
+      return;
+    }
+    let des=this.Des_editMD.getValue();
+    if(des===""){
+      this.props.showSnackbar("请输入实训课程的简介");
+      window.location.href="#part_Des";
+      return;
+    }
+    if (des.length > 5000) {
+      this.props.showSnackbar("实训课程的简介最大限制5000个字符");
+      window.location.href="#part_Des";
+      return;
+    }
+    let point = this.Point_editMD.getValue();
+    if(point===""){
+      this.props.showSnackbar("请输入实训课程的学习须知");
+      window.location.href="#part_point";
+      return;
+    }
+    if(point.length > 500){
+      this.props.showSnackbar("实训课程的学习须知最大限制500个字符");
+      window.location.href="#part_point";
+      return;
+    }
+    if (this.isEditPage == true) {
+      let pathId = this.props.match.params.pathId;
+
+      const editUrl = `/paths/${pathId}.json`
+      axios.put(editUrl,{
+        name:pathName,
+        description:des,
+        learning_notes:point
+      }).then((response)=>{
+        // console.log(response.data.subject_id);
+        if (response.data.subject_id) {
+          this.props.history.push(`/paths/${response.data.subject_id}`)
+        }
+      }).catch((error)=>{
+        console.log(error);
+      })
+    } else {
+      let url="/paths.json"
+      axios.post(url,{
+        name:pathName,
+        description:des,
+        learning_notes:point
+      }).then((response)=>{
+        // console.log(response.data.subject_id);
+        if (response.data.subject_id) {
+          this.props.history.push(`/paths/${response.data.subject_id}`)
+        }
+      }).catch((error)=>{
+        console.log(error);
+      })
+    }
+    
+  }
+
+  componentDidMount() {
+    let pathId = this.props.match.params.pathId;
+    if (pathId) {
+      this.isEditPage = true
+
+      // const url = `/paths/${pathId}.json`
+      const url = `/paths/${pathId}/edit.json`
+      axios.get(url).then((response)=>{
+        /**
+          description:
+          id: 13
+          learning_notes:
+          name: 
+         */ 
+         if (response.data.name) {
+          this.setState({
+            pathName: response.data.name
+          })
+
+          const Des_editMD = create_editorMD("shixun_introduction","100%","490px"
+            ,"请在此输入实训课程的简介，最大限制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,"");
+          this.Point_editMD=Point_editMD;
+         }
+      }).catch((error)=>{
+        console.log(error);
+      })
+    } else {
+      this.isEditPage = false
+
+      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","","");
+      this.Point_editMD=Point_editMD;
+    }
+    
+  }
+
+  InputName=(e)=>{
+    this.setState({
+      pathName:e.target.value,
+    })
+  }
+
+  render(){
+    let {pathName,description,point,flag_name}=this.state;
+    return(
+      <div className="newContainer">
+        <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>
+              <div className="padding30-20" id="part_Name">
+                <p className="color-grey-6 font-16 mb15">实训课程名称</p>
+                <div className="df">
+                  <span className="mr30 color-orange pt10">*</span>
+                  <div className="flex1 mr20">
+                    <Input className={flag_name===true?"input-100-45 greyInput":"input-100-45 greyInput bor-red"}
+                      maxLength="60"
+                      placeholder="例如：从Python程序设计-入门精通"
+                      value={pathName}
+                      onInput={this.InputName}
+                    ></Input>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div className="mb10 edu-back-white padding30-20" id="part_Des">
+              <p className="color-grey-6 font-16 mb15">简介</p>
+              <div className="df">
+                <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>
+                  </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>
+                </div>
+              </div>
+            </div>
+
+            <div className="mb10 edu-back-white padding30-20" id="part_point">
+              <p className="color-grey-6 font-16 mb15">学习须知</p>
+              <div className="df">
+                <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>
+                  </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>
+                </div>
+              </div>
+            </div>
+            
+            <div className="clearfix mb30 mt30">
+              <a href="javascript:void(0)" className="defalutSubmitbtn fl mr20" onClick={this.submitNewPath}>提交</a>
+              {this.isEditPage ? 
+                <Link to={`/paths/${this.props.match.params.pathId}`} 
+                    className="defalutCancelbtn fl">取消</Link>
+                : <Link to={`/paths`} className="defalutCancelbtn fl">取消</Link>
+                }
+            </div>
+          
+          </div>
+        </div>
+        
+      </div>
+    )
+  }
+}
 export default PathNew;
\ No newline at end of file

From da474ff992ed565183395867a7d9584c0b5183be 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, 3 Jul 2019 23:16:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/Resource/index.js     | 104 ++++-
 .../courses/coursesPublic/HomeworkModal.js    |  35 +-
 .../TPMUpdatepropaede/TPMUpdatepropaede.js    | 404 +++++++++---------
 .../Propaedeutics/Propaedeu_tics.js           |   4 +-
 4 files changed, 323 insertions(+), 224 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 07731686e..8ce285ae1 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -7,11 +7,12 @@ import Sendtofilesmodal from "../coursesPublic/SendToFilesModal";
 import Selectresource from "../coursesPublic/SelectResource";
 import Sendresource from "../coursesPublic/sendResource";
 import Selectsetting from "../coursesPublic/SelectSetting";
-import CourseLayoutcomponent from '../common/CourseLayoutComponent';
+import HomeworkModal from "../coursesPublic/HomeworkModal";
 import Fileslistitem from './Fileslistitem';
 import Titlesearchsection from '../common/titleSearch/TitleSearchSection';
 import './style.css';
 import '../css/members.css';
+import moment from 'moment';
 
 class Fileslists extends Component{
   constructor(props){
@@ -232,7 +233,9 @@ class Fileslists extends Component{
      this.props.showNotification("请先在列表中选择要发送的资源");
    }else if(value===3){
      this.props.showNotification("请先在列表中选择要公开的资源");
-   }
+   }else if(value===4){
+		 this.props.showNotification("请先在列表中选择要发布的资源");
+	 }
   }
 
   onDelete = () => {
@@ -549,7 +552,78 @@ class Fileslists extends Component{
         })
   }
 
+	homeworkstart=()=>{
+		let selectnum= this.testonSelect();
+		if(selectnum===true){
+			this.noSelect(4);
+			return
+		}
+		let starttime= this.props.getNowFormatDates(1);
+		let endtime=this.props.getNowFormatDates(2);
+		this.setState({
+			modalname:"立即发布",
+			visible:true,
+			typs:"start",
+			Topval:"学生将能立即查看和下载发布资源",
+			// Botvalleft:"暂不发布",
+			// Botval:`本操作只对"未发布"的分班有效`,
+			// starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
+			// starttimes:starttime,
+			// endtime:"截止时间："+endtime,
+			Cancelname:"暂不发布",
+			Savesname:"立即发布",
+			Cancel:this.homeworkhide,
+			Saves:this.homeworkstartend,
+		})
+	}
+	// 立即发布
+	homeworkstartend=(ds,endtime)=>{
+		let {checkBoxValues}=this.state;
+		let coursesId=this.props.match.params.coursesId;
+		let url ="/files/bulk_publish.json";
+		axios.put(url, {
+			course_id:coursesId,
+			ids	:checkBoxValues,
+		}).then((result)=>{
+			if(result.status===200){
+				this.props.showNotification("发布成功")
+				this.setState({
+					checkBoxValues:[],
+					checkAllValue:false
+				})
+				this.homeworkhide()
+				this.props.updataleftNavfun()
+				this.updatafiled()
+			}
+		}).catch((error)=>{
+			console.log(error);
+		})
+	}
+
 
+	homeworkhide=()=>{
+		this.setState({
+			modalname:undefined,
+			modaltype:undefined,
+			visible:false,
+			Topval:undefined,
+			Topvalright:undefined,
+			Botvalleft:undefined,
+			Botval:undefined,
+			starttime:undefined,
+			endtime:undefined,
+			Cancelname:undefined,
+			Savesname:undefined,
+			Cancel:undefined,
+			Saves:undefined,
+			StudentList_value:undefined,
+			addname:undefined,
+			addnametype:false,
+			addnametab:undefined,
+			typs:undefined,
+			starttimes:undefined,
+		})
+	}
   render(){
 
     let { searchValue,
@@ -582,6 +656,26 @@ class Fileslists extends Component{
     return(
         <React.Fragment >
 
+					{/*立即发布*/}
+					{this.state.visible===true?<HomeworkModal
+						category_id={this.props.match.params.category_id}
+						modaltype={this.state.modaltype}
+						modalname={this.state.modalname}
+						visible={this.state.visible}
+						Topval={this.state.Topval}
+						Topvalright={this.state.Topvalright}
+						Botvalleft={this.state.Botvalleft}
+						Botval={this.state.Botval}
+						starttime={this.state.starttime}
+						starttimes={this.state.starttimes}
+						typs={this.state.typs}
+						endtime={this.state.endtime}
+						Cancelname={this.state.Cancelname}
+						Savesname={this.state.Savesname}
+						Cancel={this.state.Cancel}
+						Saves={this.state.Saves}
+						course_groups={this.state.course_groups}
+					/>:""}
 
           {/*发送*/}
           <Sendtofilesmodal
@@ -687,9 +781,9 @@ class Fileslists extends Component{
                 <div className="studentList_operation_ul">
                   {this.props.isAdmin()?<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>:""}
                   {this.props.isAdmin()?<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onSend}>发送</a></li>:""}
-									{/*{this.props.isAdmin()?*/}
-										{/*<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.homeworkstart}>立即发布</a></li>*/}
-										{/*:""}*/}
+									{this.props.isAdmin()?
+										<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.homeworkstart}>立即发布</a></li>
+										:""}
                   {this.props.isAdmin()?course_is_public===true?
                     <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onOpen}>设为公开</a></li>
                     :"":""}
diff --git a/public/react/src/modules/courses/coursesPublic/HomeworkModal.js b/public/react/src/modules/courses/coursesPublic/HomeworkModal.js
index bc2fb60b5..440d8893c 100644
--- a/public/react/src/modules/courses/coursesPublic/HomeworkModal.js
+++ b/public/react/src/modules/courses/coursesPublic/HomeworkModal.js
@@ -88,25 +88,30 @@ class HomeworkModal extends Component{
 
 	propsSaves=(ds,endtime)=>{
 
-  	if(this.props.typs!="end"){
-			if(endtime === ""||endtime===undefined||endtime===null){
+  	if(ds.length ===0&&endtime === ""){
+			this.props.Saves()
+		}else{
+			if(this.props.typs!="end"){
+				if(endtime === ""||endtime===undefined||endtime===null){
 
-				this.setState({
-					endtimetype:true,
-					endtimetypevalue:"截止时间不能为空"
-				})
-				return
-			}
+					this.setState({
+						endtimetype:true,
+						endtimetypevalue:"截止时间不能为空"
+					})
+					return
+				}
 
-			if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttimes,"YYYY-MM-DD HH:mm")){
-				this.setState({
-					endtimetype:true,
-					endtimetypevalue:"必须晚于发布时间"
-				})
-				return
+				if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttimes,"YYYY-MM-DD HH:mm")){
+					this.setState({
+						endtimetype:true,
+						endtimetypevalue:"必须晚于发布时间"
+					})
+					return
+				}
 			}
+			this.props.Saves(ds,moment(handleDateString(endtime),"YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm"))
 		}
-  	this.props.Saves(ds,moment(handleDateString(endtime),"YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm"))
+
 
 	}
 
diff --git a/public/react/src/modules/tpm/TPMUpdatepropaede/TPMUpdatepropaede.js b/public/react/src/modules/tpm/TPMUpdatepropaede/TPMUpdatepropaede.js
index d1606da51..835debddb 100644
--- a/public/react/src/modules/tpm/TPMUpdatepropaede/TPMUpdatepropaede.js
+++ b/public/react/src/modules/tpm/TPMUpdatepropaede/TPMUpdatepropaede.js
@@ -1,202 +1,202 @@
-import React, {Component} from 'react';
-
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-// import "antd/dist/antd.css";
-
-import axios from 'axios';
-
-import {getUrl} from 'educoder';
-
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-
-function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
-    var editorName = window.editormd(id, {
-        width: width,
-        height: high,
-        path: path,   // "/editormd/lib/"
-
-        syncScrolling: "single",
-        tex: true,
-        tocm: true,
-        emoji: true,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
-        toolbarIcons: function () {
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea: true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity: 0.6,
-        placeholder: placeholder,
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: imageUrl,//url
-        onload: function () {
-            // this.previewing();
-            $("#" + id + " [type=\"latex\"]").bind("click", function () {
-                editorName.cm.replaceSelection("```latex");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("```");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line - 1, 0);
-            });
-
-            $("#" + id + " [type=\"inline\"]").bind("click", function () {
-                editorName.cm.replaceSelection("$$$$");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
-                editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
-
-            window.md_elocalStorage(editorName, `UpdatepropaedeMDs_${id}`, "UpdatepropaedeMDs");
-
-            callback && callback()
-        }
-    });
-    return editorName;
-}
-
-
-export default class TPMUpdatepropaede extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            shixunId:undefined
-        }
-    }
-
-    updatepropaedeMD(initValue, id) {
-
-        this.contentChanged = false;
-        const placeholder = "";
-        // amp;
-        // 编辑时要传memoId
-        const imageUrl = `/api/attachments.json`;
-        // 创建editorMd
-
-        const Updatepropaede_editormd = create_editorMD(id, '100%', 400, placeholder, imageUrl, () => {
-            setTimeout(() => {
-                Updatepropaede_editormd.resize()
-                Updatepropaede_editormd.cm && Updatepropaede_editormd.cm.refresh()
-            }, 500)
-
-            if (initValue != undefined) {
-                Updatepropaede_editormd.setValue(initValue)
-            }
-            Updatepropaede_editormd.cm.on("change", (_cm, changeObj) => {
-                console.log('....contentChanged')
-                this.contentChanged = true;
-            })
-        });
-        this.Updatepropaede_editormd = Updatepropaede_editormd;
-        window.Updatepropaede_editormd = Updatepropaede_editormd;
-    }
-
-    componentDidMount() {
-        let id = this.props.match.params.shixunId;
-        let url="/shixuns/"+id+"/propaedeutics.json";
-        axios.get(url).then((response) => {
-            console.log(response)
-            if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
-
-            }else{
-                this.setState({
-                    shixunId:id
-                })
-
-                if(response.data.content[0]!=null){
-                    this.updatepropaedeMD(response.data.content[0], "UpdatepropaedeMD");
-                }else{
-                    this.updatepropaedeMD("", "UpdatepropaedeMD");
-                }
-            }
-        }).catch((error) => {
-            console.log(error)
-        });
-
-    }
-
-    updatepropaedeuticsvalue=()=>{
-        let id = this.props.match.params.shixunId;
-        let url="/shixuns/"+id+"/update_propaedeutics.json";
-        const update_propaedeuticsvalue = this.Updatepropaede_editormd.getValue();
-        axios.post(url,{
-                content:update_propaedeuticsvalue
-            }
-            ).then((response) => {
-            if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
-
-            }else{
-                this.props.showSnackbar(response.data.message);
-            }
-        }).catch((error) => {
-            console.log(error)
-        });
-    }
-    render() {
-
-        let {shixunId} = this.state;
-
-
-        return (
-            <React.Fragment>
-                <div className="educontent">
-
-                     <div className="edu-back-white mt30">
-                         <div className="font-16 pt30 pl20 pr20 pb40 bor-bottom-greyE clearfix">
-                             <span className="fl">背景知识</span>
-                             <a href={"/shixuns/"+shixunId+"/propaedeutics"}className="color-grey-9 fr">返回</a>
-                         </div>
-
-                         <div className="padding40-20">
-                             <div className="padding10-20 edu-back-greyf5 radius4" id="UpdatepropaedeMD">
-                                 <textarea style={{display: 'none'}} id="Updatepropaedes" name="content"> </textarea>
-                                 <div className="CodeMirror cm-s-defualt">
-                                 </div>
-                             </div>
-                         </div>
-                     </div>
-
-                    <div className="clearfix mb30 mt30">
-                        <a className="defalutSubmitbtn fl mr20"
-                           onClick={this.updatepropaedeuticsvalue}>保存</a>
-                        <a href={"/shixuns/"+shixunId+"/propaedeutics"} className="defalutCancelbtn fl"
-                        >取消</a>
-                    </div>
-
-                </div>
-            </React.Fragment>
-        )
-    }
-}
-
-
+import React, {Component} from 'react';
+
+import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
+
+import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
+
+// import "antd/dist/antd.css";
+
+import axios from 'axios';
+
+import {getUrl} from 'educoder';
+
+let origin = getUrl();
+
+let path = getUrl("/editormd/lib/")
+
+const $ = window.$;
+
+let timeout;
+
+let currentValue;
+
+const Option = Select.Option;
+
+const RadioGroup = Radio.Group;
+
+function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
+    var editorName = window.editormd(id, {
+        width: width,
+        height: high,
+        path: path,   // "/editormd/lib/"
+
+        syncScrolling: "single",
+        tex: true,
+        tocm: true,
+        emoji: true,
+        taskList: true,
+        codeFold: true,
+        searchReplace: true,
+        htmlDecode: "style,script,iframe",
+        sequenceDiagram: true,
+        autoFocus: false,
+        toolbarIcons: function () {
+            // Or return editormd.toolbarModes[name]; // full, simple, mini
+            // Using "||" set icons align right.
+            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
+        },
+        toolbarCustomIcons: {
+            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
+            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
+        },
+        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+        saveHTMLToTextarea: true,
+        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+        dialogMaskOpacity: 0.6,
+        placeholder: placeholder,
+        imageUpload: true,
+        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+        imageUploadURL: imageUrl,//url
+        onload: function () {
+            // this.previewing();
+            $("#" + id + " [type=\"latex\"]").bind("click", function () {
+                editorName.cm.replaceSelection("```latex");
+                editorName.cm.replaceSelection("\n");
+                editorName.cm.replaceSelection("\n");
+                editorName.cm.replaceSelection("```");
+                var __Cursor = editorName.cm.getDoc().getCursor();
+                editorName.cm.setCursor(__Cursor.line - 1, 0);
+            });
+
+            $("#" + id + " [type=\"inline\"]").bind("click", function () {
+                editorName.cm.replaceSelection("$$$$");
+                var __Cursor = editorName.cm.getDoc().getCursor();
+                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+                editorName.cm.focus();
+            });
+            $("[type=\"inline\"]").attr("title", "行内公式");
+            $("[type=\"latex\"]").attr("title", "多行公式");
+
+            window.md_elocalStorage(editorName, `UpdatepropaedeMDs_${id}`, "UpdatepropaedeMDs");
+
+            callback && callback()
+        }
+    });
+    return editorName;
+}
+
+
+export default class TPMUpdatepropaede extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            shixunId:undefined
+        }
+    }
+
+    updatepropaedeMD(initValue, id) {
+
+        this.contentChanged = false;
+        const placeholder = "";
+        // amp;
+        // 编辑时要传memoId
+        const imageUrl = `/api/attachments.json`;
+        // 创建editorMd
+
+        const Updatepropaede_editormd = create_editorMD(id, '100%', 400, placeholder, imageUrl, () => {
+            setTimeout(() => {
+                Updatepropaede_editormd.resize()
+                Updatepropaede_editormd.cm && Updatepropaede_editormd.cm.refresh()
+            }, 500)
+
+            if (initValue != undefined) {
+                Updatepropaede_editormd.setValue(initValue)
+            }
+            Updatepropaede_editormd.cm.on("change", (_cm, changeObj) => {
+                console.log('....contentChanged')
+                this.contentChanged = true;
+            })
+        });
+        this.Updatepropaede_editormd = Updatepropaede_editormd;
+        window.Updatepropaede_editormd = Updatepropaede_editormd;
+    }
+
+    componentDidMount() {
+        let id = this.props.match.params.shixunId;
+        let url="/shixuns/"+id+"/propaedeutics.json";
+        axios.get(url).then((response) => {
+            console.log(response)
+            if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+
+            }else{
+                this.setState({
+                    shixunId:id
+                })
+
+                if(response.data.content[0]!=null){
+                    this.updatepropaedeMD(response.data.content, "UpdatepropaedeMD");
+                }else{
+                    this.updatepropaedeMD("", "UpdatepropaedeMD");
+                }
+            }
+        }).catch((error) => {
+            console.log(error)
+        });
+
+    }
+
+    updatepropaedeuticsvalue=()=>{
+        let id = this.props.match.params.shixunId;
+        let url="/shixuns/"+id+"/update_propaedeutics.json";
+        const update_propaedeuticsvalue = this.Updatepropaede_editormd.getValue();
+        axios.post(url,{
+                content:update_propaedeuticsvalue
+            }
+            ).then((response) => {
+            if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+
+            }else{
+                this.props.showSnackbar(response.data.message);
+            }
+        }).catch((error) => {
+            console.log(error)
+        });
+    }
+    render() {
+
+        let {shixunId} = this.state;
+
+
+        return (
+            <React.Fragment>
+                <div className="educontent">
+
+                     <div className="edu-back-white mt30">
+                         <div className="font-16 pt30 pl20 pr20 pb40 bor-bottom-greyE clearfix">
+                             <span className="fl">背景知识</span>
+                             <a href={"/shixuns/"+shixunId+"/propaedeutics"}className="color-grey-9 fr">返回</a>
+                         </div>
+
+                         <div className="padding40-20">
+                             <div className="padding10-20 edu-back-greyf5 radius4" id="UpdatepropaedeMD">
+                                 <textarea style={{display: 'none'}} id="Updatepropaedes" name="content"> </textarea>
+                                 <div className="CodeMirror cm-s-defualt">
+                                 </div>
+                             </div>
+                         </div>
+                     </div>
+
+                    <div className="clearfix mb30 mt30">
+                        <a className="defalutSubmitbtn fl mr20"
+                           onClick={this.updatepropaedeuticsvalue}>保存</a>
+                        <a href={"/shixuns/"+shixunId+"/propaedeutics"} className="defalutCancelbtn fl"
+                        >取消</a>
+                    </div>
+
+                </div>
+            </React.Fragment>
+        )
+    }
+}
+
+
diff --git a/public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js b/public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js
index c90f151c5..7582f52e4 100644
--- a/public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js
+++ b/public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js
@@ -36,9 +36,9 @@ class Propaedeutics extends Component {
       if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
 
       }else{
-        if(response.data.content[0]!=null){
+        if(response.data.content!=null){
           this.setState({
-            PropaedeuticsListcontent:response.data.content[0]
+            PropaedeuticsListcontent:response.data.content
           })
         }else{
           this.setState({

From ddad5986dc4791dad699021b6440e699bd111837 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, 3 Jul 2019 23:55:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/Resource/Fileslistitem.js   | 8 ++------
 .../modules/courses/shixunHomework/ShixunhomeWorkItem.js  | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 382283fee..a2f57a8e1 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -38,14 +38,10 @@ class Fileslistitem extends Component{
             if(result.data.attachment_histories.length===0){
 
               let link = document.createElement('a');
-              // link.href =  window.URL.createObjectURL(new Blob([result.data.url]));
+							document.body.appendChild(link);
               link.href = result.data.url;
-              let filesname=encodeURIComponent(result.data.title)
-              console.log(result.data.title)
-              link.download = decodeURIComponent(filesname)
+              link.download = result.data.title;
               //兼容火狐浏览器
-							console.log(result.data.title)
-              document.body.appendChild(link);
               let evt = document.createEvent("MouseEvents");
               evt.initEvent("click", false, false);
               link.dispatchEvent(evt);
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index aaf02498b..5731c3b73 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -360,7 +360,7 @@ class ShixunhomeWorkItem extends Component{
 						</style>
             {this.props.isAdmin?<div className={this.props.isClassManagement?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
               <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
-								{this.props.isClassManagement?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
+								{this.props.isAdminOrTeacher()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
               <WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings`}  > 设置</WordsBtn>
             </div>:""}
 

From 5b7e71d303e94df1c656c742623ac89b303b7b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 4 Jul 2019 00:39:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/ShixunStudentWork.js       |  4 +--
 .../shixunHomework/ShixunWorkDetails.js       | 31 +++++++++++--------
 .../Shixunworkdetails/ShixunWorkModal.js      |  4 +--
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index c7ae7292d..7188c65bd 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -94,7 +94,6 @@ class ShixunStudentWork extends Component {
 		let url = "/homework_commons/" + homeworkid + "/code_review_results.json";
 
 		axios.get(url).then((response) => {
-			debugger
 			if (response.data.status === undefined || response.data.status === 0) {
 				if(response.data!=undefined){
 					if(response.data.status!=-2){
@@ -688,6 +687,7 @@ class ShixunStudentWork extends Component {
 								<span className="fl mr10 color-grey-8">分班情况：</span>
 								<span className="fl ">
 									<a id="graduation_comment_no_limit"
+										 onClick={()=>this.groupgroup([])}
 								     className={this.state.group_infolist.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20 "}>
 										不限
 									</a>
@@ -756,7 +756,7 @@ class ShixunStudentWork extends Component {
 								dataSource={datalist}
 								columns={columns}
 								pagination={{  //分页
-									total: data&&data.all_reviews_count, //数据总数量
+									total: datalist.length===0?0:data&&data.all_reviews_count, //数据总数量
 									pageSize: 10,  //显示几条一页
 									current:page,
 								}}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
index ba3eea530..c1233ed3f 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js
@@ -51,13 +51,17 @@ class ShixunWorkDetails extends Component {
 		})
 	}
 
-	goback=()=>{
-		window.history.go(-1)
+	goback=(sum)=>{
+		let{data}=this.state
+		if(sum===1){
+			window.location.href = "/courses/"+data.course_id+"/students";
+		}else{
+			window.history.go(-1)
+		}
+
 	}
 	render() {
-
     let{data}=this.state;
-    console.log(data)
 		return (
 			<Spin size="large" spinning={this.state.spinning}>
 				{data===undefined? "":<div className="newMain clearfix ">
@@ -65,17 +69,18 @@ class ShixunWorkDetails extends Component {
 
 					<div className="educontent">
 						<p className="clearfix mt20">
-							<WordsBtn className="fl color-grey-9" style="btn colorgrey  hovercolorblue">
-								<Link to={"/courses/"+data&&data.course_id+"/students"}>
-									<span className={"color-grey-9"}>{data&&data.course_name}</span>
-								</Link>
-							</WordsBtn>
+							<a className="fl color-grey-9 btn colorgrey  hovercolorblue"
+								 onClick={()=>this.goback(1)}
+								 >
+								<span className={"color-grey-9"}>{data&&data.course_name}123</span>
+							</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-							<WordsBtn style="grey" className="btn colorgrey fl hovercolorblue ">
-								<Link to={"/courses/"+data&&data.course_id+"/"+this.state.shixuntypes+"/"+data&&data.homework_common_id}>
+								<a   className="btn colorgrey fl hovercolorblue grey"
+									onClick={this.goback}
+									// to={"/courses/"+data&&data.course_id+"/"+this.state.shixuntypes+"/"+data&&data.homework_common_id}
+								>
 									<span className={"color-grey-9"}>实训作业</span>
-								</Link>
-							</WordsBtn>
+								</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<WordsBtn className="fl">{data&&data.username}</WordsBtn>
 						</p>
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 715ffb7e8..5a4ad673c 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -221,7 +221,7 @@ class ShixunWorkModal extends Component{
 		let {course_groups,group_ids,onChangetype,group_list}=this.state;
 		// let {data}=this.props;
 		// console.log(group_list)
-		// console.log(course_groups)
+	  console.log(group_list)
 		return(
 			<div>
 				<Modal
@@ -277,7 +277,7 @@ class ShixunWorkModal extends Component{
 											</div>
 
 											:
-											group_list&&group_list.map((item,key)=>{
+											group_list&&group_list.length===0?"":group_list[0]===undefined?"":group_list.map((item,key)=>{
 												return(
 													item.work_count===0?"":<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
 														<li className="fl task-hide" style={{width: '240px'}}>