From 758ea539b2126c50b98a6f8b1bc48c871fd42070 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, 19 Dec 2019 17:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=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         |  3 +++
 public/react/src/modules/tpm/TPMIndex.js          |  3 +++
 .../modules/tpm/TPMsettings/LearningSettings.js   |  6 +++---
 .../modules/tpm/TPMsettings/Shixuninformation.js  | 10 +++++++++-
 .../src/modules/tpm/component/TPMRightSection.js  |  6 ++++--
 .../tpm/shixunchild/Challenges/Challenges.js      | 15 ++++++++++-----
 .../shixunchild/Collaborators/Collaborators.css   |  9 +++++++++
 .../shixunchild/Collaborators/Collaborators.js    |  6 ++----
 .../src/modules/tpm/shixuns/ShixunCardList.js     |  2 +-
 9 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index a31ca5952..141bd87d9 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -796,6 +796,9 @@ class TPMBanner extends Component {
                   height: 180px !important;
                   padding-top:35px !important;
               }
+              .ant-popover{
+               z-index:1000 !important;
+              }
               `
             }
           </style>
diff --git a/public/react/src/modules/tpm/TPMIndex.js b/public/react/src/modules/tpm/TPMIndex.js
index d79bae95b..e032bb91f 100644
--- a/public/react/src/modules/tpm/TPMIndex.js
+++ b/public/react/src/modules/tpm/TPMIndex.js
@@ -385,6 +385,9 @@ class TPMIndex extends Component {
                          margin:0 40px 0 0;
                          padding:0px;
                      }       
+                     .ant-popover{
+                       z-index:1000 !important;
+                      }
                     `
                   }
                 </style>
diff --git a/public/react/src/modules/tpm/TPMsettings/LearningSettings.js b/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
index 681cbc956..a98f68223 100644
--- a/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
@@ -215,9 +215,9 @@ export default class Shixuninformation extends Component {
         multi_webssh: false
       })
     } else {
-      this.setState({
-        multi_webssh: true
-      })
+      // this.setState({
+      //   multi_webssh: true
+      // })
     }
     this.setState({
       opensshRadio: e.target.value
diff --git a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
index 200880019..75ed88852 100644
--- a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
+++ b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
@@ -50,7 +50,10 @@ class Shixuninformation extends Component {
   }
 
   componentDidMount() {
-
+    let anchorElement = document.getElementById("newcourseContentMD");
+    if(anchorElement){
+      this.scrollToAnchor("newcourseContentMD");
+    }
   }
 
   componentDidUpdate(prevProps, prevState) {
@@ -113,6 +116,7 @@ class Shixuninformation extends Component {
           selectright: this.props.data && this.props.data.shixun.choice_small_type,
         })
         this.contentMdRef.current.setValue(this.props.data && this.props.data.shixun.description);
+
       }
     }
     }
@@ -807,16 +811,20 @@ class Shixuninformation extends Component {
               )}
             </Form.Item>
 
+            <span id={"newcourseContentMD"}></span>
             <Form.Item
               label="简介"
               style={{"borderBottom": 'none', 'marginBottom': '0px'}}
               className="chooseDes pr"
+
             >
+
               <TPMMDEditor ref={this.contentMdRef} placeholder="请输入简介" mdID={'courseContentMD'}
                            refreshTimeout={1500}
                            className="courseMessageMD"
                 // initValue={this.state.description === null ? "" : this.state.description}
               ></TPMMDEditor>
+
             </Form.Item>
 
 
diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js
index 1d2a93796..88894794b 100644
--- a/public/react/src/modules/tpm/component/TPMRightSection.js
+++ b/public/react/src/modules/tpm/component/TPMRightSection.js
@@ -63,6 +63,8 @@ class TPMRightSection extends Component {
     if(TPMRightSectionData&&TPMRightSectionData.complete_count!=null){
       Progresssum=(parseInt(TPMRightSectionData&&TPMRightSectionData.complete_count) / parseInt(TPMRightSectionData&&TPMRightSectionData.challenge_count))*100;
     }
+
+
     return (
       <div>
         {
@@ -97,11 +99,11 @@ class TPMRightSection extends Component {
                 </div>
               </div>
 
-              {TPMRightSectionData&&TPMRightSectionData.complete_count!=null?<div className="edu-back-white padd252020px relative borderbottomf4">
+              {this.props&&this.props.status>1?<div className="edu-back-white padd252020px relative borderbottomf4">
                 <div className="font-16 mb5">
                   <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 className="color888hezuo font-12">已完成 {TPMRightSectionData&&TPMRightSectionData.complete_count===null?0:TPMRightSectionData&&TPMRightSectionData.complete_count} 个 / 共 {TPMRightSectionData&&TPMRightSectionData.challenge_count} 关</span>
 											</span>
 
                 </div>
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 307823ee8..e7b7ef261 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -34,7 +34,8 @@ class Challenges extends Component {
       operationstrue:false,
 			isSpin:false,
       boxoffsetHeigh:0,
-      opentitletype:true
+      opentitletype:true,
+      isopentitletype:"Less",
     }
   }
 
@@ -73,15 +74,17 @@ class Challenges extends Component {
         boxoffsetHeigh=box.offsetHeight
         if(boxoffsetHeigh<260){
           this.setState({
-            opentitletype:false,
+            isopentitletype:"Less",
             boxoffsetHeigh:boxoffsetHeigh
           })
         }else{
           this.setState({
+            opentitletype:true,
+            isopentitletype:"greater",
             boxoffsetHeigh:boxoffsetHeigh
           })
         }
-
+         console.log(boxoffsetHeigh)
       }
     }
 
@@ -322,7 +325,8 @@ class Challenges extends Component {
 
   opentitle=()=>{
     this.setState({
-      opentitletype:!this.state.opentitletype
+      opentitletype:!this.state.opentitletype,
+
     })
   }
 
@@ -434,7 +438,8 @@ class Challenges extends Component {
                   </p>
                 </div>
                 </div>
-                {this.state.opentitletype===true?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
+
+                {this.state.isopentitletype==="Less"?"":this.state.opentitletype===true?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
                   <a className={"font-14  color-grey-9"}>阅读全文 <i className={"iconfont icon-jiantou9 font-14"}></i></a>
                 </Divider>:<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
                   <a className={"font-14  color-grey-9"}>收起全文 <i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu- font-14"}></i></a>
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
index 688dbb422..b059ab406 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
@@ -184,4 +184,13 @@
 
 .fontneweees {
     color: #BBBBBB;
+}
+
+.maxfont450{
+    width: 450px;
+    max-width:450px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    cursor: default;
 }
\ 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 15a956a0b..17b083cf7 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
@@ -11,11 +11,9 @@ import NoneData from "../../../courses/coursesPublic/NoneData";
 import './Collaborators.css';
 
 
-const $ = window.$;
-
 const RadioGroup = Radio.Group;
 
-const Search = Input.Search;
+
 
 class Collaborators extends Component {
   constructor(props) {
@@ -685,7 +683,7 @@ class Collaborators extends Component {
                         <p className="hezuozhe630 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 === "" ? "" : "mr40 font-16 maxnamewidth150 color888hezuo"}>{item.user.school_name}</p>
+                            className={item.user.school_name === null || item.user.school_name === "" ? "" : " font-16 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/shixuns/ShixunCardList.js b/public/react/src/modules/tpm/shixuns/ShixunCardList.js
index 3676ed361..937e96894 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunCardList.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunCardList.js
@@ -218,7 +218,7 @@ class ShixunCardList extends Component {
 						 id="hot"
 						 onClick={(e)=>this.latestHot(e,3)}>最热
 					</div>
-					{shixuntype===true?"":<span className={  "fl font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/shixuns/new")}>+新建实训项目</span>}
+					{shixuntype===true?"":<span className={  "fr font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/shixuns/new")}>+新建实训项目</span>}
 
 					{/*<div className="fl font-16 bestChoose shixun_repertoire ml20 mt1"*/}
 					    {/*style={{display:upcircle===true?"block":"none"}}*/}