From 4e36b2f6046b0f0e627012f3527799d679daf328 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 3 Jul 2019 15:48:41 +0800
Subject: [PATCH 1/4] window.html2canvas

---
 public/react/src/common/components/Cropper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/common/components/Cropper.js b/public/react/src/common/components/Cropper.js
index 35c2cdd99..c9514e52a 100644
--- a/public/react/src/common/components/Cropper.js
+++ b/public/react/src/common/components/Cropper.js
@@ -31,7 +31,7 @@ function save_avatar(){
         const previewId = this.props.previewId
         var img_lg = document.getElementById(previewId || 'img-preview');           
         // 截图小的显示框内的内容          
-        html2canvas(img_lg).then(function(canvas) {
+        window.html2canvas(img_lg).then(function(canvas) {
             // for test
             // document.getElementById('canvasWrap').appendChild(canvas);
 

From 90b4a039c2d61d6cc9a4ed3dfdbb466b291b2b92 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 3 Jul 2019 16:03:56 +0800
Subject: [PATCH 2/4] params

---
 .../modules/courses/members/studentsList.js   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 500cbd2a3..ca5e859b9 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -468,7 +468,22 @@ class studentsList extends Component{
     const { course_group_name, invite_code } = this.state;
 
     const courseId = this.props.match.params.coursesId    
-
+    let exportUrl = "/api/courses/${courseId}/export_member_scores_excel.xlsx?"
+    const params = {}
+    if (course_group_id) {
+      params.group_id = course_group_id
+    }
+    if (searchValue) {
+      searchValue = searchValue.trim()
+      if (searchValue) {
+        params.search = searchValue
+      }
+    }
+    let paramsString = ''
+    for (let key in params) {
+      paramsString += `${key}=${params[key]}&`
+    }
+    exportUrl += paramsString;
     return(
       <React.Fragment >
         <Titlesearchsection
@@ -506,7 +521,7 @@ class studentsList extends Component{
               { isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
-              { isAdmin && <WordsBtn style="blue" className="" href={`/api/courses/${courseId}/export_member_scores_excel.xlsx`}>导出成绩</WordsBtn> }
+              { isAdmin && <WordsBtn style="blue" className="" href={`${exportUrl}`}>导出成绩</WordsBtn> }
               {/*  */}
             </React.Fragment>
           }

From c57b586dec10cd34554e1011341c6efb23d6161f 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 16:10:24 +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/css/Courses.css |   4 +-
 public/react/src/modules/tpm/SiderBar.js      |   2 +-
 .../modules/tpm/TPMsettings/TPMsettings.js    |   4 +-
 .../tpm/TPMsettings/css/TPMsettings.css       |   6 +-
 .../tpm/challengesnew/TPMevaluation.js        |  12 +-
 .../challengesnew/css/TPMchallengesnew.css    | 530 ++++++------
 .../react/src/modules/tpm/component/TPMNav.js |   2 +-
 .../modules/tpm/newshixuns/css/Newshixuns.css | 758 +++++++++---------
 8 files changed, 661 insertions(+), 657 deletions(-)

diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 83d5ebbde..11ba24c5d 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -369,13 +369,13 @@ a.white-btn.use_scope-btn:hover{
 }
 
 #memoMD .CodeMirror {
-    width: 576px !important;
+    /*width: 576px !important;*/
     margin-top: 31px !important;
     height: 364px !important;
 }
 
 #memoMD .editormd-preview {
-    width: 567px !important;
+    width: 578px !important;
     top: 40px !important;
     height: 364px !important;
 }
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index bc5800153..14aeeb5ae 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -106,7 +106,7 @@ class SiderBar extends Component {
                 <span className="inline"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
                 <p className="scan_ewm" style={{display: 'none', right:' 75px',opacity: '0'}}>
                   <p className="pr padding10">
-                    <img src={getImageUrl("images/educoder/EWM.jpg")} width="158px" height="158px" />
+                    <img src={getImageUrl("images/edu_user/EWM.jpg")} width="158px" height="158px" />
                       <p>微信扫一扫</p>
                       <p>关注公众号</p>
                       <span className="trangle_right"></span>
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index 788002b4a..949b0a949 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -1553,7 +1553,7 @@ export default class TPMsettings extends Component {
             <div className="flex1">
 
 
-              <div className="fl "  >
+              <div className="fl"  style={{border:'1px solid #ccc'}}>
                   {/*<textarea className={"shixunmemoMDdiv"} value={shixunmemoMDvalue} onInput={this.getshixunmemoMDvalue}  name="content">*/}
                   {/*</textarea>*/}
 								<MonacoEditor
@@ -1884,7 +1884,7 @@ export default class TPMsettings extends Component {
         <p>
           {
             // this.props.identity<4&&this.props.status==0?
-            this.props.identity<4?
+            this.props.identity<5?
               <div className="clearfix mt30">
                 <a className="defalutSubmitbtn fl mr20"
                    onClick={this.submit_edit_shixun}>保存</a>
diff --git a/public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css b/public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css
index 0df6110be..015174c44 100644
--- a/public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css
+++ b/public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css
@@ -10,24 +10,22 @@
   line-height: 30px;
 }
 #shixundescription .CodeMirror{
-  width: 570px !important;
   margin-top: 31px !important;
   height: 364px !important;
 }
 #shixundescription .editormd-preview{
-  width: 567px !important;
+  width:578px !important;
   top: 40px !important;
   height: 364px !important;
 }
 
 #shixunmemoMD .CodeMirror{
-  width: 548px !important;
   margin-top: 31px !important;
   height: 578px !important;
 }
 
 #shixunmemoMD .editormd-preview{
-  width: 544px !important;
+  width: 578px !important;
   top: 40px !important;
   height: 578px !important;
 }
diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index ccd34f1ee..80e8b3f43 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -951,7 +951,7 @@ export default class TPMevaluation extends Component {
                     </div>
 
 
-                    <div className="edu-back-white mb10 clearfix">
+									{pathoptionvalue===1?<div className="edu-back-white mb10 clearfix">
                         <div className="padding40-20">
                             <p className="color-grey-6 font-16 mb20">待处理图片路径</p>
                             <div className="df">
@@ -970,10 +970,10 @@ export default class TPMevaluation extends Component {
                                 <div></div>
                             </div>
                         </div>
-                    </div>
+                    </div>:""}
 
 
-                    <div className="edu-back-white mb10 clearfix">
+									{pathoptionvalue===1? <div className="edu-back-white mb10 clearfix">
                         <div className="padding40-20">
                             <p className="color-grey-6 font-16 mb20">标准答案图片路径</p>
                             <div className="df">
@@ -992,10 +992,10 @@ export default class TPMevaluation extends Component {
                                 <div></div>
                             </div>
                         </div>
-                    </div>
+                    </div>:""}
 
 
-                    <div className="edu-back-white mb10 clearfix">
+									{pathoptionvalue===1||pathoptionvalue===-1?"":<div className="edu-back-white mb10 clearfix">
                         <div className="padding40-20">
                             <p className="color-grey-6 font-16 mb20">学员答案文件路径</p>
                             <div className="df">
@@ -1013,7 +1013,7 @@ export default class TPMevaluation extends Component {
                                 <div></div>
                             </div>
                         </div>
-                    </div>
+                    </div>}
 
 
                     <div className="edu-back-white mb10 clearfix">
diff --git a/public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css b/public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
index 9a09ab1be..9a8af13e7 100644
--- a/public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
+++ b/public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
@@ -1,263 +1,269 @@
-.CodeMirror-scroll {
-    overflow: auto !important;
-    margin-bottom: -30px;
-    margin-right: -30px;
-    padding-bottom: 30px;
-    height: 100%;
-    outline: none;
-    position: relative;
-}
-a.white-btn.orange-btn:hover {
-    border: 1px solid #F06200;
-    color: #FFF !important;
-}
-.flex1 a.white-btn.orange-btn:hover {
-    border: 1px solid #F06200;
-    color: #FFF !important;
-}
-
-/*.challenge_nav li a{*/
-    /*color:#000 !important;*/
-/*}*/
-
-.questionli{
-    width: 95%;
-    margin-left: 37px;
-}
-#directory_file{
-    height:200px;
-    overflow-y:auto;
-    background:#f5f5f5;
-    padding:10px;
-}
-.directory_filepath{
-    width:120px;
-    text-align:left;
-}
-
-a{
-    text-decoration: none;
-    color: #05101a;
-}
-.repository_url_tippostion{
-    position: absolute;
-    left: 22%;
-    width: 500px;
-    top: 100%;
-}
-
-.top-black-trangleft {
-    display: block;
-    border-width: 8px;
-    position: absolute;
-    top: -16px;
-    /* right: 4px; */
-    border-style: dashed solid dashed dashed;
-    border-color: transparent transparent rgba(5,16,26,0.6) transparent;
-    font-size: 0;
-    line-height: 0;
-}
-
-#exercisememoMD .CodeMirror {
-    margin-top: 31px !important;
-    height: 700px !important;
-    width: 579px !important;
-}
-
-#exercisememoMD .editormd-preview {
-    top: 40px !important;
-    height: 700px !important;
-}
-#exercisememoMD{
-    height: 700px !important;
-}
-#questioMD{
-    /*width: 95% !important;*/
-    height: 586px !important;
-    margin-left: 0% !important;
-}
-
-
-#questioMD .CodeMirror {
-    width: 550.5px !important;
-    margin-top: 31px !important;
-    height: 550px !important;
-}
-
-#questioMD .editormd-preview {
-    top: 40px !important;
-    height: 550px !important;
-}
-
-#newquestioMD .CodeMirror {
-    width: 549px !important;
-    margin-top: 31px !important;
-    height: 364px !important;
-}
-
-#newquestioMD .editormd-preview {
-    top: 40px !important;
-    height: 364px !important;
-}
-
-#challenge_choose_answer .CodeMirror {
-    margin-top: 31px !important;
-    height: 364px !important;
-    width: 578px !important;
-}
-
-
-#challenge_choose_answer .editormd-preview {
-    top: 40px !important;
-    height: 364px !important;
-}
-
-#neweditanswer .CodeMirror {
-    margin-top: 31px !important;
-    height: 364px !important;
-    width: 549.5px !important;
-}
-
-#neweditanswer .editormd-preview {
-    top: 40px !important;
-    height: 364px !important;
-}
-
-#repository_url_tip {
-    top: 30px !important;
-    left: 249px !important;
-    width: 292px !important;
-}
-
-#editanswers .CodeMirror{
-    width: 548px !important;
-    height: 358px !important;
-    margin-top: 30px !important;
-}
-#editanswers .editormd-preview{
-    width: 569px !important;
-    height: 358px !important;
-}
-#newquestioMDs .CodeMirror{
-    width: 510px !important;
-    height: 358px !important;
-    margin-top: 30px !important;
-}
-
-#newquestioMDs .editormd-preview{
-    width: 569px !important;
-    height: 358px !important;
-}
-
-.choose_names{
-    width: 80px;
-    margin-left: 20px;
-}
-
-#answerMD .CodeMirror{
-    width: 569px !important;
-    height: 600px !important;
-    margin-top: 30px !important;
-}
-
-#answerMD .editormd-preview{
-    width: 569px !important;
-    height: 600px !important;
-}
-
-#answerMD {
-    height: 600px !important;
-}
-
-.textareavalue{
-    width: 100%;
-    padding: 5px;
-
-    box-sizing: border-box;
-}
-.greyInput{
-    width: 107%;
-}
-.greyInpus{
-    width: 100%;
-}
-
-.pdr20{
-    padding-right:20px;
-}
-
-.winput-240-40s {
-    background-color: #F5F5F5;
-}
-
-
-.winput-240-40s:focus{
-    background-color: #fff;
-}
-.input-100-45{
-    background-color: #F5F5F5;
-}
-.input-100-45:focus{
-     background-color: #fff;
- }
-
-.wind100{
-    width:100% !important;
-}
-
-.color-bule-tip {
-    color: #5485f7 !important;
-}
-.martopf4{
-    margin-top:-4px;
-}
-
-.headdfgf{
-    display: block;
-    width: 100px;
-    height: 30px;
-    line-height: 30px;
-    float: left;
-}
-
-.color979797{
-    color: #979797 !important;
-}
-
-.border-left{
-    width: 0;
-    height: 0;
-    border-bottom: 6px solid transparent;
-    border-right: 6px solid #cccbcb;
-    border-top: 6px solid transparent;
-    position: absolute;
-    left: 30px;
-    top: 12px;
-}
-.border-left span{
-    display: block;
-    width: 0;
-    height: 0;
-    border-bottom: 6px solid transparent;
-    border-right: 6px solid #fff;
-    border-top: 6px solid transparent;
-    position: absolute;
-    left: 1px;
-    top: -6px;
-    z-index: 10;
-}
-.fillTip{
-    position: absolute;
-    left: 36px;
-    top: 2px;
-    width: 125px;
-    font-size: 12px;
-    display: block;
-    padding: 5px;
-    border: 1px solid #eaeaea;
-    border-radius: 5px;
-    box-sizing: border-box;
-    height: 32px;
-    line-height: 20px;
-    font-family: "微软雅黑","宋体";
+.CodeMirror-scroll {
+    overflow: auto !important;
+    margin-bottom: -30px;
+    margin-right: -30px;
+    padding-bottom: 30px;
+    height: 100%;
+    outline: none;
+    position: relative;
+}
+a.white-btn.orange-btn:hover {
+    border: 1px solid #F06200;
+    color: #FFF !important;
+}
+.flex1 a.white-btn.orange-btn:hover {
+    border: 1px solid #F06200;
+    color: #FFF !important;
+}
+
+/*.challenge_nav li a{*/
+    /*color:#000 !important;*/
+/*}*/
+
+.questionli{
+    width: 95%;
+    margin-left: 37px;
+}
+#directory_file{
+    height:200px;
+    overflow-y:auto;
+    background:#f5f5f5;
+    padding:10px;
+}
+.directory_filepath{
+    width:120px;
+    text-align:left;
+}
+
+a{
+    text-decoration: none;
+    color: #05101a;
+}
+.repository_url_tippostion{
+    position: absolute;
+    left: 22%;
+    width: 500px;
+    top: 100%;
+}
+
+.top-black-trangleft {
+    display: block;
+    border-width: 8px;
+    position: absolute;
+    top: -16px;
+    /* right: 4px; */
+    border-style: dashed solid dashed dashed;
+    border-color: transparent transparent rgba(5,16,26,0.6) transparent;
+    font-size: 0;
+    line-height: 0;
+}
+
+#exercisememoMD .CodeMirror {
+    margin-top: 31px !important;
+    height: 700px !important;
+    /*width: 579px !important;*/
+}
+
+#exercisememoMD .editormd-preview {
+    top: 40px !important;
+    height: 700px !important;
+    width: 578px !important;
+}
+#exercisememoMD{
+    height: 700px !important;
+}
+#questioMD{
+    /*width: 95% !important;*/
+    height: 586px !important;
+    margin-left: 0% !important;
+}
+
+
+#questioMD .CodeMirror {
+    /*width: 550.5px !important;*/
+    margin-top: 31px !important;
+    height: 550px !important;
+}
+
+#questioMD .editormd-preview {
+    top: 40px !important;
+    height: 550px !important;
+    width: 578px !important;
+}
+
+#newquestioMD .CodeMirror {
+    /*width: 549px !important;*/
+    margin-top: 31px !important;
+    height: 364px !important;
+}
+
+#newquestioMD .editormd-preview {
+    top: 40px !important;
+    height: 364px !important;
+    width: 578px !important;
+}
+
+#challenge_choose_answer .CodeMirror {
+    margin-top: 31px !important;
+    height: 364px !important;
+    /*width: 578px !important;*/
+}
+
+
+#challenge_choose_answer .editormd-preview {
+    top: 40px !important;
+    height: 364px !important;
+    width: 578px !important;
+}
+
+#neweditanswer .CodeMirror {
+    margin-top: 31px !important;
+    height: 364px !important;
+    /*width: 549.5px !important;*/
+}
+
+#neweditanswer .editormd-preview {
+    top: 40px !important;
+    height: 364px !important;
+    width: 578px !important;
+}
+
+#repository_url_tip {
+    top: 30px !important;
+    left: 249px !important;
+    width: 292px !important;
+}
+
+#editanswers .CodeMirror{
+    /*width: 548px !important;*/
+    height: 358px !important;
+    margin-top: 30px !important;
+}
+#editanswers .editormd-preview{
+    width: 578px !important;
+    height: 358px !important;
+
+}
+#newquestioMDs .CodeMirror{
+    /*width: 510px !important;*/
+    height: 358px !important;
+    margin-top: 30px !important;
+}
+
+#newquestioMDs .editormd-preview{
+    width: 578px !important;
+    height: 358px !important;
+}
+
+.choose_names{
+    width: 80px;
+    margin-left: 20px;
+}
+
+#answerMD .CodeMirror{
+    /*width: 569px !important;*/
+    height: 600px !important;
+    margin-top: 30px !important;
+}
+
+#answerMD .editormd-preview{
+    width: 578px !important;
+    height: 600px !important;
+}
+
+#answerMD {
+    height: 600px !important;
+}
+
+.textareavalue{
+    width: 100%;
+    padding: 5px;
+
+    box-sizing: border-box;
+}
+.greyInput{
+    width: 107%;
+}
+.greyInpus{
+    width: 100%;
+}
+
+.pdr20{
+    padding-right:20px;
+}
+
+.winput-240-40s {
+    background-color: #F5F5F5;
+}
+
+
+.winput-240-40s:focus{
+    background-color: #fff;
+}
+.input-100-45{
+    background-color: #F5F5F5;
+}
+.input-100-45:focus{
+     background-color: #fff;
+ }
+
+.wind100{
+    width:100% !important;
+}
+
+.color-bule-tip {
+    color: #5485f7 !important;
+}
+.martopf4{
+    margin-top:-4px;
+}
+
+.headdfgf{
+    display: block;
+    width: 100px;
+    height: 30px;
+    line-height: 30px;
+    float: left;
+}
+
+.color979797{
+    color: #979797 !important;
+}
+
+.border-left{
+    width: 0;
+    height: 0;
+    border-bottom: 6px solid transparent;
+    border-right: 6px solid #cccbcb;
+    border-top: 6px solid transparent;
+    position: absolute;
+    left: 30px;
+    top: 12px;
+}
+.border-left span{
+    display: block;
+    width: 0;
+    height: 0;
+    border-bottom: 6px solid transparent;
+    border-right: 6px solid #fff;
+    border-top: 6px solid transparent;
+    position: absolute;
+    left: 1px;
+    top: -6px;
+    z-index: 10;
+}
+.fillTip{
+    position: absolute;
+    left: 36px;
+    top: 2px;
+    width: 125px;
+    font-size: 12px;
+    display: block;
+    padding: 5px;
+    border: 1px solid #eaeaea;
+    border-radius: 5px;
+    box-sizing: border-box;
+    height: 32px;
+    line-height: 20px;
+    font-family: "微软雅黑","宋体";
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/component/TPMNav.js b/public/react/src/modules/tpm/component/TPMNav.js
index fa0623ae1..5af04e8e7 100644
--- a/public/react/src/modules/tpm/component/TPMNav.js
+++ b/public/react/src/modules/tpm/component/TPMNav.js
@@ -43,7 +43,7 @@ class TPMNav extends Component {
 				{/* target="_blank"*/}
                 <a
                     href={`/shixuns/${shixunId}/settings`} className="fr"
-                    style={{display: this.props.identity >3||this.props.identity===undefined ? "none" : 'block'}}
+                    style={{display: this.props.identity >4||this.props.identity===undefined ? "none" : 'block'}}
                 >配置</a>
 	      	</div>
 	    );
diff --git a/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css b/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
index 5e09db11a..b902c94ae 100644
--- a/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
+++ b/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
@@ -1,379 +1,379 @@
-/* BASICS */
-
-.CodeMirror {
-    /* Set height, width, borders, and global font properties here */
-    font-family: monospace;
-    height: 300px;
-    color: black;
-    direction: ltr;
-}
-
-/* PADDING */
-
-.CodeMirror-lines {
-    padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
-    padding: 0 4px; /* Horizontal padding of content */
-}
-
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-    background-color: white; /* The little square between H and V scrollbars */
-}
-
-/* GUTTER */
-
-.CodeMirror-gutters {
-    border-right: 1px solid #ddd;
-    background-color: #f7f7f7;
-    white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
-    padding: 0 3px 0 5px;
-    min-width: 20px;
-    text-align: right;
-    color: #999;
-    white-space: nowrap;
-}
-
-.CodeMirror-guttermarker { color: black; }
-.CodeMirror-guttermarker-subtle { color: #999; }
-
-/* CURSOR */
-
-.CodeMirror-cursor {
-    border-left: 1px solid black;
-    border-right: none;
-    width: 0;
-}
-/* Shown when moving in bi-directional text */
-.CodeMirror div.CodeMirror-secondarycursor {
-    border-left: 1px solid silver;
-}
-.cm-fat-cursor .CodeMirror-cursor {
-    width: auto;
-    border: 0 !important;
-    background: #7e7;
-}
-.cm-fat-cursor div.CodeMirror-cursors {
-    z-index: 1;
-}
-.cm-fat-cursor-mark {
-    background-color: rgba(20, 255, 20, 0.5);
-    -webkit-animation: blink 1.06s steps(1) infinite;
-    animation: blink 1.06s steps(1) infinite;
-}
-.cm-animate-fat-cursor {
-    width: auto;
-    border: 0;
-    -webkit-animation: blink 1.06s steps(1) infinite;
-    animation: blink 1.06s steps(1) infinite;
-    background-color: #7e7;
-}
-@-webkit-keyframes blink {
-    0% {}
-    50% { background-color: transparent; }
-    100% {}
-}
-@keyframes blink {
-    0% {}
-    50% { background-color: transparent; }
-    100% {}
-}
-
-/* Can style cursor different in overwrite (non-insert) mode */
-.CodeMirror-overwrite .CodeMirror-cursor {}
-
-.cm-tab { display: inline-block; text-decoration: inherit; }
-
-.CodeMirror-rulers {
-    position: absolute;
-    left: 0; right: 0; top: -50px; bottom: -20px;
-    overflow: hidden;
-}
-.CodeMirror-ruler {
-    border-left: 1px solid #ccc;
-    top: 0; bottom: 0;
-    position: absolute;
-}
-
-/* DEFAULT THEME */
-
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable,
-.cm-s-default .cm-punctuation,
-.cm-s-default .cm-property,
-.cm-s-default .cm-operator {}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
-
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
-
-.CodeMirror-composing { border-bottom: 2px solid; }
-
-/* Default styles for common addons */
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0b0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
-.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
-
-/* STOP */
-
-/* The rest of this file contains styles related to the mechanics of
-   the editor. You probably shouldn't touch them. */
-
-.CodeMirror {
-    position: relative;
-    overflow: hidden;
-    background: white;
-}
-
-.CodeMirror-scroll {
-    overflow: scroll !important; /* Things will break if this is overridden */
-    /* 30px is the magic margin used to hide the element's real scrollbars */
-    /* See overflow: hidden in .CodeMirror */
-    margin-bottom: -30px; margin-right: -30px;
-    padding-bottom: 30px;
-    height: 100%;
-    outline: none; /* Prevent dragging from highlighting the element */
-    position: relative;
-}
-.CodeMirror-sizer {
-    position: relative;
-    border-right: 30px solid transparent;
-}
-
-/* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actual scrolling happens, thus preventing shaking and
-   flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-    position: absolute;
-    z-index: 6;
-    display: none;
-}
-.CodeMirror-vscrollbar {
-    right: 0; top: 0;
-    overflow-x: hidden;
-    overflow-y: scroll;
-}
-.CodeMirror-hscrollbar {
-    bottom: 0; left: 0;
-    overflow-y: hidden;
-    overflow-x: scroll;
-}
-.CodeMirror-scrollbar-filler {
-    right: 0; bottom: 0;
-}
-.CodeMirror-gutter-filler {
-    left: 0; bottom: 0;
-}
-
-.CodeMirror-gutters {
-    position: absolute; left: 0; top: 0;
-    min-height: 100%;
-    z-index: 3;
-}
-.CodeMirror-gutter {
-    white-space: normal;
-    height: 100%;
-    display: inline-block;
-    vertical-align: top;
-    margin-bottom: -30px;
-}
-.CodeMirror-gutter-wrapper {
-    position: absolute;
-    z-index: 4;
-    background: none !important;
-    border: none !important;
-}
-.CodeMirror-gutter-background {
-    position: absolute;
-    top: 0; bottom: 0;
-    z-index: 4;
-}
-.CodeMirror-gutter-elt {
-    position: absolute;
-    cursor: default;
-    z-index: 4;
-}
-.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
-.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
-.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
-
-.CodeMirror-lines {
-    cursor: text;
-    min-height: 1px; /* prevents collapsing before first draw */
-}
-.CodeMirror pre {
-    /* Reset some styles that the rest of the page might have set */ border-radius: 0;
-    border-width: 0;
-    background: transparent;
-    font-family: inherit;
-    font-size: inherit;
-    margin: 0;
-    white-space: pre;
-    word-wrap: normal;
-    line-height: inherit;
-    color: inherit;
-    z-index: 2;
-    position: relative;
-    overflow: visible;
-    -webkit-tap-highlight-color: transparent;
-    -webkit-font-variant-ligatures: contextual;
-    font-variant-ligatures: contextual;
-}
-.CodeMirror-wrap pre {
-    word-wrap: break-word;
-    white-space: pre-wrap;
-    word-break: normal;
-}
-
-.CodeMirror-linebackground {
-    position: absolute;
-    left: 0; right: 0; top: 0; bottom: 0;
-    z-index: 0;
-}
-
-.CodeMirror-linewidget {
-    position: relative;
-    z-index: 2;
-    padding: 0.1px; /* Force widget margins to stay inside of the container */
-}
-
-.CodeMirror-widget {}
-
-.CodeMirror-rtl pre { direction: rtl; }
-
-.CodeMirror-code {
-    outline: none;
-}
-
-/* Force content-box sizing for the elements where we expect it */
-.CodeMirror-scroll,
-.CodeMirror-sizer,
-.CodeMirror-gutter,
-.CodeMirror-gutters,
-.CodeMirror-linenumber {
-    -webkit-box-sizing: content-box;
-    box-sizing: content-box;
-}
-
-.CodeMirror-measure {
-    position: absolute;
-    width: 100%;
-    height: 0;
-    overflow: hidden;
-    visibility: hidden;
-}
-
-.CodeMirror-cursor {
-    position: absolute;
-    pointer-events: none;
-}
-.CodeMirror-measure pre { position: static; }
-
-div.CodeMirror-cursors {
-    visibility: hidden;
-    position: relative;
-    z-index: 3;
-}
-div.CodeMirror-dragcursors {
-    visibility: visible;
-}
-
-.CodeMirror-focused div.CodeMirror-cursors {
-    visibility: visible;
-}
-
-.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
-.CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
-.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
-.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
-
-.cm-searching {
-    background-color: #ffa;
-    background-color: rgba(255, 255, 0, .4);
-}
-
-/* Used to force a border model for a node */
-.cm-force-border { padding-right: .1px; }
-
-@media print {
-    /* Hide the cursor when printing */
-    .CodeMirror div.CodeMirror-cursors {
-        visibility: hidden;
-    }
-}
-
-/* See issue #2901 */
-.cm-tab-wrap-hack:after { content: ''; }
-
-/* Help users use markselection to safely style text background */
-span.CodeMirror-selectedtext { background: none; }
-
-
-
-
-.radioStyle{
-        display: block;
-        height: 30px;
-      }
-a.white-btn.use_scope-btn:hover{
-
-}
-.shixunScopeInput{
- width:218px;
- height:33px;
- display:block;
- margin-bottom:15px;
-}
-
-#memoMD .CodeMirror {
-    width: 576px !important;
-    margin-top: 31px !important;
-    height: 364px !important;
-}
-
-#memoMD .editormd-preview {
-    width: 567px !important;
-    top: 40px !important;
-    height: 364px !important;
-}
-
-.ml36{
-    margin-left: 26px;
-}
-#person-unit a.white-btn.use_scope-btn:hover {
-    border: 1px solid #F06200;
-    color:#FFF !important;
-}
-
-
+/* BASICS */
+
+.CodeMirror {
+    /* Set height, width, borders, and global font properties here */
+    font-family: monospace;
+    height: 300px;
+    color: black;
+    direction: ltr;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+    padding: 4px 0; /* Vertical padding around content */
+}
+.CodeMirror pre {
+    padding: 0 4px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+    background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+    border-right: 1px solid #ddd;
+    background-color: #f7f7f7;
+    white-space: nowrap;
+}
+.CodeMirror-linenumbers {}
+.CodeMirror-linenumber {
+    padding: 0 3px 0 5px;
+    min-width: 20px;
+    text-align: right;
+    color: #999;
+    white-space: nowrap;
+}
+
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
+/* CURSOR */
+
+.CodeMirror-cursor {
+    border-left: 1px solid black;
+    border-right: none;
+    width: 0;
+}
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+    border-left: 1px solid silver;
+}
+.cm-fat-cursor .CodeMirror-cursor {
+    width: auto;
+    border: 0 !important;
+    background: #7e7;
+}
+.cm-fat-cursor div.CodeMirror-cursors {
+    z-index: 1;
+}
+.cm-fat-cursor-mark {
+    background-color: rgba(20, 255, 20, 0.5);
+    -webkit-animation: blink 1.06s steps(1) infinite;
+    animation: blink 1.06s steps(1) infinite;
+}
+.cm-animate-fat-cursor {
+    width: auto;
+    border: 0;
+    -webkit-animation: blink 1.06s steps(1) infinite;
+    animation: blink 1.06s steps(1) infinite;
+    background-color: #7e7;
+}
+@-webkit-keyframes blink {
+    0% {}
+    50% { background-color: transparent; }
+    100% {}
+}
+@keyframes blink {
+    0% {}
+    50% { background-color: transparent; }
+    100% {}
+}
+
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror-overwrite .CodeMirror-cursor {}
+
+.cm-tab { display: inline-block; text-decoration: inherit; }
+
+.CodeMirror-rulers {
+    position: absolute;
+    left: 0; right: 0; top: -50px; bottom: -20px;
+    overflow: hidden;
+}
+.CodeMirror-ruler {
+    border-left: 1px solid #ccc;
+    top: 0; bottom: 0;
+    position: absolute;
+}
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
+.cm-s-default .cm-keyword {color: #708;}
+.cm-s-default .cm-atom {color: #219;}
+.cm-s-default .cm-number {color: #164;}
+.cm-s-default .cm-def {color: #00f;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
+.cm-s-default .cm-variable-2 {color: #05a;}
+.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
+.cm-s-default .cm-comment {color: #a50;}
+.cm-s-default .cm-string {color: #a11;}
+.cm-s-default .cm-string-2 {color: #f50;}
+.cm-s-default .cm-meta {color: #555;}
+.cm-s-default .cm-qualifier {color: #555;}
+.cm-s-default .cm-builtin {color: #30a;}
+.cm-s-default .cm-bracket {color: #997;}
+.cm-s-default .cm-tag {color: #170;}
+.cm-s-default .cm-attribute {color: #00c;}
+.cm-s-default .cm-hr {color: #999;}
+.cm-s-default .cm-link {color: #00c;}
+
+.cm-s-default .cm-error {color: #f00;}
+.cm-invalidchar {color: #f00;}
+
+.CodeMirror-composing { border-bottom: 2px solid; }
+
+/* Default styles for common addons */
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0b0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
+.CodeMirror-activeline-background {background: #e8f2ff;}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+    position: relative;
+    overflow: hidden;
+    background: white;
+}
+
+.CodeMirror-scroll {
+    overflow: scroll !important; /* Things will break if this is overridden */
+    /* 30px is the magic margin used to hide the element's real scrollbars */
+    /* See overflow: hidden in .CodeMirror */
+    margin-bottom: -30px; margin-right: -30px;
+    padding-bottom: 30px;
+    height: 100%;
+    outline: none; /* Prevent dragging from highlighting the element */
+    position: relative;
+}
+.CodeMirror-sizer {
+    position: relative;
+    border-right: 30px solid transparent;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actual scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+    position: absolute;
+    z-index: 6;
+    display: none;
+}
+.CodeMirror-vscrollbar {
+    right: 0; top: 0;
+    overflow-x: hidden;
+    overflow-y: scroll;
+}
+.CodeMirror-hscrollbar {
+    bottom: 0; left: 0;
+    overflow-y: hidden;
+    overflow-x: scroll;
+}
+.CodeMirror-scrollbar-filler {
+    right: 0; bottom: 0;
+}
+.CodeMirror-gutter-filler {
+    left: 0; bottom: 0;
+}
+
+.CodeMirror-gutters {
+    position: absolute; left: 0; top: 0;
+    min-height: 100%;
+    z-index: 3;
+}
+.CodeMirror-gutter {
+    white-space: normal;
+    height: 100%;
+    display: inline-block;
+    vertical-align: top;
+    margin-bottom: -30px;
+}
+.CodeMirror-gutter-wrapper {
+    position: absolute;
+    z-index: 4;
+    background: none !important;
+    border: none !important;
+}
+.CodeMirror-gutter-background {
+    position: absolute;
+    top: 0; bottom: 0;
+    z-index: 4;
+}
+.CodeMirror-gutter-elt {
+    position: absolute;
+    cursor: default;
+    z-index: 4;
+}
+.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
+.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
+.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
+
+.CodeMirror-lines {
+    cursor: text;
+    min-height: 1px; /* prevents collapsing before first draw */
+}
+.CodeMirror pre {
+    /* Reset some styles that the rest of the page might have set */ border-radius: 0;
+    border-width: 0;
+    background: transparent;
+    font-family: inherit;
+    font-size: inherit;
+    margin: 0;
+    white-space: pre;
+    word-wrap: normal;
+    line-height: inherit;
+    color: inherit;
+    z-index: 2;
+    position: relative;
+    overflow: visible;
+    -webkit-tap-highlight-color: transparent;
+    -webkit-font-variant-ligatures: contextual;
+    font-variant-ligatures: contextual;
+}
+.CodeMirror-wrap pre {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: normal;
+}
+
+.CodeMirror-linebackground {
+    position: absolute;
+    left: 0; right: 0; top: 0; bottom: 0;
+    z-index: 0;
+}
+
+.CodeMirror-linewidget {
+    position: relative;
+    z-index: 2;
+    padding: 0.1px; /* Force widget margins to stay inside of the container */
+}
+
+.CodeMirror-widget {}
+
+.CodeMirror-rtl pre { direction: rtl; }
+
+.CodeMirror-code {
+    outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box;
+}
+
+.CodeMirror-measure {
+    position: absolute;
+    width: 100%;
+    height: 0;
+    overflow: hidden;
+    visibility: hidden;
+}
+
+.CodeMirror-cursor {
+    position: absolute;
+    pointer-events: none;
+}
+.CodeMirror-measure pre { position: static; }
+
+div.CodeMirror-cursors {
+    visibility: hidden;
+    position: relative;
+    z-index: 3;
+}
+div.CodeMirror-dragcursors {
+    visibility: visible;
+}
+
+.CodeMirror-focused div.CodeMirror-cursors {
+    visibility: visible;
+}
+
+.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+.CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
+
+.cm-searching {
+    background-color: #ffa;
+    background-color: rgba(255, 255, 0, .4);
+}
+
+/* Used to force a border model for a node */
+.cm-force-border { padding-right: .1px; }
+
+@media print {
+    /* Hide the cursor when printing */
+    .CodeMirror div.CodeMirror-cursors {
+        visibility: hidden;
+    }
+}
+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }
+
+
+
+
+.radioStyle{
+        display: block;
+        height: 30px;
+      }
+a.white-btn.use_scope-btn:hover{
+
+}
+.shixunScopeInput{
+ width:218px;
+ height:33px;
+ display:block;
+ margin-bottom:15px;
+}
+
+#memoMD .CodeMirror {
+    /*width: 576px !important;*/
+    margin-top: 31px !important;
+    height: 364px !important;
+}
+
+#memoMD .editormd-preview {
+    width: 578px !important;
+    top: 40px !important;
+    height: 364px !important;
+}
+
+.ml36{
+    margin-left: 26px;
+}
+#person-unit a.white-btn.use_scope-btn:hover {
+    border: 1px solid #F06200;
+    color:#FFF !important;
+}
+
+

From eebc428d42d7cc0f03c08b580d26bf79c9a50f59 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 16:17:27 +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

---
 .../react/src/modules/tpm/challengesnew/TPManswer.js   |  2 +-
 .../react/src/modules/tpm/challengesnew/TPManswer2.js  |  4 ++--
 .../src/modules/tpm/challengesnew/TPMchallengesnew.js  |  6 +++---
 .../src/modules/tpm/challengesnew/TPMevaluation.js     |  6 +++---
 .../react/src/modules/tpm/challengesnew/TPMquestion.js | 10 +++++-----
 public/react/src/modules/tpm/component/TPMNav.js       |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/tpm/challengesnew/TPManswer.js b/public/react/src/modules/tpm/challengesnew/TPManswer.js
index c44b74966..d29516422 100644
--- a/public/react/src/modules/tpm/challengesnew/TPManswer.js
+++ b/public/react/src/modules/tpm/challengesnew/TPManswer.js
@@ -352,7 +352,7 @@ export default class TPManswer extends Component {
 
                     </div>
 
-                    <div className="clearfix mt20" style={{display:this.props.identity>3||this.props.identity===undefined||power===false?"none":"block"}}>
+                    <div className="clearfix mt20" style={{display:this.props.identity>4||this.props.identity===undefined||power===false?"none":"block"}}>
                         <a className="defalutSubmitbtn fl mr20"
                            onClick={this.challenge_answer_submit}>提交</a>
                         <a href={"/shixuns/" + shixunId + "/challenges"} className="defalutCancelbtn fl">取消</a>
diff --git a/public/react/src/modules/tpm/challengesnew/TPManswer2.js b/public/react/src/modules/tpm/challengesnew/TPManswer2.js
index 67b0e7fe9..98c615065 100644
--- a/public/react/src/modules/tpm/challengesnew/TPManswer2.js
+++ b/public/react/src/modules/tpm/challengesnew/TPManswer2.js
@@ -339,7 +339,7 @@ export default class TPManswer extends Component {
                                 })
                             }
                             
-                            <div className="clearfix mt20" style={{display:this.props.identity>3||this.props.identity===undefined||power===false?"none":"block"}}>
+                            <div className="clearfix mt20" style={{display:this.props.identity>4||this.props.identity===undefined||power===false?"none":"block"}}>
                                 <a href={"javascript:void(0)"} className="defalutCancelbtn fl" onClick={this.addAnswer}>新增</a>
                             </div>
                         </div>
@@ -347,7 +347,7 @@ export default class TPManswer extends Component {
                         
                     </div>
 
-                    <div className="clearfix mt20" style={{display:this.props.identity>3||this.props.identity===undefined||power===false?"none":"block"}}>
+                    <div className="clearfix mt20" style={{display:this.props.identity>4||this.props.identity===undefined||power===false?"none":"block"}}>
                         <a className="defalutSubmitbtn fl mr20"
                            onClick={this.challenge_answer_submit}>提交</a>
                         <a href={"/shixuns/" + shixunId + "/challenges"} className="defalutCancelbtn fl">取消</a>
diff --git a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
index e0944cac6..024f49589 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
@@ -575,12 +575,12 @@ export default class TPMchallengesnew extends Component {
 
                         <a href={practice_url === undefined ? "" : practice_url}
                            className="fr color-blue mr15 mt4"
-                           style={{display:this.props.identity>3||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
+                           style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
                            data-tip-down="新增代码编辑类型的任务">+&nbsp;实践类型</a>
 
                         <a href={choice_url === undefined ? "" : choice_url}
                            className="fr color-blue mr15 mt4"
-                           style={{display:this.props.identity>3||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
+                           style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
                            data-tip-down="新增选择题类型的任务">+&nbsp;选择题类型</a>
 
                     </div>
@@ -739,7 +739,7 @@ export default class TPMchallengesnew extends Component {
 										</div>
 
                     <div className="clearfix mt30"
-                         style={{display:this.props.identity>3||this.props.identity===undefined?"none":'block'}}
+                         style={{display:this.props.identity>4||this.props.identity===undefined?"none":'block'}}
                     >
                        {checkpointId===undefined?<a className="defalutSubmitbtn fl mr20" onClick={CreatePracticesendtype===true?"":this.CreatePracticesend}>提交</a>:
                        <a className="defalutSubmitbtn fl mr20" onClick={editPracticesendtype===true?"":this.editPracticesend}>提交</a>}
diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index 80e8b3f43..036197229 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -777,11 +777,11 @@ export default class TPMevaluation extends Component {
 
                         <Link to={practice_url === undefined ? "" : practice_url}
                               className="fr color-blue mr15 mt4"
-                              style={{display:this.props.identity>3||this.props.identity===undefined||this.props.status===2||this.props.status===1? "none":'block'}}
+                              style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1? "none":'block'}}
                               data-tip-down="新增代码编辑类型的任务">+&nbsp;实践类型</Link>
                         <Link to={choice_url === undefined ? "" : choice_url}
                               className="fr color-blue mr15 mt4"
-                              style={{display:this.props.identity>3||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
+                              style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
                               data-tip-down="新增选择题类型的任务">+&nbsp;选择题类型</Link>
 
                     </div>
@@ -1119,7 +1119,7 @@ export default class TPMevaluation extends Component {
                     </div>
 
 
-                    <div className="clearfix mt30" style={{display:this.props.identity>3||this.props.identity===undefined||power===false?"none":"block"}}>
+                    <div className="clearfix mt30" style={{display:this.props.identity>4||this.props.identity===undefined||power===false?"none":"block"}}>
                         <a className="defalutSubmitbtn fl mr20" onClick={this.submitarbitrationevaluation}>提交</a>
                         <a href={"/shixuns/" + shixunId + "/challenges"} className="defalutCancelbtn fl">取消</a>
                     </div>
diff --git a/public/react/src/modules/tpm/challengesnew/TPMquestion.js b/public/react/src/modules/tpm/challengesnew/TPMquestion.js
index e917b425a..c1d310ce2 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMquestion.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMquestion.js
@@ -1251,10 +1251,10 @@ editanswersMD=(initValue, id)=> {
 
                         <a href={practice_url === undefined ? "" : practice_url}
                            className="fr color-blue mr15 mt4"
-                           style={{display:this.props.identity>3||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
+                           style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
                            data-tip-down="新增代码编辑类型的任务">+&nbsp;实践类型</a>
                         <a href={choice_url === undefined ? "" : choice_url} className="fr color-blue mr15 mt4"
-                           style={{display:this.props.identity>3||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
+                           style={{display:this.props.identity>4||this.props.identity===undefined||this.props.status===2||this.props.status===1?"none":'block'}}
                            data-tip-down="新增选择题类型的任务">+&nbsp;选择题类型</a>
 
                     </div>
@@ -1345,7 +1345,7 @@ editanswersMD=(initValue, id)=> {
                         </div>
 
 
-                        <div className="clearfix mt30" style={{display:this.props.identity>3||this.props.identity===undefined||power===false?"none":"block"}}>
+                        <div className="clearfix mt30" style={{display:this.props.identity>4||this.props.identity===undefined||power===false?"none":"block"}}>
                             <a className="defalutSubmitbtn fl mr20" onClick={sumittype===true?"":this.clickquestionsumit}>提交</a>
                             <a href={go_back_url}
                                className="defalutCancelbtn fl">取消</a>
@@ -1545,7 +1545,7 @@ editanswersMD=(initValue, id)=> {
                         </div>
 
 
-                        <div className="clearfix mt30" style={{display:this.props.identity>3||this.props.identity===undefined||power===false?"none":"block"}}>
+                        <div className="clearfix mt30" style={{display:this.props.identity>4||this.props.identity===undefined||power===false?"none":"block"}}>
                             <a   className="defalutSubmitbtn fl mr20"
                                onClick={this.answer_subit}>提交</a>
                             <a href={go_back_url}
@@ -1735,7 +1735,7 @@ editanswersMD=(initValue, id)=> {
                             </div>
 
 
-                            <div className="clearfix mt30" style={{display:this.props.identity>3||this.props.identity===undefined||power===false?"none":"block"}}>
+                            <div className="clearfix mt30" style={{display:this.props.identity>4||this.props.identity===undefined||power===false?"none":"block"}}>
                                 <a   className="defalutSubmitbtn fl mr20"
                                      onClick={()=>this.answer_subit("edit",challenge_choose_id)}>提交</a>
                                 <a href={go_back_url}
diff --git a/public/react/src/modules/tpm/component/TPMNav.js b/public/react/src/modules/tpm/component/TPMNav.js
index 5af04e8e7..7bcc858e2 100644
--- a/public/react/src/modules/tpm/component/TPMNav.js
+++ b/public/react/src/modules/tpm/component/TPMNav.js
@@ -29,7 +29,7 @@ class TPMNav extends Component {
 				}
 
 		        <Link to={`/shixuns/${shixunId}/repository`}
-                      style={{display:  this.props.identity >3||this.props.identity===undefined ? "none" : 'block'}}
+                      style={{display:  this.props.identity >4||this.props.identity===undefined ? "none" : 'block'}}
                       className={`${match.url.indexOf('repository') != -1 ? 'active' : ''} fl mr40`}>版本库</Link>
 
 		        <Link to={`/shixuns/${shixunId}/collaborators`}