调整

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

@@ -51,6 +51,7 @@ export default class TPMUpdatepropaede extends Component {
 
     updatepropaedeuticsvalue=()=>{
         let id = this.props.match.params.shixunId;
+        let {shixunId} = this.state;
         let url="/shixuns/"+id+"/update_propaedeutics.json";
         const update_propaedeuticsvalue = this.neweditanswerRef.current.getValue().trim();
         axios.post(url,{
@@ -60,7 +61,10 @@ export default class TPMUpdatepropaede extends Component {
             if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
 
             }else{
-                this.props.showSnackbar(response.data.message);
+                this.props.showNotification(response.data.message);
+                if(response.data.status===1){
+                    this.props.history.replace("/shixuns/"+shixunId+"/propaedeutics");
+                }
             }
         }).catch((error) => {
             console.log(error)
@@ -73,9 +77,9 @@ export default class TPMUpdatepropaede extends Component {
                 <div className="educontent">
 
                      <div className="edu-back-white mt30">
-                         <div className="font-16 pt30 pl20 pr20 pb40 bor-bottom-greyE clearfix">
+                         <div className="font-16 pt20 pl20 pr20 pb20 bor-bottom-greyE clearfix">
                              <span className="fl">背景知识</span>
-                             <a href={"/shixuns/"+shixunId+"/propaedeutics"}className="color-grey-9 fr">返回</a>
+                             <Link to={"/shixuns/"+shixunId+"/propaedeutics"}className="color-grey-9 fr">返回</Link>
                          </div>
 
                          <div className="padding40-20">
@@ -87,8 +91,8 @@ export default class TPMUpdatepropaede extends Component {
                     <div className="clearfix mb30 mt30">
                         <a className="defalutSubmitbtn fl mr20"
                            onClick={this.updatepropaedeuticsvalue}>保存</a>
-                        <a href={"/shixuns/"+shixunId+"/propaedeutics"} className="defalutCancelbtn fl"
-                        >取消</a>
+                        <Link to={"/shixuns/"+shixunId+"/propaedeutics"} className="defalutCancelbtn fl"
+                        >取消</Link>
                     </div>
 
                 </div>

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

@@ -97,9 +97,9 @@ class TPMRightSection extends Component {
                 </div>
               </div>
 
-              {TPMRightSectionData&&TPMRightSectionData.complete_count!=null?<div className="edu-back-white padd252020px relative">
+              {TPMRightSectionData&&TPMRightSectionData.complete_count!=null?<div className="edu-back-white padd252020px relative borderbottomf4">
                 <div className="font-16 mb5">
-                  <span><i className={"iconfont icon-biaoqian2 audit_situationactive font-14"}></i>  技能标签</span>
+                  <span><i className={"iconfont icon-jilu1 audit_situationactive font-14"}></i>  学习统计</span>
                   <span className={"sortinxdirection space-between fr"}>
 												<span className="color888hezuo font-12">已完成 {TPMRightSectionData&&TPMRightSectionData.complete_count} 个 / 共 {TPMRightSectionData&&TPMRightSectionData.challenge_count} 关</span>
 											</span>

public/react/src/modules/tpm/component/TPMright.css

@@ -122,4 +122,8 @@
 .rightjinengs{
     height: 35px;
     margin-top: 20px;
+}
+
+.borderbottomf4{
+    border-bottom:1px solid #F4F4F4;
 }

public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js

@@ -79,15 +79,27 @@ class Propaedeutics extends Component {
       <React.Fragment>
         <p className="clearfix mb10 pl20 pr20" style={{display:this.props.identity<5&&this.props.status<3?"block":'none'}} >
 					<Tooltip placement="bottom" title={"编辑"}>
-					<a href={"/shixuns/"+shixunId +"/update_propaedeutics"}className="ring-green fr mt8" id="edit_propaedeutics">
-						<img src={getImageUrl("images/educoder/icon/edit.svg")} className="fl mt3 ml2" /></a>
+					<Link to={"/shixuns/"+shixunId +"/update_propaedeutics"} className="fr audit_situationactive mt20" id="edit_propaedeutics">
+						{/*<img src={getImageUrl("images/educoder/icon/edit.svg")} className="fl mt3 ml2" />*/}
+           编辑
+					</Link>
 					</Tooltip>
         </p>
+
+        <style>
+          {
+            `
+            .editormd-html-preview, .editormd-preview-container {
+                width:100% !important;
+            }
+            `
+          }
+        </style>
         {
           loadingContent ?
             <CircularProgress size={40} thickness={3}
                               style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '200px', display: 'block' }}/> :
-            <div  className="pl20" id="collaborators_list_info" style={{display: 'none',minHeight: '640px',padding:'10px'}}>
+            <div id="collaborators_list_info" style={{display: 'none',minHeight: '640px',padding:'20px 30px 30px 30px'}}>
               {PropaedeuticsListcontent===undefined?"":
                 <p id="ReactMarkdown">
 

public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js

@@ -135,6 +135,9 @@ class RepositoryAddFile extends Component {
             .breadcrumb .ant-breadcrumb-separator{
               margin:0px 2px;
             }
+            .backgroudwhite{
+             display:none;
+            }
             /*.filecode .CodeMirror.cm-s-railscasts{
               border:1px solid #E5E5E5;
             }