From 3b6daa3d7bd803ed5dc0f529f6045d6421ddcc75 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, 25 Dec 2019 09:28:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/TPMBanner.js     |  8 ++++----
 .../modules/tpm/TPMsettings/Configuration.js  |  8 +++++---
 .../tpm/TPMsettings/Shixuninformation.js      |  6 +++++-
 .../modules/tpm/component/TPMRightSection.js  | 14 ++++++-------
 .../src/modules/tpm/component/TPMright.css    |  7 ++++---
 public/react/src/modules/tpm/jupyter/index.js | 12 +++++------
 .../Collaborators/Collaborators.css           | 14 ++++++++-----
 .../Collaborators/Collaborators.js            | 20 +++++++++----------
 .../shixunchild/Ranking_list/Ranking_list.js  |  2 +-
 9 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 73a09bb45..fa8a4b222 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -857,7 +857,7 @@ class TPMBanner extends Component {
               `
               .shixunDetail_top{
                   height: 180px !important;
-                  padding-top:35px !important;
+                  padding-top:50px !important;
               }
               .ant-popover{
                z-index:1000 !important;
@@ -900,9 +900,9 @@ class TPMBanner extends Component {
                 }
 
               </p>
-              <div className="clearfix mt30">
+              <div className="clearfix mt10">
 
-                <ul className="fl color-grey-c pathInfo">
+                <ul className="fl color-grey-c pathInfo mt20">
                   {shixunsDetails&&shixunsDetails.stu_num===0?"":<li>
                     <span>学习人数</span>
                     <span className="mt3">{shixunsDetails.stu_num}</span>
@@ -973,7 +973,7 @@ class TPMBanner extends Component {
                           </div>
                         </div>
                       }>
-                        <div className="pr fl" id="commentsStar">
+                        <div className="pr fl mt15" id="commentsStar">
                           <div className={"color-grey-c  ml15"} style={{color: "#fff", textAlign: "center"}}>学员评分</div>
                           <div className="rateYo">
                             <MyRate allowHalf defaultValue={star_info[0]} disabled/>
diff --git a/public/react/src/modules/tpm/TPMsettings/Configuration.js b/public/react/src/modules/tpm/TPMsettings/Configuration.js
index b65d20f5d..b5aafc909 100644
--- a/public/react/src/modules/tpm/TPMsettings/Configuration.js
+++ b/public/react/src/modules/tpm/TPMsettings/Configuration.js
@@ -295,6 +295,8 @@ export default class Shixuninformation extends Component {
 
     const dateFormat = 'YYYY-MM-DD HH:mm';
 
+    // console.log()
+      console.log(this.props&&this.props.identity<8)
     return (
       <div>
         <div className="educontent mb200 edu-back-white padding10-20 pdb30 mb50">
@@ -308,8 +310,8 @@ export default class Shixuninformation extends Component {
             </span>
           </div>}
 
-          <div className="edu-back-white mb10 ml30 mt20">
-              <div>
+        <div className="edu-back-white mb10 ml30 mt20">
+          {this.props&&this.props.status>1&&this.state.use_scope===0&&this.props&&this.props.identity>7||this.props&&this.props.public===2&&this.state.use_scope===0&&this.props&&this.props.identity>7?"":<div>
                 <span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>公开程度:</span>
                 <span className="fl mt8 ml20">
             <RadioGroup onChange={this.SelectOpenpublic} value={this.state.use_scope}>
@@ -387,7 +389,7 @@ export default class Shixuninformation extends Component {
 
 
             </span>
-              </div>
+              </div>}
 
             <div className="clearfix mt20">
               <span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>开启时间:</span>
diff --git a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
index 66e1da8dd..04e729596 100644
--- a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
+++ b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
@@ -1185,7 +1185,11 @@ class Shixuninformation extends Component {
             closable={false}
             footer={null}
           >
-            <div className="task-popup-content"><p className="task-popup-text-center font-16">评测脚本生成成功！</p></div>
+            <div className="task-popup-content">
+              {/*<p className="task-popup-text-center font-16">已根据您的选择，生成新的评测脚本！</p>*/}
+              {/*<p className="task-popup-text-center font-16 mt10">您之前使用的脚本已复制到剪贴板，可通过Ctrl+C贴贴</p>*/}
+              <p className="task-popup-text-center font-16">评测脚本生成成功！</p>
+            </div>
             <div className="task-popup-sure clearfix">
               <a className="task-btn task-btn-orange" onClick={() => this.hidestandard_scriptsModal()}>确定</a>
             </div>
diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js
index 88894794b..545032e56 100644
--- a/public/react/src/modules/tpm/component/TPMRightSection.js
+++ b/public/react/src/modules/tpm/component/TPMRightSection.js
@@ -82,18 +82,18 @@ class TPMRightSection extends Component {
                   <div className="flex1">
 
                     <div className="creatorname  sortinxdirection space-between">
-                      <div className={"creatornamelist"}>
+                      <div className={"creatornamelist color-grey-3"}>
                         {TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : TPMRightSectionData.creator.name}
                       </div>
                       <div className={"creatornamelist width80center"}>
-                        {TPMRightSectionData.user_shixuns_count}
+                        <span className={"color888hezuo"}>共发布实训</span> <span className={"color-grey-3"}>{TPMRightSectionData.user_shixuns_count}</span> <span className={"color888hezuo"}>个</span>
                       </div>
                     </div>
-                    <div className="clearfix">
-                      <span className={"fr color888hezuo"}>发布实训项目</span>
-                      {/*<span className="ml20">粉丝 <span id="user_h_fan_count">{TPMRightSectionData.fans_count}</span></span>*/}
-                      {/* <a href="/watchers/unwatch?className=fr+user_watch_btn+edu-default-btn+edu-focus-btn&amp;object_id=3039&amp;object_type=user&amp;shixun_id=61&amp;target_id=3039" className="fr edu-default-btn user_watch_btn edu-focus-btn" data-method="post" data-remote="true" id="cancel_watch" rel="nofollow">取消关注</a> */}
-                    </div>
+                    {/*<div className="clearfix">*/}
+                    {/*  <span className={"fr color888hezuo"}>发布实训项目</span>*/}
+                    {/*  /!*<span className="ml20">粉丝 <span id="user_h_fan_count">{TPMRightSectionData.fans_count}</span></span>*!/*/}
+                    {/*  /!* <a href="/watchers/unwatch?className=fr+user_watch_btn+edu-default-btn+edu-focus-btn&amp;object_id=3039&amp;object_type=user&amp;shixun_id=61&amp;target_id=3039" className="fr edu-default-btn user_watch_btn edu-focus-btn" data-method="post" data-remote="true" id="cancel_watch" rel="nofollow">取消关注</a> *!/*/}
+                    {/*</div>*/}
 
                   </div>
                 </div>
diff --git a/public/react/src/modules/tpm/component/TPMright.css b/public/react/src/modules/tpm/component/TPMright.css
index 0d6b306fd..bef960742 100644
--- a/public/react/src/modules/tpm/component/TPMright.css
+++ b/public/react/src/modules/tpm/component/TPMright.css
@@ -98,14 +98,15 @@
 }
 
 .creatornamelist {
-    -o-text-overflow: ellipsis;
+    cursor: default;
+    overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    cursor: default;
+    width: 139px;
 }
 
 .width80center {
-    width: 80px;
+    font-size:12px;
     text-align: center;
 }
 
diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js
index 56b9a4dc3..4485cc1fe 100644
--- a/public/react/src/modules/tpm/jupyter/index.js
+++ b/public/react/src/modules/tpm/jupyter/index.js
@@ -326,12 +326,12 @@ function JupyterTPI (props) {
         </p>
         <p className="jupyter_btn">
            {/*sync | poweroff */}
-          {/*<Button*/}
-          {/*  className="btn_common"*/}
-          {/*  type="link"*/}
-          {/*  icon="history"*/}
-          {/*  onClick={handleClickResetTpi}*/}
-          {/*>重置实训</Button>*/}
+          <Button
+            className="btn_common"
+            type="link"
+            icon="history"
+            onClick={handleClickResetTpi}
+          >重置实训</Button>
 
           <Button
             className="btn_common"
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
index b059ab406..075a5af0f 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
@@ -122,7 +122,7 @@
 }
 .fabushixunwidth{
     color: #000000;
-    font-size: 16px;
+    font-size: 12px;
 }
 .fabushixunwidthcolor{
     color: #4CACFF;
@@ -143,11 +143,11 @@
     height:34px;
     line-height: 34px;
 }
-.hezuozhe630{
-    width: 630px;
+.hezuozhe655{
+    width: 655px;
 }
-.hezuozhe634{
-    width: 634px;
+.hezuozhe655{
+    width: 655px;
 }
 .color333hezuo{
     color:#333333;
@@ -193,4 +193,8 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     cursor: default;
+}
+.centertop20{
+    text-align: center;
+    padding-top: 20%;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
index a5e055e41..0404bc0fe 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
@@ -118,6 +118,7 @@ class Collaborators extends Component {
     if (type === "cooperation") {
       this.setState({
         Collaboratorsvisibleadmin: true,
+        Collaboratorsvisible: false,
       });
     } else if ("admin") {
       let id = this.props.match.params.shixunId;
@@ -132,6 +133,7 @@ class Collaborators extends Component {
           } else {
             this.setState({
               Collaboratorsvisible: true,
+              Collaboratorsvisibleadmin: false,
               Collaboratorslist: response.data
             })
           }
@@ -517,17 +519,16 @@ class Collaborators extends Component {
           closable={false}
           footer={null}
         >
-
           <div className="mb15 font-14 edu-txt-center color-orange-tip">
             选择的成员将会成为新的管理员<br/> 您将不再拥有管理员的权限，但您仍是合作团队的一员
           </div>
-
-
           <div className="clearfix mb15 edu-bg-light-blue edu-max-h200">
             <ul className="">
-              <li className="clearfix">
+              <li className={Collaboratorslist&&Collaboratorslist.length===0?"centertop20 clearfix":"clearfix"}>
+                <span>
+                  请先将新的管理员通过 <a className={"color-blue"} onClick={() => this.showCollaboratorsvisible("cooperation")}>"添加合作者"</a> 加入合作者列表
+                </span>
                 <RadioGroup onChange={this.onChange} value={this.state.value}>
-
                   {
                     Collaboratorslist.length === 0 ? "" : Collaboratorslist.map((item, key) => {
                       return (
@@ -536,7 +537,6 @@ class Collaborators extends Component {
                       )
                     })
                   }
-
                 </RadioGroup>
               </li>
             </ul>
@@ -642,7 +642,7 @@ class Collaborators extends Component {
         <style>
           {
             `
-									.collaborators-item-middles{width: 100% !important;    margin-left: 20px;}
+									.collaborators-item-middles{width: 100% !important;}
 									.ysltithead{
 									    padding-bottom: 20px;
 									}
@@ -665,7 +665,7 @@ class Collaborators extends Component {
 
 
                     <div className="fl collaborators-item-middles">
-                      <p className="mb10 sortinxdirection space-between hezuozhe634">
+                      <p className="mb10 sortinxdirection space-between hezuozhe655">
                         <a href={item.user.user_url} target="_blank" className="yslusername">{item.user.name}</a>
                           {item.user.shixun_manager === true ? "" : <span>
                             <i className={this.state.hovertype===true&&key===this.state.hoverkey?"fontnewreds iconfont icon-shanchu_Hover":"fontneweees iconfont icon-shanchu_moren"}
@@ -681,10 +681,10 @@ class Collaborators extends Component {
                       </p>
 
                       <p className="color-grey-B2 font-12 mb10 sortinxdirection mt14">
-                        <p className="hezuozhe630 sortinxdirection space-between">
+                        <p className="hezuozhe655 sortinxdirection space-between">
                           {/*<p className={item.user.identity===null||item.user.identity===undefined||item.user.identity===""?" font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p>*/}
                           <p
-                            className={item.user.school_name === null || item.user.school_name === "" ? "" : " font-16 color888hezuo maxfont450"}>{item.user.school_name}</p>
+                            className={item.user.school_name === null || item.user.school_name === "" ? "" : " font-12 color888hezuo maxfont450"}>{item.user.school_name}</p>
                           <p className="fabushixunwidth color888hezuo">发布实训项目&nbsp;&nbsp;<span
                             className="ml2">{item.user.user_shixuns_count}</span></p>
                         </p>
diff --git a/public/react/src/modules/tpm/shixunchild/Ranking_list/Ranking_list.js b/public/react/src/modules/tpm/shixunchild/Ranking_list/Ranking_list.js
index 0e5d0498b..e1d2d269e 100644
--- a/public/react/src/modules/tpm/shixunchild/Ranking_list/Ranking_list.js
+++ b/public/react/src/modules/tpm/shixunchild/Ranking_list/Ranking_list.js
@@ -129,7 +129,7 @@ class Ranking_list extends Component {
                     {/*<li  className="fl with13 edu-txt-center color-grey-74">*/}
                     {/*/!*{item.accuracy} %准确率*!/*/}
                     {/*</li>*/}
-                    <li  className="fl with25 edu-txt-center">{this.formatSeconds(item.use_time)}</li>
+                    <li  className="fl with25 edu-txt-center">{item.use_time===null?"":this.formatSeconds(item.use_time)}</li>
                     <li  className="fl with14 edu-txt-center color-yellow">+{item.gold}金币 </li>
                   </div>
                 )

From f3308d188ce667394b73594f74768cd2538f94c1 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, 25 Dec 2019 09:50:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/TPMIndexHOC.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index f72c4ac94..fe760f372 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //     .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?66`));
+      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?66`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?66`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')

From 2748306d0706781ae2070e37c31fc37cf4c6cd7f 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, 25 Dec 2019 09:56:52 +0800
Subject: [PATCH 3/3] =?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/tpm/TPMsettings/Shixuninformation.js      | 8 ++++----
 public/react/src/modules/tpm/newshixuns/Newshixuns.js     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
index 66e1da8dd..0a8220017 100644
--- a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
+++ b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
@@ -953,10 +953,10 @@ class Shixuninformation extends Component {
                       <div>
                            {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
                              <div className={"font-12"} style={{'max-width': '600px'}}>
-                               {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : `已安装软件：` + this.state.mainvalues}`}
-                               {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ? `已安装软件：` + this.state.subvalues : this.state.subvalues}`}
-                               {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : `说明：添加了` + this.state.mainvalues}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
-                                 this.state.mainvalues === undefined || this.state.mainvalues === "" ? `说明：添加了` + this.state.subvalues : this.state.subvalues}`}
+                               {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
+                               {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ? this.state.subvalues : this.state.subvalues}`}
+                               {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :  this.state.mainvalues}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
+                                 this.state.mainvalues === undefined || this.state.mainvalues === "" ? this.state.subvalues : this.state.subvalues}`}
                              </div>}
                       </div>
                 </span>
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 99f8a4377..071b19a5f 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -620,10 +620,10 @@ class Newshixuns extends Component {
                               <div>
                                 {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
                                   <div className={"font-12"} style={{'max-width': '600px'}}>
-                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : `已安装软件：` + this.state.mainvalues}`}
-                                    {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ? `已安装软件：` + this.state.subvalues : this.state.subvalues}`}
-                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : `说明：添加了` + this.state.mainvalues}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
-                                      this.state.mainvalues === undefined || this.state.mainvalues === "" ? `说明：添加了` + this.state.subvalues : this.state.subvalues}`}
+                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
+                                    {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
+                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :   this.state.mainvalues}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
+                                      this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
                                   </div>}
 
                               </div>